summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-01-15 17:20:44 +0100
committerChristian Poessinger <christian@poessinger.com>2021-01-15 17:20:44 +0100
commit2ae13c35257f73a9870ec655d55427ad30d6efdb (patch)
tree01df442136f97487143fa016065d7eed7a25f1d3 /src
parent9c810c6e68b161d1bf01ad5533ed7ebe4ebc0ae6 (diff)
parent0a7fc50a5aa686552ceb787349f953ea1e0ebd1a (diff)
downloadvyos-1x-2ae13c35257f73a9870ec655d55427ad30d6efdb.tar.gz
vyos-1x-2ae13c35257f73a9870ec655d55427ad30d6efdb.zip
Merge branch 'T3173' of https://github.com/sever-sever/vyos-1x into pmtu
* 'T3173' of https://github.com/sever-sever/vyos-1x: tunnel: T3173: Add nopmtudisc parameter for tunnels conf-mode
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/interfaces-tunnel.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/conf_mode/interfaces-tunnel.py b/src/conf_mode/interfaces-tunnel.py
index ffeb57784..f79405388 100755
--- a/src/conf_mode/interfaces-tunnel.py
+++ b/src/conf_mode/interfaces-tunnel.py
@@ -126,6 +126,11 @@ def verify(tunnel):
if 'source_interface' in tunnel:
verify_interface_exists(tunnel['source_interface'])
+ # ttl != 0 and nopmtudisc are incompatible
+ if 'pmtu_discovery' in tunnel['parameters']['ip']:
+ if 'disable' in tunnel['parameters']['ip']['pmtu_discovery'] and "0" not in tunnel['parameters']['ip']['ttl']:
+ raise ConfigError('ip ttl should be set to "0" with option "pmtu-discovery disable"')
+
def generate(tunnel):
return None
@@ -164,6 +169,7 @@ def apply(tunnel):
'local_ip' : 'local',
'remote_ip' : 'remote',
'source_interface' : 'dev',
+ 'parameters.ip.pmtu_discovery' : 'pmtud',
'parameters.ip.ttl' : 'ttl',
'parameters.ip.tos' : 'tos',
'parameters.ip.key' : 'key',