X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/ed85e20e4d6a27d5405f37366dd34b64c10a9211..d7b497cac78b6e22a66a6bae9bdec60a8044f67a:/print-mobile.c

diff --git a/print-mobile.c b/print-mobile.c
index df412eeb..5f9f54fe 100644
--- a/print-mobile.c
+++ b/print-mobile.c
@@ -36,16 +36,17 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define NETDISSECT_REWORKED
+/* \summary: IPv4 mobility 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"		/* must come after interface.h */
+#include "extract.h"
 
 #define MOBILE_SIZE (8)
 
@@ -77,8 +78,8 @@ mobile_print(netdissect_options *ndo, const u_char *bp, u_int length)
 	}
 	ND_PRINT((ndo, "mobile: "));
 
-	proto = EXTRACT_16BITS(&mob->proto);
-	crc =  EXTRACT_16BITS(&mob->hcheck);
+	proto = EXTRACT_BE_U_2(&mob->proto);
+	crc =  EXTRACT_BE_U_2(&mob->hcheck);
 	if (proto & OSRC_PRES) {
 		osp=1;
 	}
@@ -94,7 +95,7 @@ mobile_print(netdissect_options *ndo, const u_char *bp, u_int length)
 		ND_PRINT((ndo, "> %s ", ipaddr_string(ndo, &mob->odst)));
 		ND_PRINT((ndo, "(oproto=%d)", proto>>8));
 	}
-	vec[0].ptr = (const uint8_t *)(void *)mob;
+	vec[0].ptr = (const uint8_t *)(const void *)mob;
 	vec[0].len = osp ? 12 : 8;
 	if (in_cksum(vec, 1)!=0) {
 		ND_PRINT((ndo, " (bad checksum %d)", crc));