CI: Add warning exemptions for Sun C (suncc-5.14) on Solaris 10

[tcpdump] / print-mobile.c

diff --git a/print-mobile.c b/print-mobile.c
index 561e048f89027cbd8c25a3040f58a286a00c2946..0cba230ead39aaf6cb78e246f32972acc586f59a 100644 (file)
--- a/print-mobile.c
+++ b/print-mobile.c
@@ -36,107 +36,70 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+/* \summary: IPv4 mobility printer */
 
-#ifndef lint
-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-mobile.c,v 1.4 2000-09-23 08:54:34 guy Exp $";
-#endif
+#include <config.h>
 
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/uio.h>
-#include <sys/socket.h>
+#include "netdissect-stdinc.h"
 
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-
-#include <netdb.h>
-#include <stdio.h>
-
-#include "interface.h"
+#define ND_LONGJMP_FROM_TCHECK
+#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;
+       nd_uint16_t proto;
+       nd_uint16_t hcheck;
+       nd_uint32_t odst;
+       nd_uint32_t osrc;
 };
 
 #define OSRC_PRES      0x0080  /* old source is present */
 
-static u_int16_t mob_in_cksum(u_short *p, int len);
-
 /*
  * 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;
+       struct cksum_vec vec[1];
        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) {
-               fputs("[|mobile]", stdout);
-               return;
-       }
+       nd_print_protocol(ndo);
+       ND_PRINT(": ");
+       ND_ICHECK_U(length, <, MOBILE_SIZE);
+       ND_TCHECK_SIZE(mob);
 
-       proto = EXTRACT_16BITS(&mob->proto);
-       crc =  EXTRACT_16BITS(&mob->hcheck);
+       proto = GET_BE_U_2(mob->proto);
+       crc =  GET_BE_U_2(mob->hcheck);
        if (proto & OSRC_PRES) {
                osp=1;
-               cp +=4 ;
        }
-       
+
        if (osp)  {
-               fputs("[S] ",stdout);
-               if (vflag)
-                       (void)printf("%s ",ipaddr_string(&mob->osrc));
+               ND_PRINT("[S] ");
+               if (ndo->ndo_vflag)
+                       ND_PRINT("%s ", GET_IPADDR_STRING(mob->osrc));
        } else {
-               fputs("[] ",stdout);
+               ND_PRINT("[] ");
        }
-       if (vflag) {
-               (void)printf("> %s ",ipaddr_string(&mob->odst));
-               (void)printf("(oproto=%d)",proto>>8);
+       if (ndo->ndo_vflag) {
+               ND_PRINT("> %s ", GET_IPADDR_STRING(mob->odst));
+               ND_PRINT("(oproto=%u)", proto>>8);
        }
-       if (mob_in_cksum((u_short *)mob, osp ? 12 : 8)!=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(" (bad checksum %u)", crc);
        }
-
        return;
+invalid:
+       nd_print_invalid(ndo);
 }
-
-static u_int16_t mob_in_cksum(u_short *p, int len)
-{
-       u_int32_t sum = 0; 
-       int nwords = len >> 1;
-  
-       while (nwords-- != 0)
-               sum += *p++;
-  
-       if (len & 1) {
-               union {
-                       u_int16_t w;
-                       u_int8_t c[2]; 
-               } u;
-               u.c[0] = *(u_char *)p;
-               u.c[1] = 0;
-               sum += u.w;
-       } 
-
-       /* end-around-carry */
-       sum = (sum >> 16) + (sum & 0xffff);
-       sum += (sum >> 16);
-       return (~sum);
-}
-