summaryrefslogtreecommitdiff
path: root/interface-definitions/include
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-10-20 21:55:01 +0200
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2023-10-22 16:44:27 +0000
commit162bd820d6cb88091618be83369feb591fc30306 (patch)
tree7dacbedb19a21aea71c832bc76e6d6affe790e89 /interface-definitions/include
parentc53a8b2a837ef39cb16e69f94b9954053355382e (diff)
downloadvyos-1x-162bd820d6cb88091618be83369feb591fc30306.tar.gz
vyos-1x-162bd820d6cb88091618be83369feb591fc30306.zip
vxlan: T5671: change port to IANA assigned default port
Currently VyOS VXLAN implementation uses the Linux assigned port 8472 that predates the IANA assignment. As Most other vendors use the IANA assigned port, follow this guideline and use the new default port 4789. Existing configuration not defining an explicit port number will be migrated to the old default port number of 8472, keeping existing configurations work! (cherry picked from commit 6db8d3ded19f652b99231be0d705d76b598ac72a) # Conflicts: # interface-definitions/include/version/interfaces-version.xml.i
Diffstat (limited to 'interface-definitions/include')
-rw-r--r--interface-definitions/include/version/interfaces-version.xml.i4
1 files changed, 4 insertions, 0 deletions
diff --git a/interface-definitions/include/version/interfaces-version.xml.i b/interface-definitions/include/version/interfaces-version.xml.i
index 3d11ce888..25f158508 100644
--- a/interface-definitions/include/version/interfaces-version.xml.i
+++ b/interface-definitions/include/version/interfaces-version.xml.i
@@ -1,3 +1,7 @@
<!-- include start from include/version/interfaces-version.xml.i -->
+<<<<<<< HEAD
<syntaxVersion component='interfaces' version='30'></syntaxVersion>
+=======
+<syntaxVersion component='interfaces' version='32'></syntaxVersion>
+>>>>>>> 6db8d3ded (vxlan: T5671: change port to IANA assigned default port)
<!-- include end -->