the failed/passed count was not kept in the right place

[tcpdump] / print-vxlan.c

diff --git a/print-vxlan.c b/print-vxlan.c
index 62b4b2ba0b1a18cb06b3befe0aacce60281b5c63..d2b896b094503dcf9f215c75fd65965f83e55753 100644 (file)
--- a/print-vxlan.c
+++ b/print-vxlan.c
@@ -13,18 +13,26 @@
  * Original code by Francesco Fondelli (francesco dot fondelli, gmail dot com)
  */
 
  * Original code by Francesco Fondelli (francesco dot fondelli, gmail dot com)
  */
 

-#define NETDISSECT_REWORKED
+/* \summary: Virtual eXtensible Local Area Network (VXLAN) printer */
+
+/* specification: RFC 7348 */
+

 #ifdef HAVE_CONFIG_H
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

-#include <tcpdump-stdinc.h>
+#include "netdissect-stdinc.h"

 
 

-#include "interface.h"
+#include "netdissect.h"

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

+
+#define VXLAN_HDR_LEN 8
+

 /*
 /*

- * VXLAN header, draft-mahalingam-dutt-dcops-vxlan-03
+ * VXLAN header, RFC7348
+ *               Virtual eXtensible Local Area Network (VXLAN): A Framework
+ *               for Overlaying Virtualized Layer 2 Networks over Layer 3 Networks

  *
  *     0                   1                   2                   3
  *     0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
  *
  *     0                   1                   2                   3
  *     0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1


@@ -41,20 +49,26 @@ vxlan_print(netdissect_options *ndo, const u_char *bp, u_int len)
     uint8_t flags;
     uint32_t vni;
 
     uint8_t flags;
     uint32_t vni;
 

-    if (len < 8) {
-        ND_PRINT((ndo, "[|VXLAN]"));
-        return;
-    }
+    ndo->ndo_protocol = "vxlan";
+    if (len < VXLAN_HDR_LEN)
+        goto trunc;

 
 

-    flags = *bp;
+    ND_TCHECK_LEN(bp, VXLAN_HDR_LEN);
+
+    flags = GET_U_1(bp);

     bp += 4;
 
     bp += 4;
 

-    vni = EXTRACT_24BITS(bp);
+    vni = GET_BE_U_3(bp);

     bp += 4;
 
     bp += 4;
 

-    ND_PRINT((ndo, "VXLAN, "));
-    ND_PRINT((ndo, "flags [%s] (0x%02x), ", flags & 0x08 ? "I" : ".", flags));
-    ND_PRINT((ndo, "vni %u\n", vni));
+    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, ND_BYTES_AVAILABLE_AFTER(bp), NULL, NULL);
+
+    return;

 
 

-    ether_print(ndo, bp, len - 8, len - 8, NULL, NULL);
+trunc:
+    nd_print_trunc(ndo);

 }
 }