Use more the ND_TTEST_1() macro

[tcpdump] / print-vxlan.c

diff --git a/print-vxlan.c b/print-vxlan.c
index 80344634d1a370b31e5841ebb8cc167563be5182..82aec20cca2669517f86628d1c22e9e221f1f724 100644 (file)
--- a/print-vxlan.c
+++ b/print-vxlan.c
@@ -13,23 +13,27 @@
  * Original code by Francesco Fondelli (francesco dot fondelli, gmail dot com)
  */
 
+/* \summary: Virtual eXtensible Local Area Network (VXLAN) printer */
+
+/* specification: RFC 7348 */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
-
-#include <stdio.h>
-#include <stdlib.h>
+#include <netdissect-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
-#include "addrtoname.h"
 
-#include "udp.h"
+static const char tstr[] = " [|VXLAN]";
+
+#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
@@ -37,38 +41,34 @@
  *    |R|R|R|R|I|R|R|R|            Reserved                           |
  *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  *    |                VXLAN Network Identifier (VNI) |   Reserved    |
- *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ 
+ *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  */
 
 void
-vxlan_print(const u_char *bp, u_int len)
+vxlan_print(netdissect_options *ndo, const u_char *bp, u_int len)
 {
-    u_int8_t flags;
-    u_int32_t vni;
-    
-    if (len < 8) {
-        printf("[|VXLAN]");
-        return;
-    }
-
-    flags = *bp;
-    bp += 4;
+    uint8_t flags;
+    uint32_t vni;
+
+    if (len < VXLAN_HDR_LEN)
+        goto trunc;
+
+    ND_TCHECK_LEN(bp, VXLAN_HDR_LEN);
 
-    vni = EXTRACT_24BITS(bp);
+    flags = EXTRACT_U_1(bp);
     bp += 4;
 
-    printf("VXLAN, ");
+    vni = EXTRACT_BE_U_3(bp);
+    bp += 4;
 
-    fputs("flags [", stdout);
-    if (flags & 0x08)
-        fputs("I", stdout);
-    else
-        fputs(".", stdout);
-    fputs("] ", stdout);
+    ND_PRINT((ndo, "VXLAN, "));
+    ND_PRINT((ndo, "flags [%s] (0x%02x), ", flags & 0x08 ? "I" : ".", flags));
+    ND_PRINT((ndo, "vni %u\n", vni));
 
-    printf("(0x%02x), ", flags);
-    printf("vni %u\n", vni);
+    ether_print(ndo, bp, len - VXLAN_HDR_LEN, ndo->ndo_snapend - bp, NULL, NULL);
 
-    ether_print(gndo, bp, len - 8, len - 8, NULL, NULL);
     return;
+
+trunc:
+    ND_PRINT((ndo, "%s", tstr));
 }