Update the default VXLAN destination UDP port to the IANA assigned port

VXLAN was recently assigned UDP port 4789 by IANA. This
comit updates the OVS VXLAN implementation to reflect the new UDP port
number.

Cc: Kenneth Duda <kduda@aristanetworks.com>
Signed-off-by: Kyle Mestery <kmestery@cisco.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>

diff --git a/NEWS b/NEWS
index 98d300b..266fc91 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
 post-v1.10.0
 ---------------------
+    - The default VXLAN destination UDP port was changed to 4789, which is
+      the one recently assigned by IANA.
     - The "tutorial" directory contains a new tutorial for some advanced
       Open vSwitch features.
     - Stable bond mode has been removed.

diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
index 4aa8bb0..cea44c8 100644 (file)
--- a/lib/netdev-vport.c
+++ b/lib/netdev-vport.c
@@ -42,7 +42,7 @@
 VLOG_DEFINE_THIS_MODULE(netdev_vport);
 
 /* Default to the OTV port, per the VXLAN IETF draft. */
-#define VXLAN_DST_PORT 8472
+#define VXLAN_DST_PORT 4789
 
 #define LISP_DST_PORT 4341
 

diff --git a/tests/tunnel.at b/tests/tunnel.at
index 78e43f5..2eabb77 100644 (file)
--- a/tests/tunnel.at
+++ b/tests/tunnel.at
@@ -398,7 +398,7 @@ br0 (dummy@ovs-dummy):
 
 dnl change UDP port to default
 
-AT_CHECK([ovs-vsctl -- set Interface p1 options:dst_port=8472])
+AT_CHECK([ovs-vsctl -- set Interface p1 options:dst_port=4789])
 
 AT_CHECK([ovs-appctl dpif/show], [0], [dnl
 br0 (dummy@ovs-dummy):

diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index 2744325..b5bae78 100644 (file)
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -1250,10 +1250,9 @@
              with kernel version 2.6.26 or later.
            </p>
            <p>
-             As an experimental protocol, VXLAN has no officially assigned UDP
-             port.  Open vSwitch currently uses UDP destination port 8472.
-             The source port used for VXLAN traffic varies on a per-flow basis
-             and is in the ephemeral port range.
+             Open vSwitch uses UDP destination port 4789.  The source port used for
+             VXLAN traffic varies on a per-flow basis and is in the ephemeral port
+             range.
            </p>
           </dd>