X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/b38f324af9dd953a661b9f35910f8c6d8eb2cc06..1a04b92e365f5ed01ca38619b41bcc4fc9cbd63c:/print-otv.c

diff --git a/print-otv.c b/print-otv.c
index 1b051072..502f93e4 100644
--- a/print-otv.c
+++ b/print-otv.c
@@ -26,6 +26,8 @@
 #include "netdissect.h"
 #include "extract.h"
 
+#define OTV_HDR_LEN 8
+
 /*
  * OTV header, draft-hasmit-otv-04
  *
@@ -42,27 +44,31 @@ void
 otv_print(netdissect_options *ndo, const u_char *bp, u_int len)
 {
     uint8_t flags;
-    uint32_t overlay_id;
-    uint32_t instance_id;
 
-    if (len < 8) {
-        ND_PRINT((ndo, "[|OTV]"));
-        return;
-    }
+    ND_PRINT((ndo, "OTV, "));
+    if (len < OTV_HDR_LEN)
+        goto trunc;
 
-    flags = *bp;
+    ND_TCHECK_1(bp);
+    flags = EXTRACT_U_1(bp);
+    ND_PRINT((ndo, "flags [%s] (0x%02x), ", flags & 0x08 ? "I" : ".", flags));
     bp += 1;
 
-    overlay_id = EXTRACT_24BITS(bp);
+    ND_TCHECK_3(bp);
+    ND_PRINT((ndo, "overlay %u, ", EXTRACT_BE_U_3(bp)));
+    bp += 3;
+
+    ND_TCHECK_3(bp);
+    ND_PRINT((ndo, "instance %u\n", EXTRACT_BE_U_3(bp)));
     bp += 3;
 
-    instance_id = EXTRACT_24BITS(bp);
-    bp += 4;
+    /* 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, ndo->ndo_snapend - bp, NULL, NULL);
+    return;
 
-    ether_print(ndo, bp, len - 8, len - 8, NULL, NULL);
+trunc:
+    ND_PRINT((ndo, " [|OTV]"));
 }