diff options
| -rw-r--r-- | src/parser_bison.y | 2 | ||||
| -rw-r--r-- | tests/py/ip/ct.t | 8 | ||||
| -rw-r--r-- | tests/py/ip/ct.t.payload | 8 |
3 files changed, 10 insertions, 8 deletions
diff --git a/src/parser_bison.y b/src/parser_bison.y index aac10dcc..36dbc8d8 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -2513,6 +2513,8 @@ ct_key : STATE { $$ = NFT_CT_STATE; } | EXPIRATION { $$ = NFT_CT_EXPIRATION; } | HELPER { $$ = NFT_CT_HELPER; } | LABEL { $$ = NFT_CT_LABELS; } + | L3PROTOCOL { $$ = NFT_CT_L3PROTOCOL; } + | PROTOCOL { $$ = NFT_CT_PROTOCOL; } | ct_key_counters ; ct_key_dir : SADDR { $$ = NFT_CT_SRC; } diff --git a/tests/py/ip/ct.t b/tests/py/ip/ct.t index 65f5d921..d0f16c51 100644 --- a/tests/py/ip/ct.t +++ b/tests/py/ip/ct.t @@ -13,11 +13,11 @@ 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 l3proto ipv4;ok -ct reply l3proto foobar;fail +ct l3proto ipv4;ok +ct l3proto foobar;fail -ct original protocol 6 ct original proto-dst 22;ok -ct original protocol 17 ct reply proto-src 53;ok +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 diff --git a/tests/py/ip/ct.t.payload b/tests/py/ip/ct.t.payload index 0449b077..56633a24 100644 --- a/tests/py/ip/ct.t.payload +++ b/tests/py/ip/ct.t.payload @@ -42,14 +42,14 @@ ip test-ip4 output [ bitwise reg 1 = (reg=1 & 0x00ffffff ) ^ 0x00000000 ] [ cmp eq reg 1 0x0001a8c0 ] -# ct original l3proto ipv4 +# ct l3proto ipv4 ip test-ip4 output - [ ct load l3protocol => reg 1 , dir original ] + [ ct load l3protocol => reg 1 ] [ cmp eq reg 1 0x00000002 ] -# ct original protocol 6 ct original proto-dst 22 +# ct protocol 6 ct original proto-dst 22 ip test-ip4 output - [ ct load protocol => reg 1 , dir original ] + [ ct load protocol => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ ct load proto_dst => reg 1 , dir original ] [ cmp eq reg 1 0x00001600 ] |