aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Mestery <kmestery@cisco.com>2013-04-26 14:30:24 -0400
committerJesse Gross <jesse@nicira.com>2013-04-29 09:56:44 -0700
commit96cc200148ab7060b6576cf45328067731430a4f (patch)
tree9f18ca60afb0ef27ec1b366003c0e65007a4c0f6
parentafd9a22b1b13b1b3e996f3eecea899993aa069dc (diff)
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> Conflicts: NEWS
-rw-r--r--lib/netdev-vport.c3
-rw-r--r--tests/tunnel.at2
-rw-r--r--vswitchd/vswitch.xml7
3 files changed, 5 insertions, 7 deletions
diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
index ccf80d7c..900dc8fe 100644
--- a/lib/netdev-vport.c
+++ b/lib/netdev-vport.c
@@ -41,8 +41,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 DEFAULT_TTL 64
diff --git a/tests/tunnel.at b/tests/tunnel.at
index a0688f17..b8491d94 100644
--- a/tests/tunnel.at
+++ b/tests/tunnel.at
@@ -382,7 +382,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 706bb240..1b862b33 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -1262,10 +1262,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>