gre: add support for MikroTik Ethernet-over-IP hack.

[tcpdump] / print-vxlan.c

diff --git a/print-vxlan.c b/print-vxlan.c
index d2b896b094503dcf9f215c75fd65965f83e55753..f7bbb4a2067ed17d6901dd68c303d1b085832674 100644 (file)
--- a/print-vxlan.c
+++ b/print-vxlan.c
@@ -23,10 +23,16 @@
 
 #include "netdissect-stdinc.h"
 
 
 #include "netdissect-stdinc.h"
 

+#define ND_LONGJMP_FROM_TCHECK

 #include "netdissect.h"
 #include "extract.h"
 
 #include "netdissect.h"
 #include "extract.h"
 

+#define VXLAN_I     0x08 /* Instance Bit */

 
 

+static const struct tok vxlan_flags [] = {
+    { VXLAN_I, "I" },
+    { 0, NULL }
+};

 #define VXLAN_HDR_LEN 8
 
 /*
 #define VXLAN_HDR_LEN 8
 
 /*


@@ -47,28 +53,37 @@ void
 vxlan_print(netdissect_options *ndo, const u_char *bp, u_int len)
 {
     uint8_t flags;
 vxlan_print(netdissect_options *ndo, const u_char *bp, u_int len)
 {
     uint8_t flags;

-    uint32_t vni;

 
     ndo->ndo_protocol = "vxlan";
 
     ndo->ndo_protocol = "vxlan";

+    nd_print_protocol_caps(ndo);

     if (len < VXLAN_HDR_LEN)
     if (len < VXLAN_HDR_LEN)

-        goto trunc;
-
-    ND_TCHECK_LEN(bp, VXLAN_HDR_LEN);
+        goto invalid;

 
     flags = GET_U_1(bp);
 
     flags = GET_U_1(bp);

-    bp += 4;
-
-    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);
+    bp += 1;
+    ND_PRINT(", flags [%s] (0x%02x), ",
+             bittok2str_nosep(vxlan_flags, "invalid", flags), flags);
+
+    /* 1st Reserved */
+    bp += 3;
+
+    /*
+     * RFC 7348 says that the I flag MUST be set.
+     */
+    if (flags & VXLAN_I)
+        ND_PRINT("vni %u\n", GET_BE_U_3(bp));
+    else
+        ND_PRINT("ERROR: I flag not set\n");
+    bp += 3;
+
+    /* 2nd Reserved */
+    ND_TCHECK_1(bp);
+    bp += 1;

 
     ether_print(ndo, bp, len - VXLAN_HDR_LEN, ND_BYTES_AVAILABLE_AFTER(bp), NULL, NULL);
 
     return;
 
 
     ether_print(ndo, bp, len - VXLAN_HDR_LEN, ND_BYTES_AVAILABLE_AFTER(bp), NULL, NULL);
 
     return;
 

-trunc:
-    nd_print_trunc(ndo);
+invalid:
+    nd_print_invalid(ndo);

 }
 }