X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/1fe6e66ecec3fb7a7cc729038012cbb264542331..32d1d15c5412b3a708ae2b45ed2016bdab9bb58b:/print-msdp.c?ds=inline

diff --git a/print-msdp.c b/print-msdp.c
index 87812435..f1769de0 100644
--- a/print-msdp.c
+++ b/print-msdp.c
@@ -16,14 +16,15 @@
  * FOR A PARTICULAR PURPOSE.
  */
 
-#define NETDISSECT_REWORKED
+/* \summary: Multicast Source Discovery Protocol (MSDP) printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
@@ -34,17 +35,17 @@ msdp_print(netdissect_options *ndo, const u_char *sp, u_int length)
 {
 	unsigned int type, len;
 
-	ND_TCHECK2(*sp, 3);
+	ND_TCHECK_3(sp);
 	/* See if we think we're at the beginning of a compound packet */
-	type = *sp;
-	len = EXTRACT_16BITS(sp + 1);
+	type = EXTRACT_U_1(sp);
+	len = EXTRACT_BE_U_2(sp + 1);
 	if (len > 1500 || len < 3 || type == 0 || type > MSDP_TYPE_MAX)
 		goto trunc;	/* not really truncated, but still not decodable */
 	ND_PRINT((ndo, " msdp:"));
 	while (length > 0) {
-		ND_TCHECK2(*sp, 3);
-		type = *sp;
-		len = EXTRACT_16BITS(sp + 1);
+		ND_TCHECK_3(sp);
+		type = EXTRACT_U_1(sp);
+		len = EXTRACT_BE_U_2(sp + 1);
 		if (len > 1400 || ndo->ndo_vflag)
 			ND_PRINT((ndo, " [len %u]", len));
 		if (len < 3)
@@ -58,21 +59,22 @@ msdp_print(netdissect_options *ndo, const u_char *sp, u_int length)
 				ND_PRINT((ndo, " SA"));
 			else
 				ND_PRINT((ndo, " SA-Response"));
-			ND_TCHECK(*sp);
-			ND_PRINT((ndo, " %u entries", *sp));
-			if ((u_int)((*sp * 12) + 8) < len) {
+			ND_TCHECK_1(sp);
+			ND_PRINT((ndo, " %u entries", EXTRACT_U_1(sp)));
+			if ((u_int)((EXTRACT_U_1(sp) * 12) + 8) < len) {
 				ND_PRINT((ndo, " [w/data]"));
 				if (ndo->ndo_vflag > 1) {
 					ND_PRINT((ndo, " "));
-					ip_print(ndo, sp + *sp * 12 + 8 - 3,
-					         len - (*sp * 12 + 8));
+					ip_print(ndo, sp +
+						 EXTRACT_U_1(sp) * 12 + 8 - 3,
+					         len - (EXTRACT_U_1(sp) * 12 + 8));
 				}
 			}
 			break;
 		case 2:
 			ND_PRINT((ndo, " SA-Request"));
-			ND_TCHECK2(*sp, 5);
-			ND_PRINT((ndo, " for %s", ipaddr_string(sp + 1)));
+			ND_TCHECK_5(sp);
+			ND_PRINT((ndo, " for %s", ipaddr_string(ndo, sp + 1)));
 			break;
 		case 4:
 			ND_PRINT((ndo, " Keepalive"));