- Add support for OTV (draft-hasmit-otv-04).

- Use the packettype infrastructure (-T vxlan) for VXLAN parsing (waiting for a well known dest port)

diff --git a/Makefile.in b/Makefile.in
index caf1d2612e1286b8f5c1a34fbeb83bf02d0cbefc..dda4eb5e39b64d182f1b1df02334049692c1ac9e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -93,7 +93,7 @@ CSRC =        addrtoname.c af.c checksum.c cpack.c gmpls.c oui.c gmt2local.c ipproto.c
        print-symantec.c print-syslog.c print-tcp.c print-telnet.c print-tftp.c \
        print-timed.c print-tipc.c print-token.c print-udld.c print-udp.c \
        print-usb.c print-vjc.c print-vqp.c print-vrrp.c print-vtp.c \
-       print-wb.c print-zephyr.c print-zeromq.c print-vxlan.c signature.c setsignal.c tcpdump.c util.c
+       print-wb.c print-zephyr.c print-zeromq.c print-vxlan.c print-otv.c signature.c setsignal.c tcpdump.c util.c
 
 LIBNETDISSECT_SRC=print-isakmp.c
 LIBNETDISSECT_OBJ=$(LIBNETDISSECT_SRC:.c=.o)

diff --git a/interface.h b/interface.h
index 57d4636dd72884f50d31696c53036ea46392f1b0..2dff9d81b77eb0970aa3be1e72a8f464e057e212 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -73,6 +73,7 @@ extern char *strsep(char **, const char *);
 #define PT_CARP                10      /* Common Address Redundancy Protocol */
 #define PT_RADIUS      11      /* RADIUS authentication Protocol */
 #define PT_ZMTP1       12      /* ZeroMQ Message Transport Protocol 1.0 */
+#define PT_VXLAN       13      /* Virtual eXtensible Local Area Network */
 
 #ifndef min
 #define min(a,b) ((a)>(b)?(b):(a))

diff --git a/netdissect.h b/netdissect.h
index cc24d36c930a1a1e5c71bade6cb8bb6a7efc15ed..be6fb11908ba263a7e3dee520e63dae07a766dce 100644 (file)
--- a/netdissect.h
+++ b/netdissect.h
@@ -182,6 +182,7 @@ struct netdissect_options {
 #define PT_CARP                10      /* Common Address Redundancy Protocol */
 #define PT_RADIUS      11      /* RADIUS authentication Protocol */
 #define PT_ZMTP1       12      /* ZeroMQ Message Transport Protocol 1.0 */
+#define PT_VXLAN       13      /* Virtual eXtensible Local Area Network */
 
 #ifndef min
 #define min(a,b) ((a)>(b)?(b):(a))

diff --git a/print-otv.c b/print-otv.c
new file mode 100644 (file)
index 0000000..f312b0b
--- /dev/null
+++ b/print-otv.c
@@ -0,0 +1,79 @@
+/*
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source code
+ * distributions retain the above copyright notice and this paragraph
+ * in its entirety, and (2) distributions including binary code include
+ * the above copyright notice and this paragraph in its entirety in
+ * the documentation or other materials provided with the distribution.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND
+ * WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT
+ * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE.
+ *
+ * Original code by Francesco Fondelli (francesco dot fondelli, gmail dot com)
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <tcpdump-stdinc.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "interface.h"
+#include "extract.h"
+#include "addrtoname.h"
+
+#include "udp.h"
+
+/*
+ * OTV header, draft-hasmit-otv-04
+ *
+ *     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
+ *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *     |R|R|R|R|I|R|R|R|           Overlay ID                          |
+ *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *     |          Instance ID                          | Reserved      |
+ *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+
+void
+otv_print(const u_char *bp, u_int len, u_int port)
+{
+    u_int8_t flags;
+    u_int32_t overlay_id;
+    u_int32_t instance_id;
+    
+    if (len < 8) {
+        printf("[|OTV]");
+        return;
+    }
+
+    flags = *bp;
+    bp += 1;
+
+    overlay_id = EXTRACT_24BITS(bp);
+    bp += 3;
+
+    instance_id = EXTRACT_24BITS(bp);
+    bp += 4;
+
+    printf("OTV, ");
+
+    fputs("flags [", stdout);
+    if (flags & 0x08)
+        fputs("I", stdout);
+    else
+        fputs(".", stdout);
+    fputs("] ", stdout);
+
+    printf("(0x%02x), ", flags);
+    printf("overlay %u, ", overlay_id);
+    printf("instance %u\n", instance_id);
+
+    ether_print(gndo, bp, len - 8, len - 8, NULL, NULL);
+    return;
+}

diff --git a/print-udp.c b/print-udp.c
index 00f73f79923e8f7ab98d33cf635aa07011646505..3c5ed8bcc47bc9f1381de6cd404b036706578d25 100644 (file)
--- a/print-udp.c
+++ b/print-udp.c
@@ -474,6 +474,11 @@ udp_print(register const u_char *bp, u_int length,
                        udpipaddr_print(ip, sport, dport);
                        radius_print(cp, length);
                        break;
+
+               case PT_VXLAN:
+                       udpipaddr_print(ip, sport, dport);
+                       vxlan_print((const u_char *)(up + 1), length);
+                       break;
                }
                return;
        }
@@ -663,8 +668,8 @@ udp_print(register const u_char *bp, u_int length,
                        sip_print((const u_char *)(up + 1), length);
                 else if (ISPORT(SYSLOG_PORT))
                        syslog_print((const u_char *)(up + 1), length);
-                else if (ISPORT(VXLAN_PORT))
-                       vxlan_print((const u_char *)(up + 1), length);
+                else if (ISPORT(OTV_PORT))
+                       otv_print((const u_char *)(up + 1), length);
                else
                        (void)printf("UDP, length %u",
                            (u_int32_t)(ulen - sizeof(*up)));

diff --git a/print-vxlan.c b/print-vxlan.c
index 2e5433e34648be1f1e344d947ead68aab417e3c6..9f8c3fb451ab22792ec93efe82f4857ed2abbf9d 100644 (file)
--- a/print-vxlan.c
+++ b/print-vxlan.c
@@ -33,7 +33,6 @@
  *
  *     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
- *
  *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  *    |R|R|R|R|I|R|R|R|            Reserved                           |
  *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

diff --git a/tcpdump.1.in b/tcpdump.1.in
index d22232614f6eb9324d286f30de8b95a0bdf67f28..cb2fbdd378e9cd61378f2452acd1408359e7eda2 100644 (file)
--- a/tcpdump.1.in
+++ b/tcpdump.1.in
@@ -527,8 +527,9 @@ Currently known types are
 \fBtftp\fR (Trivial File Transfer Protocol),
 \fBvat\fR (Visual Audio Tool),
 \fBwb\fR (distributed White Board),
+\fBzmtp1\fR (ZeroMQ Message Transport Protocol 1.0)
 and
-\fBzmtp1\fR (ZeroMQ Message Transport Protocol 1.0).
+\fBvxlan\fR (Virtual eXtensible Local Area Network).
 .TP
 .B \-t
 \fIDon't\fP print a timestamp on each dump line.

diff --git a/tcpdump.c b/tcpdump.c
index ad07df6f4a97c45fd1877a72123f8438b6959576..66d81bbf4f607bde784d8a770d09fea94d723954 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -1013,6 +1013,8 @@ main(int argc, char **argv)
                                packettype = PT_RADIUS;
                        else if (strcasecmp(optarg, "zmtp1") == 0)
                                packettype = PT_ZMTP1;
+                       else if (strcasecmp(optarg, "vxlan") == 0)
+                               packettype = PT_VXLAN;
                        else
                                error("unknown packet type `%s'", optarg);
                        break;

diff --git a/udp.h b/udp.h
index f9f67ee80a1062862256ea15c58b74cf7592aeb6..b07cdd4331f6698408f4cf298556a93a4b179f27 100644 (file)
--- a/udp.h
+++ b/udp.h
@@ -85,7 +85,7 @@ struct udphdr {
 #define SFLOW_PORT              6343 /* http://www.sflow.org/developers/specifications.php */
 #define LWAPP_DATA_PORT         12222 /* draft-ohara-capwap-lwapp-04.txt */
 #define LWAPP_CONTROL_PORT      12223 /* draft-ohara-capwap-lwapp-04.txt */
-#define VXLAN_PORT              8472  /* draft-mahalingam-dutt-dcops-vxlan-03 */
+#define OTV_PORT                8472  /* draft-hasmit-otv-04 */
 
 #ifdef INET6
 #define RIPNG_PORT 521         /*XXX*/