IPoIB: Add the output with -e for a capture test

[tcpdump] / print-vxlan.c

diff --git a/print-vxlan.c b/print-vxlan.c
index 80c8ddce023e91c22ce8253d59945d61a89066c8..d2b896b094503dcf9f215c75fd65965f83e55753 100644 (file)
--- a/print-vxlan.c
+++ b/print-vxlan.c
@@ -26,7 +26,6 @@
 #include "netdissect.h"
 #include "extract.h"
 
-static const char tstr[] = " [|VXLAN]";
 
 #define VXLAN_HDR_LEN 8
 
@@ -50,25 +49,26 @@ vxlan_print(netdissect_options *ndo, const u_char *bp, u_int len)
     uint8_t flags;
     uint32_t vni;
 
+    ndo->ndo_protocol = "vxlan";
     if (len < VXLAN_HDR_LEN)
         goto trunc;
 
     ND_TCHECK_LEN(bp, VXLAN_HDR_LEN);
 
-    flags = EXTRACT_U_1(bp);
+    flags = GET_U_1(bp);
     bp += 4;
 
-    vni = EXTRACT_BE_U_3(bp);
+    vni = GET_BE_U_3(bp);
     bp += 4;
 
     ND_PRINT("VXLAN, ");
     ND_PRINT("flags [%s] (0x%02x), ", flags & 0x08 ? "I" : ".", flags);
     ND_PRINT("vni %u\n", vni);
 
-    ether_print(ndo, bp, len - VXLAN_HDR_LEN, ndo->ndo_snapend - bp, NULL, NULL);
+    ether_print(ndo, bp, len - VXLAN_HDR_LEN, ND_BYTES_AVAILABLE_AFTER(bp), NULL, NULL);
 
     return;
 
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
 }