Merge remote-tracking branch 'upstream/master'

[tcpdump] / print-mobile.c

diff --git a/print-mobile.c b/print-mobile.c
index 31a98cdbca3cf26b6d3713f50bb716dd6fec6304..de4eab1dce3b97e4c4e58a6a2d0c18fa44cd93af 100644 (file)
--- a/print-mobile.c
+++ b/print-mobile.c
@@ -40,6 +40,10 @@
 #include "config.h"
 #endif
 
+#ifndef lint
+static const char rcsid[] _U_ =
+     "@(#) $Header: /tcpdump/master/tcpdump/print-mobile.c,v 1.15 2004-03-24 01:58:14 guy Exp $";
+#endif
 
 #include <tcpdump-stdinc.h>
 
@@ -49,10 +53,6 @@
 #include "addrtoname.h"
 #include "extract.h"           /* must come after interface.h */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-mobile.c,v 1.13 2003-11-15 00:39:31 guy Exp $";
-#endif
 #define MOBILE_SIZE (8)
 
 struct mobile_ip {
@@ -72,12 +72,13 @@ mobile_print(const u_char *bp, u_int length)
 {
        const u_char *cp = bp +8 ;
        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;
 
-       if (length < MOBILE_SIZE) {
+       if (length < MOBILE_SIZE || !TTEST(*mob)) {
                fputs("[|mobile]", stdout);
                return;
        }
@@ -101,7 +102,9 @@ mobile_print(const u_char *bp, u_int length)
                (void)printf("> %s ",ipaddr_string(&mob->odst));
                (void)printf("(oproto=%d)",proto>>8);
        }
-       if (in_cksum((u_short *)mob, osp ? 12 : 8, 0)!=0) {
+       vec[0].ptr = (const u_int8_t *)(void *)mob;
+       vec[0].len = osp ? 12 : 8;
+       if (in_cksum(vec, 1)!=0) {
                (void)printf(" (bad checksum %d)",crc);
        }