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

[tcpdump] / print-otv.c

diff --git a/print-otv.c b/print-otv.c
index 3b182f7e46a3fcbcba3533888db0859ce8dd9214..1303740009a08c9933c8e5129eaf8c3f99dcfe6a 100644 (file)
--- a/print-otv.c
+++ b/print-otv.c
@@ -13,15 +13,20 @@
  * Original code by Francesco Fondelli (francesco dot fondelli, gmail dot com)
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+/* \summary: Overlay Transport Virtualization (OTV) printer */
 
-#include <tcpdump-stdinc.h>
+/* specification: draft-hasmit-otv-04 */
 
+#include <config.h>
+
+#include "netdissect-stdinc.h"
+
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "extract.h"
 
+#define OTV_HDR_LEN 8
+
 /*
  * OTV header, draft-hasmit-otv-04
  *
@@ -37,28 +42,33 @@
 void
 otv_print(netdissect_options *ndo, const u_char *bp, u_int len)
 {
-    u_int8_t flags;
-    u_int32_t overlay_id;
-    u_int32_t instance_id;
+    uint8_t flags;
 
-    if (len < 8) {
-        ND_PRINT((ndo, "[|OTV]"));
-        return;
+    ndo->ndo_protocol = "otv";
+    ND_PRINT("OTV, ");
+    if (len < OTV_HDR_LEN) {
+        ND_PRINT("[length %u < %u]", len, OTV_HDR_LEN);
+        goto invalid;
     }
 
-    flags = *bp;
+    flags = GET_U_1(bp);
+    ND_PRINT("flags [%s] (0x%02x), ", flags & 0x08 ? "I" : ".", flags);
     bp += 1;
 
-    overlay_id = EXTRACT_24BITS(bp);
+    ND_PRINT("overlay %u, ", GET_BE_U_3(bp));
     bp += 3;
 
-    instance_id = EXTRACT_24BITS(bp);
-    bp += 4;
+    ND_PRINT("instance %u\n", GET_BE_U_3(bp));
+    bp += 3;
+
+    /* Reserved */
+    ND_TCHECK_1(bp);
+    bp += 1;
 
-    ND_PRINT((ndo, "OTV, "));
-    ND_PRINT((ndo, "flags [%s] (0x%02x), ", flags & 0x08 ? "I" : ".", flags));
-    ND_PRINT((ndo, "overlay %u, ", overlay_id));
-    ND_PRINT((ndo, "instance %u\n", instance_id));
+    ether_print(ndo, bp, len - OTV_HDR_LEN, ND_BYTES_AVAILABLE_AFTER(bp), NULL, NULL);
+    return;
 
-    ether_print(ndo, bp, len - 8, len - 8, NULL, NULL);
+invalid:
+    nd_print_invalid(ndo);
+    ND_TCHECK_LEN(bp, len);
 }