X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/40ae3ad744d9f71079b410a810acbc33ef39f8ba..refs/heads/master:/print-mobile.c

diff --git a/print-mobile.c b/print-mobile.c
index 28713acc..0cba230e 100644
--- a/print-mobile.c
+++ b/print-mobile.c
@@ -38,12 +38,11 @@
 
 /* \summary: IPv4 mobility printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
@@ -73,14 +72,13 @@ mobile_print(netdissect_options *ndo, const u_char *bp, u_int length)
 	ndo->ndo_protocol = "mobile";
 	mob = (const struct mobile_ip *)bp;
 
-	if (length < MOBILE_SIZE || !ND_TTEST_SIZE(mob)) {
-		nd_print_trunc(ndo);
-		return;
-	}
-	ND_PRINT("mobile: ");
+	nd_print_protocol(ndo);
+	ND_PRINT(": ");
+	ND_ICHECK_U(length, <, MOBILE_SIZE);
+	ND_TCHECK_SIZE(mob);
 
-	proto = EXTRACT_BE_U_2(mob->proto);
-	crc =  EXTRACT_BE_U_2(mob->hcheck);
+	proto = GET_BE_U_2(mob->proto);
+	crc =  GET_BE_U_2(mob->hcheck);
 	if (proto & OSRC_PRES) {
 		osp=1;
 	}
@@ -88,12 +86,12 @@ mobile_print(netdissect_options *ndo, const u_char *bp, u_int length)
 	if (osp)  {
 		ND_PRINT("[S] ");
 		if (ndo->ndo_vflag)
-			ND_PRINT("%s ", ipaddr_string(ndo, mob->osrc));
+			ND_PRINT("%s ", GET_IPADDR_STRING(mob->osrc));
 	} else {
 		ND_PRINT("[] ");
 	}
 	if (ndo->ndo_vflag) {
-		ND_PRINT("> %s ", ipaddr_string(ndo, mob->odst));
+		ND_PRINT("> %s ", GET_IPADDR_STRING(mob->odst));
 		ND_PRINT("(oproto=%u)", proto>>8);
 	}
 	vec[0].ptr = (const uint8_t *)(const void *)mob;
@@ -101,4 +99,7 @@ mobile_print(netdissect_options *ndo, const u_char *bp, u_int length)
 	if (in_cksum(vec, 1)!=0) {
 		ND_PRINT(" (bad checksum %u)", crc);
 	}
+	return;
+invalid:
+	nd_print_invalid(ndo);
 }