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 df412eeb289799e6f8801b0692c612c1382ff83d..0cba230ead39aaf6cb78e246f32972acc586f59a 100644 (file)
--- a/print-mobile.c
+++ b/print-mobile.c
@@ -36,24 +36,24 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define NETDISSECT_REWORKED
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+/* \summary: IPv4 mobility printer */
 
-#include <tcpdump-stdinc.h>
+#include <config.h>
 
-#include "interface.h"
+#include "netdissect-stdinc.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 {
-       uint16_t proto;
-       uint16_t hcheck;
-       uint32_t odst;
-       uint32_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 */
@@ -69,34 +69,37 @@ 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(*mob)) {
-               ND_PRINT((ndo, "[|mobile]"));
-               return;
-       }
-       ND_PRINT((ndo, "mobile: "));
+       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;
        }
 
        if (osp)  {
-               ND_PRINT((ndo, "[S] "));
+               ND_PRINT("[S] ");
                if (ndo->ndo_vflag)
-                       ND_PRINT((ndo, "%s ", ipaddr_string(ndo, &mob->osrc)));
+                       ND_PRINT("%s ", GET_IPADDR_STRING(mob->osrc));
        } else {
-               ND_PRINT((ndo, "[] "));
+               ND_PRINT("[] ");
        }
        if (ndo->ndo_vflag) {
-               ND_PRINT((ndo, "> %s ", ipaddr_string(ndo, &mob->odst)));
-               ND_PRINT((ndo, "(oproto=%d)", proto>>8));
+               ND_PRINT("> %s ", GET_IPADDR_STRING(mob->odst));
+               ND_PRINT("(oproto=%u)", proto>>8);
        }
-       vec[0].ptr = (const uint8_t *)(void *)mob;
+       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));
+               ND_PRINT(" (bad checksum %u)", crc);
        }
+       return;
+invalid:
+       nd_print_invalid(ndo);
 }