diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2020-02-24 13:52:50 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2020-02-24 19:31:32 +0100 |
| commit | b4f04cb9e5cda5a342bf0e95426f9f7bcbdcaf94 (patch) | |
| tree | 51d24b6a499839c1e833cc520323d3a5ff31466e /tests/shell/testcases/maps | |
| parent | 1f3974ce5c77fb66bc0be94a2e03286f73ac0b5b (diff) | |
tests: shell: adjust tests to new nat concatenation syntax
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'tests/shell/testcases/maps')
| -rw-r--r-- | tests/shell/testcases/maps/dumps/nat_addr_port.nft | 16 | ||||
| -rwxr-xr-x | tests/shell/testcases/maps/nat_addr_port | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/tests/shell/testcases/maps/dumps/nat_addr_port.nft b/tests/shell/testcases/maps/dumps/nat_addr_port.nft index bd20ae7e..210cab7f 100644 --- a/tests/shell/testcases/maps/dumps/nat_addr_port.nft +++ b/tests/shell/testcases/maps/dumps/nat_addr_port.nft @@ -19,8 +19,8 @@ table ip ipfoo { dnat to ip daddr map @x ip saddr 10.1.1.1 dnat to 10.2.3.4 ip saddr 10.1.1.2 tcp dport 42 dnat to 10.2.3.4:4242 - meta l4proto tcp dnat to ip saddr map @y - dnat to ip saddr . tcp dport map @z + meta l4proto tcp dnat ip addr . port to ip saddr map @y + dnat ip addr . port to ip saddr . tcp dport map @z } } table ip6 ip6foo { @@ -42,8 +42,8 @@ table ip6 ip6foo { dnat to ip6 daddr map @x ip6 saddr dead::1 dnat to feed::1 ip6 saddr dead::2 tcp dport 42 dnat to [c0::1a]:4242 - meta l4proto tcp dnat to ip6 saddr map @y - dnat to ip6 saddr . tcp dport map @z + meta l4proto tcp dnat ip6 addr . port to ip6 saddr map @y + dnat ip6 addr . port to ip6 saddr . tcp dport map @z } } table inet inetfoo { @@ -78,12 +78,12 @@ table inet inetfoo { dnat ip to ip daddr map @x4 ip saddr 10.1.1.1 dnat ip to 10.2.3.4 ip saddr 10.1.1.2 tcp dport 42 dnat ip to 10.2.3.4:4242 - meta l4proto tcp meta nfproto ipv4 dnat ip to ip saddr map @y4 - meta nfproto ipv4 dnat ip to ip saddr . tcp dport map @z4 + meta l4proto tcp meta nfproto ipv4 dnat ip addr . port to ip saddr map @y4 + meta nfproto ipv4 dnat ip addr . port to ip saddr . tcp dport map @z4 dnat ip6 to ip6 daddr map @x6 ip6 saddr dead::1 dnat ip6 to feed::1 ip6 saddr dead::2 tcp dport 42 dnat ip6 to [c0::1a]:4242 - meta l4proto tcp meta nfproto ipv6 dnat ip6 to ip6 saddr map @y6 - meta nfproto ipv6 dnat ip6 to ip6 saddr . tcp dport map @z6 + meta l4proto tcp meta nfproto ipv6 dnat ip6 addr . port to ip6 saddr map @y6 + meta nfproto ipv6 dnat ip6 addr . port to ip6 saddr . tcp dport map @z6 } } diff --git a/tests/shell/testcases/maps/nat_addr_port b/tests/shell/testcases/maps/nat_addr_port index 58bb8942..a8d970e5 100755 --- a/tests/shell/testcases/maps/nat_addr_port +++ b/tests/shell/testcases/maps/nat_addr_port @@ -21,8 +21,8 @@ table ip ipfoo { dnat to ip daddr map @x ip saddr 10.1.1.1 dnat to 10.2.3.4 ip saddr 10.1.1.2 tcp dport 42 dnat to 10.2.3.4:4242 - meta l4proto tcp dnat to ip saddr map @y - meta l4proto tcp dnat to ip saddr . tcp dport map @z + meta l4proto tcp dnat ip addr . port to ip saddr map @y + meta l4proto tcp dnat ip addr . port to ip saddr . tcp dport map @z } } EOF @@ -52,8 +52,8 @@ table ip6 ip6foo { dnat to ip6 daddr map @x ip6 saddr dead::1 dnat to feed::1 ip6 saddr dead::2 tcp dport 42 dnat to [c0::1a]:4242 - meta l4proto tcp dnat to ip6 saddr map @y - meta l4proto tcp dnat to ip6 saddr . tcp dport map @z + meta l4proto tcp dnat ip6 addr . port to ip6 saddr map @y + meta l4proto tcp dnat ip6 addr . port to ip6 saddr . tcp dport map @z } } EOF @@ -93,13 +93,13 @@ table inet inetfoo { dnat ip to ip daddr map @x4 ip saddr 10.1.1.1 dnat to 10.2.3.4 ip saddr 10.1.1.2 tcp dport 42 dnat to 10.2.3.4:4242 - meta l4proto tcp dnat ip to ip saddr map @y4 - meta l4proto tcp dnat ip to ip saddr . tcp dport map @z4 + meta l4proto tcp dnat ip addr . port to ip saddr map @y4 + meta l4proto tcp dnat ip addr . port to ip saddr . tcp dport map @z4 dnat ip6 to ip6 daddr map @x6 ip6 saddr dead::1 dnat to feed::1 ip6 saddr dead::2 tcp dport 42 dnat to [c0::1a]:4242 - meta l4proto tcp dnat ip6 to ip6 saddr map @y6 - meta l4proto tcp dnat ip6 to ip6 saddr . tcp dport map @z6 + meta l4proto tcp dnat ip6 addr . port to ip6 saddr map @y6 + meta l4proto tcp dnat ip6 addr . port to ip6 saddr . tcp dport map @z6 } } EOF |