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

[tcpdump] / print-mobile.c

diff --git a/print-mobile.c b/print-mobile.c
index f217932a4f9ae26b90dbe7d39c0dcfd84c0ac610..5f9f54fe8390c0d8af7b229cebf2bfc3b87e6d8f 100644 (file)
--- a/print-mobile.c
+++ b/print-mobile.c
@@ -36,36 +36,25 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
  * POSSIBILITY OF SUCH DAMAGE.
  */
 

+/* \summary: IPv4 mobility printer */
+

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#ifndef lint
-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-mobile.c,v 1.7 2001-08-20 17:53:54 fenner Exp $";
-#endif
-
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/uio.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
+#include <netdissect-stdinc.h>

 
 

-#include <netdb.h>
-#include <stdio.h>
-
-#include "interface.h"
+#include "netdissect.h"

 #include "addrtoname.h"
 #include "addrtoname.h"

-#include "extract.h"           /* must come after interface.h */
+#include "extract.h"

 
 #define MOBILE_SIZE (8)
 
 struct mobile_ip {
 
 #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 */
 };
 
 #define OSRC_PRES      0x0080  /* old source is present */


@@ -74,42 +63,41 @@ struct mobile_ip {
  * Deencapsulate and print a mobile-tunneled IP datagram
  */
 void
  * 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 u_char *cp = bp +8 ;

        const struct mobile_ip *mob;
        const struct mobile_ip *mob;

+       struct cksum_vec vec[1];

        u_short proto,crc;
        u_char osp =0;                  /* old source address present */
 
        mob = (const struct mobile_ip *)bp;
 
        u_short proto,crc;
        u_char osp =0;                  /* old source address present */
 
        mob = (const struct mobile_ip *)bp;
 

-       if (length < MOBILE_SIZE) {
-               fputs("[|mobile]", stdout);
+       if (length < MOBILE_SIZE || !ND_TTEST(*mob)) {
+               ND_PRINT((ndo, "[|mobile]"));

                return;
        }
                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 (proto & OSRC_PRES) {
                osp=1;

-               cp +=4 ;

        }
        }

-       
+

        if (osp)  {
        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 {
        } 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));

        }
        }

-       if (in_cksum((u_short *)mob, osp ? 12 : 8, 0)!=0) {
-               (void)printf(" (bad checksum %d)",crc);
+       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));

        }
        }

-
-       return;

 }
 }