X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/6ec714988caac3bf9fedc766ae51a2248896ec80..e7cfa5e63a27e6fbb75e0bbd151af2c7d0d222e9:/print-otv.c

diff --git a/print-otv.c b/print-otv.c
index 502f93e4..dbcef9f6 100644
--- a/print-otv.c
+++ b/print-otv.c
@@ -18,10 +18,10 @@
 /* specification: draft-hasmit-otv-04 */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "extract.h"
@@ -45,30 +45,31 @@ otv_print(netdissect_options *ndo, const u_char *bp, u_int len)
 {
     uint8_t flags;
 
-    ND_PRINT((ndo, "OTV, "));
+    ndo->ndo_protocol = "otv";
+    ND_PRINT("OTV, ");
     if (len < OTV_HDR_LEN)
         goto trunc;
 
     ND_TCHECK_1(bp);
-    flags = EXTRACT_U_1(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_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]"));
+    nd_print_trunc(ndo);
 }