X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/e2982e7f6f0b624a773ec5a58885ee80fab46d34..5ef0bcb5edd748de9d9af13c40da0395dfdd94e8:/print-msdp.c?ds=sidebyside

diff --git a/print-msdp.c b/print-msdp.c
index 68bb3159..545f452a 100644
--- a/print-msdp.c
+++ b/print-msdp.c
@@ -19,10 +19,10 @@
 /* \summary: Multicast Source Discovery Protocol (MSDP) printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "addrtoname.h"
@@ -35,21 +35,22 @@ msdp_print(netdissect_options *ndo, const u_char *sp, u_int length)
 {
 	unsigned int type, len;
 
-	ND_TCHECK_3(sp);
+	ndo->ndo_protocol = "msdp";
 	/* See if we think we're at the beginning of a compound packet */
-	type = EXTRACT_U_1(sp);
-	len = EXTRACT_BE_U_2(sp + 1);
+	type = GET_U_1(sp);
+	len = GET_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(" msdp:");
-	while (length > 0) {
-		ND_TCHECK_3(sp);
-		type = EXTRACT_U_1(sp);
-		len = EXTRACT_BE_U_2(sp + 1);
+	while (length != 0) {
+		type = GET_U_1(sp);
+		len = GET_BE_U_2(sp + 1);
 		if (len > 1400 || ndo->ndo_vflag)
 			ND_PRINT(" [len %u]", len);
 		if (len < 3)
 			goto trunc;
+		if (length < len)
+			goto trunc;
 		sp += 3;
 		length -= 3;
 		switch (type) {
@@ -59,33 +60,31 @@ msdp_print(netdissect_options *ndo, const u_char *sp, u_int length)
 				ND_PRINT(" SA");
 			else
 				ND_PRINT(" SA-Response");
-			ND_TCHECK_1(sp);
-			ND_PRINT(" %u entries", EXTRACT_U_1(sp));
-			if ((u_int)((EXTRACT_U_1(sp) * 12) + 8) < len) {
+			ND_PRINT(" %u entries", GET_U_1(sp));
+			if ((u_int)((GET_U_1(sp) * 12) + 8) < len) {
 				ND_PRINT(" [w/data]");
 				if (ndo->ndo_vflag > 1) {
 					ND_PRINT(" ");
 					ip_print(ndo, sp +
-						 EXTRACT_U_1(sp) * 12 + 8 - 3,
-					         len - (EXTRACT_U_1(sp) * 12 + 8));
+						 GET_U_1(sp) * 12 + 8 - 3,
+						 len - (GET_U_1(sp) * 12 + 8));
 				}
 			}
 			break;
 		case 2:
 			ND_PRINT(" SA-Request");
-			ND_TCHECK_5(sp);
-			ND_PRINT(" for %s", ipaddr_string(ndo, sp + 1));
+			ND_PRINT(" for %s", GET_IPADDR_STRING(sp + 1));
 			break;
 		case 4:
 			ND_PRINT(" Keepalive");
 			if (len != 3)
-				ND_PRINT("[len=%d] ", len);
+				ND_PRINT("[len=%u] ", len);
 			break;
 		case 5:
 			ND_PRINT(" Notification");
 			break;
 		default:
-			ND_PRINT(" [type=%d len=%d]", type, len);
+			ND_PRINT(" [type=%u len=%u]", type, len);
 			break;
 		}
 		sp += (len - 3);
@@ -93,12 +92,5 @@ msdp_print(netdissect_options *ndo, const u_char *sp, u_int length)
 	}
 	return;
 trunc:
-	ND_PRINT(" [|msdp]");
+	nd_print_trunc(ndo);
 }
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */