diff options
| author | Florian Westphal <fw@strlen.de> | 2017-09-29 13:55:54 +0200 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2017-09-29 13:55:54 +0200 |
| commit | 54a0c5dc0f4db879ad2f44fc77bcd2568719be42 (patch) | |
| tree | 5d5e17e0fca1c3cdd9fd582f17273705f8d6555f /tests/py/ip/ct.t | |
| parent | 28180991740e6942adfb12650ff2472d73e89387 (diff) | |
| parent | 26589362c1a3a7c3f0fdb5e70e831bcb4077b0d1 (diff) | |
Merge branch 'ct_rt_syntax_06'
inet family (and others, e.g. bridge) lack context to figure out the
layer 3 address type.
examples:
ct original saddr $addr
rt nexthop $addr
We can't use $addr, because it might be a set reference, e.g.
ct original saddr @whitelist
currently implemented workaround is to use 'meta nfproto' to provide the
l3 context, e.g.
meta nfproto ip rt nexthop 10.2.3.4
i.e. users need to fill dependency manually.
Pablo suggested to instead specify ip saddr, ip6 saddr:
ct original ip saddr $address
and then let nft handle the dependency injection, these changes do this.
Old syntax is preserved.
Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'tests/py/ip/ct.t')
| -rw-r--r-- | tests/py/ip/ct.t | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/py/ip/ct.t b/tests/py/ip/ct.t index d0f16c51..d3247f79 100644 --- a/tests/py/ip/ct.t +++ b/tests/py/ip/ct.t @@ -2,16 +2,16 @@ *ip;test-ip4;output -ct original saddr 192.168.0.1;ok -ct reply saddr 192.168.0.1;ok -ct original daddr 192.168.0.1;ok -ct reply daddr 192.168.0.1;ok +ct original ip saddr 192.168.0.1;ok +ct reply ip saddr 192.168.0.1;ok +ct original ip daddr 192.168.0.1;ok +ct reply ip daddr 192.168.0.1;ok # same, but with a netmask -ct original saddr 192.168.1.0/24;ok -ct reply saddr 192.168.1.0/24;ok -ct original daddr 192.168.1.0/24;ok -ct reply daddr 192.168.1.0/24;ok +ct original ip saddr 192.168.1.0/24;ok +ct reply ip saddr 192.168.1.0/24;ok +ct original ip daddr 192.168.1.0/24;ok +ct reply ip daddr 192.168.1.0/24;ok ct l3proto ipv4;ok ct l3proto foobar;fail @@ -20,4 +20,4 @@ ct protocol 6 ct original proto-dst 22;ok ct original protocol 17 ct reply proto-src 53;ok;ct protocol 17 ct reply proto-src 53 # wrong address family -ct reply daddr dead::beef;fail +ct reply ip daddr dead::beef;fail |