From: Denis Ovsienko <infrastation@yandex.ru>
Date: Fri, 10 May 2013 09:34:44 +0000 (-0700)
Subject: Merge pull request #310 from ffatghub/master
X-Git-Tag: tcpdump-4.5.0~81
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/001fc8411f90713c3495a1f3fcf8c67dbd3afa1b?hp=6640e1f4e40e316bc2b2233bce964df8d0c55bbc

Merge pull request #310 from ffatghub/master

vxlan: use IANA assigned port
---

diff --git a/CREDITS b/CREDITS
index a1065593..491eec1e 100644
--- a/CREDITS
+++ b/CREDITS
@@ -61,6 +61,7 @@ Additional people who have contributed patches:
     Fang Wang                     <fangwang at sourceforge dot net>
     Florent Drouin                <Florent dot Drouin at alcatel-lucent dot fr>
     Florian Forster               <octo at verplant dot org>
+    Francesco Fondelli            <francesco dot fondelli at gmail dot com>
     Francis Dupont                <Francis dot Dupont at enst-bretagne dot fr>
     Francisco Matias Cuenca-Acuna <mcuenca at george dot rutgers dot edu>
     Francois-Xavier Le Bail       <fx dot lebail at yahoo dot com>
diff --git a/print-udp.c b/print-udp.c
index fb56be58..902054e0 100644
--- a/print-udp.c
+++ b/print-udp.c
@@ -676,6 +676,8 @@ udp_print(register const u_char *bp, u_int length,
 			syslog_print((const u_char *)(up + 1), length);
                 else if (ISPORT(OTV_PORT))
 			otv_print((const u_char *)(up + 1), length);
+                else if (ISPORT(VXLAN_PORT))
+			vxlan_print((const u_char *)(up + 1), length);
 		else
 			(void)printf("UDP, length %u",
 			    (u_int32_t)(ulen - sizeof(*up)));
diff --git a/udp.h b/udp.h
index 4705dc9e..d712dfca 100644
--- a/udp.h
+++ b/udp.h
@@ -88,6 +88,7 @@ struct udphdr {
 #define LWAPP_DATA_PORT         12222 /* draft-ohara-capwap-lwapp-04.txt */
 #define LWAPP_CONTROL_PORT      12223 /* draft-ohara-capwap-lwapp-04.txt */
 #define OTV_PORT                8472  /* draft-hasmit-otv-04 */
+#define VXLAN_PORT              4789  /* draft-mahalingam-dutt-dcops-vxlan-04 */
 
 #ifdef INET6
 #define RIPNG_PORT 521		/*XXX*/