X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/c0679b38a3ee4ba138500fce5f1631989492f37e..cc2d4cbd8ca150504127f375d8b51b194958d95b:/print-dvmrp.c

diff --git a/print-dvmrp.c b/print-dvmrp.c
index eec5056a..983b63b4 100644
--- a/print-dvmrp.c
+++ b/print-dvmrp.c
@@ -22,16 +22,18 @@
 /* \summary: Distance Vector Multicast Routing Protocol 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"
 #include "addrtoname.h"
 
 /*
+ * See: RFC 1075 and draft-ietf-idmr-dvmrp-v3
+ *
  * DVMRP message types and flag values shamelessly stolen from
  * mrouted/dvmrp.h.
  */
@@ -58,25 +60,26 @@
 static int print_probe(netdissect_options *, const u_char *, const u_char *, u_int);
 static int print_report(netdissect_options *, const u_char *, const u_char *, u_int);
 static int print_neighbors(netdissect_options *, const u_char *, const u_char *, u_int);
-static int print_neighbors2(netdissect_options *, const u_char *, const u_char *, u_int, uint32_t);
+static int print_neighbors2(netdissect_options *, const u_char *, const u_char *, u_int, uint8_t, uint8_t);
 static int print_prune(netdissect_options *, const u_char *);
 static int print_graft(netdissect_options *, const u_char *);
 static int print_graft_ack(netdissect_options *, const u_char *);
 
 void
 dvmrp_print(netdissect_options *ndo,
-            register const u_char *bp, register u_int len)
+            const u_char *bp, u_int len)
 {
-	register const u_char *ep;
-	register u_char type;
-	uint32_t target_level;
+	const u_char *ep;
+	u_char type;
+	uint8_t major_version, minor_version;
 
-	ep = (const u_char *)ndo->ndo_snapend;
+	ndo->ndo_protocol = "dvmrp";
+	ep = ndo->ndo_snapend;
 	if (bp >= ep)
 		return;
 
-	ND_TCHECK(bp[1]);
-	type = bp[1];
+	ND_TCHECK_1(bp + 1);
+	type = EXTRACT_U_1(bp + 1);
 
 	/* Skip IGMP header */
 	bp += 8;
@@ -85,7 +88,7 @@ dvmrp_print(netdissect_options *ndo,
 	switch (type) {
 
 	case DVMRP_PROBE:
-		ND_PRINT((ndo, " Probe"));
+		ND_PRINT(" Probe");
 		if (ndo->ndo_vflag) {
 			if (print_probe(ndo, bp, ep, len) < 0)
 				goto trunc;
@@ -93,7 +96,7 @@ dvmrp_print(netdissect_options *ndo,
 		break;
 
 	case DVMRP_REPORT:
-		ND_PRINT((ndo, " Report"));
+		ND_PRINT(" Report");
 		if (ndo->ndo_vflag > 1) {
 			if (print_report(ndo, bp, ep, len) < 0)
 				goto trunc;
@@ -101,115 +104,116 @@ dvmrp_print(netdissect_options *ndo,
 		break;
 
 	case DVMRP_ASK_NEIGHBORS:
-		ND_PRINT((ndo, " Ask-neighbors(old)"));
+		ND_PRINT(" Ask-neighbors(old)");
 		break;
 
 	case DVMRP_NEIGHBORS:
-		ND_PRINT((ndo, " Neighbors(old)"));
+		ND_PRINT(" Neighbors(old)");
 		if (print_neighbors(ndo, bp, ep, len) < 0)
 			goto trunc;
 		break;
 
 	case DVMRP_ASK_NEIGHBORS2:
-		ND_PRINT((ndo, " Ask-neighbors2"));
+		ND_PRINT(" Ask-neighbors2");
 		break;
 
 	case DVMRP_NEIGHBORS2:
-		ND_PRINT((ndo, " Neighbors2"));
+		ND_PRINT(" Neighbors2");
 		/*
-		 * extract version and capabilities from IGMP group
-		 * address field
+		 * extract version from IGMP group address field
 		 */
 		bp -= 4;
-		ND_TCHECK2(bp[0], 4);
-		target_level = (bp[0] << 24) | (bp[1] << 16) |
-		    (bp[2] << 8) | bp[3];
+		ND_TCHECK_4(bp);
+		major_version = EXTRACT_U_1(bp + 3);
+		minor_version = EXTRACT_U_1(bp + 2);
 		bp += 4;
-		if (print_neighbors2(ndo, bp, ep, len, target_level) < 0)
+		if (print_neighbors2(ndo, bp, ep, len, major_version,
+		    minor_version) < 0)
 			goto trunc;
 		break;
 
 	case DVMRP_PRUNE:
-		ND_PRINT((ndo, " Prune"));
+		ND_PRINT(" Prune");
 		if (print_prune(ndo, bp) < 0)
 			goto trunc;
 		break;
 
 	case DVMRP_GRAFT:
-		ND_PRINT((ndo, " Graft"));
+		ND_PRINT(" Graft");
 		if (print_graft(ndo, bp) < 0)
 			goto trunc;
 		break;
 
 	case DVMRP_GRAFT_ACK:
-		ND_PRINT((ndo, " Graft-ACK"));
+		ND_PRINT(" Graft-ACK");
 		if (print_graft_ack(ndo, bp) < 0)
 			goto trunc;
 		break;
 
 	default:
-		ND_PRINT((ndo, " [type %d]", type));
+		ND_PRINT(" [type %u]", type);
 		break;
 	}
 	return;
 
 trunc:
-	ND_PRINT((ndo, "[|dvmrp]"));
+	nd_print_trunc(ndo);
 	return;
 }
 
 static int
 print_report(netdissect_options *ndo,
-             register const u_char *bp, register const u_char *ep,
-             register u_int len)
+             const u_char *bp, const u_char *ep,
+             u_int len)
 {
-	register uint32_t mask, origin;
-	register int metric, done;
-	register u_int i, width;
+	uint32_t mask, origin;
+	u_int metric, done;
+	u_int i, width;
 
 	while (len > 0) {
 		if (len < 3) {
-			ND_PRINT((ndo, " [|]"));
+			ND_PRINT(" [|]");
 			return (0);
 		}
-		ND_TCHECK2(bp[0], 3);
-		mask = (uint32_t)0xff << 24 | bp[0] << 16 | bp[1] << 8 | bp[2];
+		ND_TCHECK_3(bp);
+		mask = (uint32_t)0xff << 24 | EXTRACT_U_1(bp) << 16 |
+			EXTRACT_U_1(bp + 1) << 8 | EXTRACT_U_1(bp + 2);
 		width = 1;
-		if (bp[0])
+		if (EXTRACT_U_1(bp))
 			width = 2;
-		if (bp[1])
+		if (EXTRACT_U_1(bp + 1))
 			width = 3;
-		if (bp[2])
+		if (EXTRACT_U_1(bp + 2))
 			width = 4;
 
-		ND_PRINT((ndo, "\n\tMask %s", intoa(htonl(mask))));
+		ND_PRINT("\n\tMask %s", intoa(htonl(mask)));
 		bp += 3;
 		len -= 3;
 		do {
 			if (bp + width + 1 > ep) {
-				ND_PRINT((ndo, " [|]"));
+				ND_PRINT(" [|]");
 				return (0);
 			}
 			if (len < width + 1) {
-				ND_PRINT((ndo, "\n\t  [Truncated Report]"));
+				ND_PRINT("\n\t  [Truncated Report]");
 				return (0);
 			}
 			origin = 0;
 			for (i = 0; i < width; ++i) {
-				ND_TCHECK_8BITS(bp);
-				origin = origin << 8 | EXTRACT_8BITS(bp);
+				ND_TCHECK_1(bp);
+				origin = origin << 8 | EXTRACT_U_1(bp);
 				bp++;
 			}
 			for ( ; i < 4; ++i)
 				origin <<= 8;
 
-			ND_TCHECK_8BITS(bp);
-			metric = EXTRACT_8BITS(bp);
+			ND_TCHECK_1(bp);
+			metric = EXTRACT_U_1(bp);
 			bp++;
 			done = metric & 0x80;
 			metric &= 0x7f;
-			ND_PRINT((ndo, "\n\t  %s metric %d", intoa(htonl(origin)),
-				metric));
+			ND_PRINT("\n\t  %s metric %u", intoa(htonl(origin)),
+				metric);
 			len -= width + 1;
 		} while (!done);
 	}
@@ -220,28 +224,28 @@ trunc:
 
 static int
 print_probe(netdissect_options *ndo,
-            register const u_char *bp, register const u_char *ep,
-            register u_int len)
+            const u_char *bp, const u_char *ep,
+            u_int len)
 {
-	register uint32_t genid;
+	uint32_t genid;
 
-	ND_TCHECK2(bp[0], 4);
+	ND_TCHECK_4(bp);
 	if ((len < 4) || ((bp + 4) > ep)) {
 		/* { (ctags) */
-		ND_PRINT((ndo, " [|}"));
+		ND_PRINT(" [|}");
 		return (0);
 	}
-	genid = (bp[0] << 24) | (bp[1] << 16) | (bp[2] << 8) | bp[3];
+	genid = EXTRACT_BE_U_4(bp);
 	bp += 4;
 	len -= 4;
-	ND_PRINT((ndo, ndo->ndo_vflag > 1 ? "\n\t" : " "));
-	ND_PRINT((ndo, "genid %u", genid));
+	ND_PRINT(ndo->ndo_vflag > 1 ? "\n\t" : " ");
+	ND_PRINT("genid %u", genid);
 	if (ndo->ndo_vflag < 2)
 		return (0);
 
 	while ((len > 0) && (bp < ep)) {
-		ND_TCHECK2(bp[0], 4);
-		ND_PRINT((ndo, "\n\tneighbor %s", ipaddr_string(ndo, bp)));
+		ND_TCHECK_4(bp);
+		ND_PRINT("\n\tneighbor %s", ipaddr_string(ndo, bp));
 		bp += 4; len -= 4;
 	}
 	return (0);
@@ -251,30 +255,30 @@ trunc:
 
 static int
 print_neighbors(netdissect_options *ndo,
-                register const u_char *bp, register const u_char *ep,
-                register u_int len)
+                const u_char *bp, const u_char *ep,
+                u_int len)
 {
 	const u_char *laddr;
-	register u_char metric;
-	register u_char thresh;
-	register int ncount;
+	u_char metric;
+	u_char thresh;
+	int ncount;
 
 	while (len > 0 && bp < ep) {
-		ND_TCHECK2(bp[0], 7);
+		ND_TCHECK_7(bp);
 		laddr = bp;
 		bp += 4;
-		metric = EXTRACT_8BITS(bp);
+		metric = EXTRACT_U_1(bp);
 		bp++;
-		thresh = EXTRACT_8BITS(bp);
+		thresh = EXTRACT_U_1(bp);
 		bp++;
-		ncount = EXTRACT_8BITS(bp);
+		ncount = EXTRACT_U_1(bp);
 		bp++;
 		len -= 7;
 		while (--ncount >= 0) {
-			ND_TCHECK2(bp[0], 4);
-			ND_PRINT((ndo, " [%s ->", ipaddr_string(ndo, laddr)));
-			ND_PRINT((ndo, " %s, (%d/%d)]",
-				   ipaddr_string(ndo, bp), metric, thresh));
+			ND_TCHECK_4(bp);
+			ND_PRINT(" [%s ->", ipaddr_string(ndo, laddr));
+			ND_PRINT(" %s, (%u/%u)]",
+				   ipaddr_string(ndo, bp), metric, thresh);
 			bp += 4;
 			len -= 4;
 		}
@@ -286,50 +290,49 @@ trunc:
 
 static int
 print_neighbors2(netdissect_options *ndo,
-                 register const u_char *bp, register const u_char *ep,
-                 register u_int len, uint32_t target_level)
+                 const u_char *bp, const u_char *ep,
+                 u_int len, uint8_t major_version,
+                 uint8_t minor_version)
 {
 	const u_char *laddr;
-	register u_char metric, thresh, flags;
-	register int ncount;
+	u_char metric, thresh, flags;
+	int ncount;
 
-	ND_PRINT((ndo, " (v %u.%u):",
-	       target_level & 0xff,
-	       (target_level >> 8) & 0xff));
+	ND_PRINT(" (v %u.%u):", major_version, minor_version);
 
 	while (len > 0 && bp < ep) {
-		ND_TCHECK2(bp[0], 8);
+		ND_TCHECK_8(bp);
 		laddr = bp;
 		bp += 4;
-		metric = EXTRACT_8BITS(bp);
+		metric = EXTRACT_U_1(bp);
 		bp++;
-		thresh = EXTRACT_8BITS(bp);
+		thresh = EXTRACT_U_1(bp);
 		bp++;
-		flags = EXTRACT_8BITS(bp);
+		flags = EXTRACT_U_1(bp);
 		bp++;
-		ncount = EXTRACT_8BITS(bp);
+		ncount = EXTRACT_U_1(bp);
 		bp++;
 		len -= 8;
 		while (--ncount >= 0 && (len >= 4) && (bp + 4) <= ep) {
-			ND_PRINT((ndo, " [%s -> ", ipaddr_string(ndo, laddr)));
-			ND_PRINT((ndo, "%s (%d/%d", ipaddr_string(ndo, bp),
-				     metric, thresh));
+			ND_PRINT(" [%s -> ", ipaddr_string(ndo, laddr));
+			ND_PRINT("%s (%u/%u", ipaddr_string(ndo, bp),
+				     metric, thresh);
 			if (flags & DVMRP_NF_TUNNEL)
-				ND_PRINT((ndo, "/tunnel"));
+				ND_PRINT("/tunnel");
 			if (flags & DVMRP_NF_SRCRT)
-				ND_PRINT((ndo, "/srcrt"));
+				ND_PRINT("/srcrt");
 			if (flags & DVMRP_NF_QUERIER)
-				ND_PRINT((ndo, "/querier"));
+				ND_PRINT("/querier");
 			if (flags & DVMRP_NF_DISABLED)
-				ND_PRINT((ndo, "/disabled"));
+				ND_PRINT("/disabled");
 			if (flags & DVMRP_NF_DOWN)
-				ND_PRINT((ndo, "/down"));
-			ND_PRINT((ndo, ")]"));
+				ND_PRINT("/down");
+			ND_PRINT(")]");
 			bp += 4;
 			len -= 4;
 		}
 		if (ncount != -1) {
-			ND_PRINT((ndo, " [|]"));
+			ND_PRINT(" [|]");
 			return (0);
 		}
 	}
@@ -340,13 +343,13 @@ trunc:
 
 static int
 print_prune(netdissect_options *ndo,
-            register const u_char *bp)
+            const u_char *bp)
 {
-	ND_TCHECK2(bp[0], 12);
-	ND_PRINT((ndo, " src %s grp %s", ipaddr_string(ndo, bp), ipaddr_string(ndo, bp + 4)));
+	ND_TCHECK_LEN(bp, 12);
+	ND_PRINT(" src %s grp %s", ipaddr_string(ndo, bp), ipaddr_string(ndo, bp + 4));
 	bp += 8;
-	ND_PRINT((ndo, " timer "));
-	unsigned_relts_print(ndo, EXTRACT_BE_32BITS(bp));
+	ND_PRINT(" timer ");
+	unsigned_relts_print(ndo, EXTRACT_BE_U_4(bp));
 	return (0);
 trunc:
 	return (-1);
@@ -354,10 +357,10 @@ trunc:
 
 static int
 print_graft(netdissect_options *ndo,
-            register const u_char *bp)
+            const u_char *bp)
 {
-	ND_TCHECK2(bp[0], 8);
-	ND_PRINT((ndo, " src %s grp %s", ipaddr_string(ndo, bp), ipaddr_string(ndo, bp + 4)));
+	ND_TCHECK_8(bp);
+	ND_PRINT(" src %s grp %s", ipaddr_string(ndo, bp), ipaddr_string(ndo, bp + 4));
 	return (0);
 trunc:
 	return (-1);
@@ -365,10 +368,10 @@ trunc:
 
 static int
 print_graft_ack(netdissect_options *ndo,
-                register const u_char *bp)
+                const u_char *bp)
 {
-	ND_TCHECK2(bp[0], 8);
-	ND_PRINT((ndo, " src %s grp %s", ipaddr_string(ndo, bp), ipaddr_string(ndo, bp + 4)));
+	ND_TCHECK_8(bp);
+	ND_PRINT(" src %s grp %s", ipaddr_string(ndo, bp), ipaddr_string(ndo, bp + 4));
 	return (0);
 trunc:
 	return (-1);