Import tcpdump 4.99.4vendor/tcpdump/4.99.4

Reviewed by:	emaste
Sponsored by:	The FreeBSD Foundation

1 files changed, 25 insertions, 16 deletions

diff --git a/print-vxlan.c b/print-vxlan.c
index 0c2a82e2afed..60dcd44def50 100644
--- a/print-vxlan.c
+++ b/print-vxlan.c
@@ -18,16 +18,19 @@
 /* specification: RFC 7348 */
 
 #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"
 
-static const char tstr[] = " [|VXLAN]";
-
+static const struct tok vxlan_flags [] = {
+    { 0x08, "I" },
+    { 0, NULL }
+};
 #define VXLAN_HDR_LEN 8
 
 /*
@@ -50,25 +53,31 @@ vxlan_print(netdissect_options *ndo, const u_char *bp, u_int len)
     uint8_t flags;
     uint32_t vni;
 
+    ndo->ndo_protocol = "vxlan";
+    nd_print_protocol_caps(ndo);
     if (len < VXLAN_HDR_LEN)
-        goto trunc;
+        goto invalid;
 
-    ND_TCHECK2(*bp, VXLAN_HDR_LEN);
+    flags = GET_U_1(bp);
+    bp += 1;
+    ND_PRINT(", flags [%s] (0x%02x), ",
+             bittok2str_nosep(vxlan_flags, "invalid", flags), flags);
 
-    flags = *bp;
-    bp += 4;
+    /* 1st Reserved */
+    bp += 3;
 
-    vni = EXTRACT_24BITS(bp);
-    bp += 4;
+    vni = GET_BE_U_3(bp);
+    bp += 3;
+    ND_PRINT("vni %u\n", vni);
 
-    ND_PRINT((ndo, "VXLAN, "));
-    ND_PRINT((ndo, "flags [%s] (0x%02x), ", flags & 0x08 ? "I" : ".", flags));
-    ND_PRINT((ndo, "vni %u\n", vni));
+    /* 2nd Reserved */
+    ND_TCHECK_1(bp);
+    bp += 1;
 
-    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((ndo, "%s", tstr));
+invalid:
+    nd_print_invalid(ndo);
 }