diff options
author | Christian Poessinger <christian@poessinger.com> | 2021-03-07 20:59:17 +0100 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2021-03-07 20:59:17 +0100 |
commit | dd35eb76153191bc487e3ea23c3e73c753ec1d4b (patch) | |
tree | 648eba6397782f15c6f7a19cddd2e9c9bca1357e | |
parent | 549251f5ae1bc40a475b68fa8e6183aafbe703d6 (diff) | |
download | vyos-1x-dd35eb76153191bc487e3ea23c3e73c753ec1d4b.tar.gz vyos-1x-dd35eb76153191bc487e3ea23c3e73c753ec1d4b.zip |
vxlan: T3319: use default ttl of 16
VyOS 1.2 had a default ttl of 16 hardcoded to the node.def file [1], so until
this is handled via a migration script we have to obey that particular
setting.
[1]: https://github.com/vyos/vyatta-cfg-system/blob/crux/templates/interfaces/vxlan/node.def#L23
-rw-r--r-- | interface-definitions/include/interface-parameters-ttl.xml.i | 4 | ||||
-rw-r--r-- | interface-definitions/interfaces-vxlan.xml.in | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/interface-definitions/include/interface-parameters-ttl.xml.i b/interface-definitions/include/interface-parameters-ttl.xml.i index a6a6f163f..83563ecb1 100644 --- a/interface-definitions/include/interface-parameters-ttl.xml.i +++ b/interface-definitions/include/interface-parameters-ttl.xml.i @@ -1,10 +1,10 @@ <!-- included start from interface-parameters-ttl.xml.i --> <leafNode name="ttl"> <properties> - <help>Specifies TTL value to use in outgoing packets (default: 0)</help> + <help>Specifies TTL value to use in outgoing packets</help> <valueHelp> <format>0</format> - <description>Copy value from original IP header</description> + <description>Inherit - copy value from original IP header</description> </valueHelp> <valueHelp> <format>1-255</format> diff --git a/interface-definitions/interfaces-vxlan.xml.in b/interface-definitions/interfaces-vxlan.xml.in index d9d2d1033..97a40a9dc 100644 --- a/interface-definitions/interfaces-vxlan.xml.in +++ b/interface-definitions/interfaces-vxlan.xml.in @@ -55,6 +55,9 @@ #include <include/interface-parameters-dont-fragment.xml.i> #include <include/interface-parameters-tos.xml.i> #include <include/interface-parameters-ttl.xml.i> + <leafNode name="ttl"> + <defaultValue>16</defaultValue> + </leafNode> </children> </node> <node name="ipv6"> |