X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/39c8c55aa9ff84244cf558b9a957b78933babf0a..c39d40a767a1ae36171e5bcbf6f157ff3e80fb6c:/print-otv.c

diff --git a/print-otv.c b/print-otv.c
index f4daacfa..a0fe9d0e 100644
--- a/print-otv.c
+++ b/print-otv.c
@@ -18,11 +18,12 @@
 /* specification: draft-hasmit-otv-04 */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "extract.h"
 
@@ -45,30 +46,31 @@ otv_print(netdissect_options *ndo, const u_char *bp, u_int len)
 {
     uint8_t flags;
 
-    ND_PRINT((ndo, "OTV, "));
-    if (len < OTV_HDR_LEN)
-        goto trunc;
+    ndo->ndo_protocol = "otv";
+    ND_PRINT("OTV, ");
+    if (len < OTV_HDR_LEN) {
+        ND_PRINT("[length %u < %u]", len, OTV_HDR_LEN);
+        goto invalid;
+    }
 
-    ND_TCHECK(*bp);
-    flags = *bp;
-    ND_PRINT((ndo, "flags [%s] (0x%02x), ", flags & 0x08 ? "I" : ".", flags));
+    flags = GET_U_1(bp);
+    ND_PRINT("flags [%s] (0x%02x), ", flags & 0x08 ? "I" : ".", flags);
     bp += 1;
 
-    ND_TCHECK_3(bp);
-    ND_PRINT((ndo, "overlay %u, ", EXTRACT_BE_U_3(bp)));
+    ND_PRINT("overlay %u, ", GET_BE_U_3(bp));
     bp += 3;
 
-    ND_TCHECK_3(bp);
-    ND_PRINT((ndo, "instance %u\n", EXTRACT_BE_U_3(bp)));
+    ND_PRINT("instance %u\n", GET_BE_U_3(bp));
     bp += 3;
 
     /* Reserved */
-    ND_TCHECK(*bp);
+    ND_TCHECK_1(bp);
     bp += 1;
 
-    ether_print(ndo, bp, len - OTV_HDR_LEN, ndo->ndo_snapend - bp, NULL, NULL);
+    ether_print(ndo, bp, len - OTV_HDR_LEN, ND_BYTES_AVAILABLE_AFTER(bp), NULL, NULL);
     return;
 
-trunc:
-    ND_PRINT((ndo, " [|OTV]"));
+invalid:
+    nd_print_invalid(ndo);
+    ND_TCHECK_LEN(bp, len);
 }