Use more the EXTRACT_U_1() macro (40/n)

[tcpdump] / print-mobile.c

diff --git a/print-mobile.c b/print-mobile.c
index e8e0acce1f65c1e01d5a83db71b8a40c22c54d88..5f9f54fe8390c0d8af7b229cebf2bfc3b87e6d8f 100644 (file)
--- a/print-mobile.c
+++ b/print-mobile.c
@@ -36,25 +36,25 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+/* \summary: IPv4 mobility printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
-
-#include <stdio.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 */
@@ -63,7 +63,7 @@ struct mobile_ip {
  * Deencapsulate and print a mobile-tunneled IP datagram
  */
 void
-mobile_print(const u_char *bp, u_int length)
+mobile_print(netdissect_options *ndo, const u_char *bp, u_int length)
 {
        const struct mobile_ip *mob;
        struct cksum_vec vec[1];
@@ -72,34 +72,32 @@ mobile_print(const u_char *bp, u_int length)
 
        mob = (const struct mobile_ip *)bp;
 
-       if (length < MOBILE_SIZE || !TTEST(*mob)) {
-               fputs("[|mobile]", stdout);
+       if (length < MOBILE_SIZE || !ND_TTEST(*mob)) {
+               ND_PRINT((ndo, "[|mobile]"));
                return;
        }
-       fputs("mobile: ", stdout);
+       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;
        }
 
        if (osp)  {
-               fputs("[S] ",stdout);
-               if (vflag)
-                       (void)printf("%s ",ipaddr_string(&mob->osrc));
+               ND_PRINT((ndo, "[S] "));
+               if (ndo->ndo_vflag)
+                       ND_PRINT((ndo, "%s ", ipaddr_string(ndo, &mob->osrc)));
        } else {
-               fputs("[] ",stdout);
+               ND_PRINT((ndo, "[] "));
        }
-       if (vflag) {
-               (void)printf("> %s ",ipaddr_string(&mob->odst));
-               (void)printf("(oproto=%d)",proto>>8);
+       if (ndo->ndo_vflag) {
+               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) {
-               (void)printf(" (bad checksum %d)",crc);
+               ND_PRINT((ndo, " (bad checksum %d)", crc));
        }
-
-       return;
 }