X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/1fe6e66ecec3fb7a7cc729038012cbb264542331..1a04b92e365f5ed01ca38619b41bcc4fc9cbd63c:/print-mobile.c

diff --git a/print-mobile.c b/print-mobile.c
index 64c7d556..5f9f54fe 100644
--- a/print-mobile.c
+++ b/print-mobile.c
@@ -36,24 +36,25 @@
  * 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)
 
 struct mobile_ip {
-	u_int16_t proto;
-	u_int16_t hcheck;
-	u_int32_t odst;
-	u_int32_t osrc;
+	uint16_t proto;
+	uint16_t hcheck;
+	uint32_t odst;
+	uint32_t osrc;
 };
 
 #define OSRC_PRES	0x0080	/* old source is present */
@@ -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;
 	}
@@ -86,15 +87,15 @@ mobile_print(netdissect_options *ndo, const u_char *bp, u_int length)
 	if (osp)  {
 		ND_PRINT((ndo, "[S] "));
 		if (ndo->ndo_vflag)
-			ND_PRINT((ndo, "%s ", ipaddr_string(&mob->osrc)));
+			ND_PRINT((ndo, "%s ", ipaddr_string(ndo, &mob->osrc)));
 	} else {
 		ND_PRINT((ndo, "[] "));
 	}
 	if (ndo->ndo_vflag) {
-		ND_PRINT((ndo, "> %s ", ipaddr_string(&mob->odst)));
+		ND_PRINT((ndo, "> %s ", ipaddr_string(ndo, &mob->odst)));
 		ND_PRINT((ndo, "(oproto=%d)", proto>>8));
 	}
-	vec[0].ptr = (const u_int8_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));