X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/e2982e7f6f0b624a773ec5a58885ee80fab46d34..c39d40a767a1ae36171e5bcbf6f157ff3e80fb6c:/print-vrrp.c

diff --git a/print-vrrp.c b/print-vrrp.c
index d6ef7afd..ee97974e 100644
--- a/print-vrrp.c
+++ b/print-vrrp.c
@@ -26,10 +26,10 @@
 /* \summary: Virtual Router Redundancy Protocol (VRRP) printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "extract.h"
@@ -110,31 +110,29 @@ vrrp_print(netdissect_options *ndo,
 	int version, type, auth_type = VRRP_AUTH_NONE; /* keep compiler happy */
 	const char *type_s;
 
-	ND_TCHECK_1(bp);
-	version = (EXTRACT_U_1(bp) & 0xf0) >> 4;
-	type = EXTRACT_U_1(bp) & 0x0f;
+	ndo->ndo_protocol = "vrrp";
+	version = (GET_U_1(bp) & 0xf0) >> 4;
+	type = GET_U_1(bp) & 0x0f;
 	type_s = tok2str(type2str, "unknown type (%u)", type);
 	ND_PRINT("VRRPv%u, %s", version, type_s);
 	if (ttl != 255)
 		ND_PRINT(", (ttl %u)", ttl);
 	if (version < 2 || version > 3 || type != VRRP_TYPE_ADVERTISEMENT)
 		return;
-	ND_TCHECK_1(bp + 2);
-	ND_PRINT(", vrid %u, prio %u", EXTRACT_U_1(bp + 1), EXTRACT_U_1(bp + 2));
-	ND_TCHECK_1(bp + 5);
+	ND_PRINT(", vrid %u, prio %u", GET_U_1(bp + 1), GET_U_1(bp + 2));
 
 	if (version == 2) {
-		auth_type = EXTRACT_U_1(bp + 4);
+		auth_type = GET_U_1(bp + 4);
 		ND_PRINT(", authtype %s", tok2str(auth2str, NULL, auth_type));
-		ND_PRINT(", intvl %us, length %u", EXTRACT_U_1(bp + 5), len);
+		ND_PRINT(", intvl %us, length %u", GET_U_1(bp + 5), len);
 	} else { /* version == 3 */
-		uint16_t intvl = (EXTRACT_U_1(bp + 4) & 0x0f) << 8 | EXTRACT_U_1(bp + 5);
+		uint16_t intvl = (GET_U_1(bp + 4) & 0x0f) << 8 | GET_U_1(bp + 5);
 		ND_PRINT(", intvl %ucs, length %u", intvl, len);
 	}
 
 	if (ndo->ndo_vflag) {
-		int naddrs = EXTRACT_U_1(bp + 3);
-		int i;
+		u_int naddrs = GET_U_1(bp + 3);
+		u_int i;
 		char c;
 
 		if (version == 2 && ND_TTEST_LEN(bp, len)) {
@@ -144,7 +142,7 @@ vrrp_print(netdissect_options *ndo,
 			vec[0].len = len;
 			if (in_cksum(vec, 1))
 				ND_PRINT(", (bad vrrp cksum %x)",
-					EXTRACT_BE_U_2(bp + 6));
+					GET_BE_U_2(bp + 6));
 		}
 
 		if (version == 3 && ND_TTEST_LEN(bp, len)) {
@@ -152,32 +150,28 @@ vrrp_print(netdissect_options *ndo,
 				len, len, IPPROTO_VRRP);
 			if (cksum)
 				ND_PRINT(", (bad vrrp cksum %x)",
-					EXTRACT_BE_U_2(bp + 6));
+					GET_BE_U_2(bp + 6));
 		}
 
 		ND_PRINT(", addrs");
 		if (naddrs > 1)
-			ND_PRINT("(%d)", naddrs);
+			ND_PRINT("(%u)", naddrs);
 		ND_PRINT(":");
 		c = ' ';
 		bp += 8;
 		for (i = 0; i < naddrs; i++) {
-			ND_TCHECK_1(bp + 3);
-			ND_PRINT("%c%s", c, ipaddr_string(ndo, bp));
+			ND_PRINT("%c%s", c, GET_IPADDR_STRING(bp));
 			c = ',';
 			bp += 4;
 		}
 		if (version == 2 && auth_type == VRRP_AUTH_SIMPLE) { /* simple text password */
-			ND_TCHECK_1(bp + 7);
 			ND_PRINT(" auth \"");
-			if (fn_printn(ndo, bp, 8, ndo->ndo_snapend)) {
-				ND_PRINT("\"");
-				goto trunc;
-			}
+			/*
+			 * RFC 2338 Section 5.3.10: "If the configured authentication string
+			 * is shorter than 8 bytes, the remaining space MUST be zero-filled.
+			 */
+			nd_printjnp(ndo, bp, 8);
 			ND_PRINT("\"");
 		}
 	}
-	return;
-trunc:
-	ND_PRINT("[|vrrp]");
 }