On Solaris, for 64-bit builds, use the 64-bit pcap-config.

[tcpdump] / print-mobile.c

diff --git a/print-mobile.c b/print-mobile.c
index de4d68cfa97be67329e86d4faabc1bcc5ba9e212..528da79c9f3e88734bdb7e1d05597ef7c963ec02 100644 (file)
--- a/print-mobile.c
+++ b/print-mobile.c
@@ -39,10 +39,10 @@
 /* \summary: IPv4 mobility 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"
@@ -70,16 +70,17 @@ mobile_print(netdissect_options *ndo, const u_char *bp, u_int length)
        u_short proto,crc;
        u_char osp =0;                  /* old source address present */
 
+       ndo->ndo_protocol = "mobile";
        mob = (const struct mobile_ip *)bp;
 
        if (length < MOBILE_SIZE || !ND_TTEST_SIZE(mob)) {
-               ND_PRINT("[|mobile]");
+               nd_print_trunc(ndo);
                return;
        }
        ND_PRINT("mobile: ");
 
-       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;
        }
@@ -87,12 +88,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;