summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-03-13 11:26:00 +0100
committerGitHub <noreply@github.com>2021-03-13 11:26:00 +0100
commit2595b90203ef1db5a86e332ca314f8a2df5ff28c (patch)
tree582f1a9b68d5e71c9dd240c6e4e53480337c496e /src/conf_mode
parentca08d8dc51ef93bfd5429c331ea919fe77ac8b39 (diff)
parentf0d0a572af9663a3dbbdbf5bbe9631a30235637f (diff)
downloadvyos-1x-2595b90203ef1db5a86e332ca314f8a2df5ff28c.tar.gz
vyos-1x-2595b90203ef1db5a86e332ca314f8a2df5ff28c.zip
Merge pull request #771 from jack9603301/T2518
nat: nat66: T2518: Support operation mode command
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/nat66.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/conf_mode/nat66.py b/src/conf_mode/nat66.py
index ce1db316c..86c27c77a 100755
--- a/src/conf_mode/nat66.py
+++ b/src/conf_mode/nat66.py
@@ -80,8 +80,10 @@ def get_config(config=None):
if not conf.exists(base):
nat['helper_functions'] = 'remove'
+ nat['pre_ct_ignore'] = get_handler(condensed_json, 'PREROUTING', 'VYATTA_CT_HELPER')
nat['pre_ct_conntrack'] = get_handler(condensed_json, 'PREROUTING', 'NAT_CONNTRACK')
- nat['out_ct_conntrack'] = get_handler(condensed_json, 'OUTPUT','NAT_CONNTRACK')
+ nat['out_ct_ignore'] = get_handler(condensed_json, 'OUTPUT', 'VYATTA_CT_HELPER')
+ nat['out_ct_conntrack'] = get_handler(condensed_json, 'OUTPUT', 'NAT_CONNTRACK')
nat['deleted'] = ''
return nat
@@ -91,8 +93,10 @@ def get_config(config=None):
nat['helper_functions'] = 'add'
# Retrieve current table handler positions
+ nat['pre_ct_ignore'] = get_handler(condensed_json, 'PREROUTING', 'VYATTA_CT_IGNORE')
nat['pre_ct_conntrack'] = get_handler(condensed_json, 'PREROUTING', 'VYATTA_CT_PREROUTING_HOOK')
- nat['out_ct_conntrack'] = get_handler(condensed_json, 'OUTPUT','VYATTA_CT_OUTPUT_HOOK')
+ nat['out_ct_ignore'] = get_handler(condensed_json, 'OUTPUT', 'VYATTA_CT_IGNORE')
+ nat['out_ct_conntrack'] = get_handler(condensed_json, 'OUTPUT', 'VYATTA_CT_OUTPUT_HOOK')
else:
nat['helper_functions'] = 'has'