diff options
| author | Florian Westphal <fw@strlen.de> | 2016-01-07 13:23:33 +0100 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2016-01-07 13:23:33 +0100 |
| commit | 757b3ab08b8b22f230fb8e481bec78ecbfbb335a (patch) | |
| tree | 6da3963f04e13807ed3f660639a177306b014155 /tests/py/ip/ct.t.payload | |
| parent | c2494dd6daac9a91f090504de6d38b7f404f0c1f (diff) | |
nft: swap key and direction in ct_dir syntax
old: ct saddr original 1.2.3.4
new: ct original saddr 1.2.3.4
The advantage is that this allows to add ct keys where direction is optional
without creating ambiguities in the parser.
So we can have
ct packets gt 42
ct original packets gt 42
Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'tests/py/ip/ct.t.payload')
| -rw-r--r-- | tests/py/ip/ct.t.payload | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/py/ip/ct.t.payload b/tests/py/ip/ct.t.payload index e06d988c..0449b077 100644 --- a/tests/py/ip/ct.t.payload +++ b/tests/py/ip/ct.t.payload @@ -1,60 +1,60 @@ -# ct saddr original 192.168.0.1 +# ct original saddr 192.168.0.1 ip test-ip4 output [ ct load src => reg 1 , dir original ] [ cmp eq reg 1 0x0100a8c0 ] -# ct saddr reply 192.168.0.1 +# ct reply saddr 192.168.0.1 ip test-ip4 output [ ct load src => reg 1 , dir reply ] [ cmp eq reg 1 0x0100a8c0 ] -# ct daddr original 192.168.0.1 +# ct original daddr 192.168.0.1 ip test-ip4 output [ ct load dst => reg 1 , dir original ] [ cmp eq reg 1 0x0100a8c0 ] -# ct daddr reply 192.168.0.1 +# ct reply daddr 192.168.0.1 ip test-ip4 output [ ct load dst => reg 1 , dir reply ] [ cmp eq reg 1 0x0100a8c0 ] -# ct saddr original 192.168.1.0/24 +# ct original saddr 192.168.1.0/24 ip test-ip4 output [ ct load src => reg 1 , dir original ] [ bitwise reg 1 = (reg=1 & 0x00ffffff ) ^ 0x00000000 ] [ cmp eq reg 1 0x0001a8c0 ] -# ct saddr reply 192.168.1.0/24 +# ct reply saddr 192.168.1.0/24 ip test-ip4 output [ ct load src => reg 1 , dir reply ] [ bitwise reg 1 = (reg=1 & 0x00ffffff ) ^ 0x00000000 ] [ cmp eq reg 1 0x0001a8c0 ] -# ct daddr original 192.168.1.0/24 +# ct original daddr 192.168.1.0/24 ip test-ip4 output [ ct load dst => reg 1 , dir original ] [ bitwise reg 1 = (reg=1 & 0x00ffffff ) ^ 0x00000000 ] [ cmp eq reg 1 0x0001a8c0 ] -# ct daddr reply 192.168.1.0/24 +# ct reply daddr 192.168.1.0/24 ip test-ip4 output [ ct load dst => reg 1 , dir reply ] [ bitwise reg 1 = (reg=1 & 0x00ffffff ) ^ 0x00000000 ] [ cmp eq reg 1 0x0001a8c0 ] -# ct l3proto original ipv4 +# ct original l3proto ipv4 ip test-ip4 output [ ct load l3protocol => reg 1 , dir original ] [ cmp eq reg 1 0x00000002 ] -# ct protocol original 6 ct proto-dst original 22 +# ct original protocol 6 ct original proto-dst 22 ip test-ip4 output [ ct load protocol => reg 1 , dir original ] [ cmp eq reg 1 0x00000006 ] [ ct load proto_dst => reg 1 , dir original ] [ cmp eq reg 1 0x00001600 ] -# ct protocol original 17 ct proto-src reply 53 +# ct original protocol 17 ct reply proto-src 53 ip test-ip4 output [ ct load protocol => reg 1 , dir original ] [ cmp eq reg 1 0x00000011 ] |