summaryrefslogtreecommitdiff
path: root/src/op_mode/show_nat66_rules.py
diff options
context:
space:
mode:
authorjack9603301 <jack9603301@163.com>2021-03-16 17:00:47 +0800
committerjack9603301 <jack9603301@163.com>2021-03-17 02:58:09 +0800
commitf8e91ecebb69328300ddc3d863005209541b1225 (patch)
tree3d39b7afa045609bc824a883fba969e6cc8a7631 /src/op_mode/show_nat66_rules.py
parenta340f27512e71b5d5730be44b53768e1b7aee7f8 (diff)
downloadvyos-1x-f8e91ecebb69328300ddc3d863005209541b1225.tar.gz
vyos-1x-f8e91ecebb69328300ddc3d863005209541b1225.zip
nat66: T2518: Correct the wrong logic
For nat66, the previous processing of f0d0a572 (NAT: nat66: t2518: support operation...) has errors. If there is no index 3, we think that this is not the record we need
Diffstat (limited to 'src/op_mode/show_nat66_rules.py')
-rwxr-xr-xsrc/op_mode/show_nat66_rules.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/op_mode/show_nat66_rules.py b/src/op_mode/show_nat66_rules.py
index cbab2d03b..736ba2063 100755
--- a/src/op_mode/show_nat66_rules.py
+++ b/src/op_mode/show_nat66_rules.py
@@ -40,10 +40,17 @@ if args.source or args.destination:
data_json = jmespath.search('nftables[?rule].rule[?chain]', tmp)
for idx in range(0, len(data_json)):
data = data_json[idx]
+
+ # If there is no index 3, we don't think this is the record we need to check
+ if len(data['expr']) <= 3:
+ continue
+
comment = data['comment']
+ rule = comment.replace('SRC-NAT66-','')
+ rule = rule.replace('DST-NAT66-','')
chain = data['chain']
if not (args.source and chain == 'POSTROUTING') or (not args.source and chain == 'PREROUTING'):
- exit(0)
+ continue
interface = dict_search('match.right', data['expr'][0])
srcdest = dict_search('match.right.prefix.addr', data['expr'][2])
if srcdest:
@@ -52,6 +59,7 @@ if args.source or args.destination:
srcdest = srcdest + '/' + str(addr_tmp)
else:
srcdest = dict_search('match.right', data['expr'][2])
+
tran_addr = dict_search('snat.addr.prefix.addr' if args.source else 'dnat.addr.prefix.addr', data['expr'][3])
if tran_addr:
addr_tmp = dict_search('snat.addr.prefix.len' if args.source else 'dnat.addr.prefix.len', data['expr'][3])
@@ -60,12 +68,10 @@ if args.source or args.destination:
else:
if 'masquerade' in data['expr'][3]:
tran_addr = 'masquerade'
- elif 'log' in data['expr'][3]:
- continue
else:
tran_addr = dict_search('snat.addr' if args.source else 'dnat.addr', data['expr'][3])
- print(format_nat66_rule % (comment, srcdest, tran_addr, interface))
+ print(format_nat66_rule % (rule, srcdest, tran_addr, interface))
exit(0)
else: