Merge pull request #310 from ffatghub/master

vxlan: use IANA assigned port

diff --git a/CREDITS b/CREDITS
index a1065593d5321392dbc21b99592e0c6c47e41fd3..491eec1e7b6645b71599f9a789a110484004126b 100644 (file)
--- 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 fb56be58aab688881f81004ebbb9d1b7bf08283b..902054e0754ad73719f97f46bf7be6769cd1d8a9 100644 (file)
--- 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 4705dc9e9bde86e92e929094c3d058785df8ca87..d712dfcae2c308eb025e2df5f90f4d9a58a3c2bd 100644 (file)
--- 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*/