ct original ip saddr ... handling
Florian Westphal
maintainerI am running out of time so I have to send this unfinished/non-working state.
It breaks because ct is riddled with conflicts,
in nft we've handled original/reply as STRING to avoid conflicts with 'arp reply', so we cannot add
ct original ip saddr
because it is
ct STRING IP SADDR
and that conflicts with basic use where 'ip saddr' could be payload expression, and STRING is one of the normal ct tokens and not a direction.
I am trying to fix this here by moving all ct keywords back to tokens. There are no shift/reduce errors, things compile fine, and all test cases work. Its just that we break 'ct event set label':
Works:
ct event set new or reply
ct event set new,reply
ct event set new,label
fails:
ct event set label ('expects COMMA')
Other than that it should work, this also adds dependency removal for meta and ct when de-linearizing rulesets and gets rid of the uneeded meta dependency when using rt nexthop in inet table.
Florian Westphal
maintainerPATCH 1/17 rename struct ct to ct_helper
Its misleading, this structure holds members for ct_helper object infrastructure, rename it.
--- include/rule.h | 6 +++--- src/netlink.c | 14 +++++++------- src/parser_bison.y | 12 ++++++------ src/rule.c | 6 +++--- 4 files changed, 19 insertions(+), 19 deletions(-)
include/rule.h +3 -3
@@ -263,8 +263,8 @@ struct quota {uint32_t flags; }; -struct ct { -char helper_name[16 ]; +struct ct_helper { +char name[16 ];uint16_t l3proto;uint8_t l4proto; };
@@ -287,7 +287,7 @@ struct obj {union {struct counter counter;struct quota quota; -struct ct ct; +struct ct_helper ct_helper; }; };
src/netlink.c +7 -7
@@ -319,12 +319,12 @@ alloc_nftnl_obj(const struct handle *h, struct obj *obj)break ;case NFT_OBJECT_CT_HELPER :nftnl_obj_set_str (nlo,NFTNL_OBJ_CT_HELPER_NAME , - obj->ct.helper_name); + obj->ct_helper.name);nftnl_obj_set_u8 (nlo,NFTNL_OBJ_CT_HELPER_L4PROTO , - obj->ct.l4proto); -if (obj->ct.l3proto) + obj->ct_helper.l4proto); +if (obj->ct_helper.l3proto)nftnl_obj_set_u16 (nlo,NFTNL_OBJ_CT_HELPER_L3PROTO , - obj->ct.l3proto); + obj->ct_helper.l3proto);break ;default :BUG ("Unknown type %d\n" , obj->type);
@@ -1832,10 +1832,10 @@ static struct obj *netlink_delinearize_obj(struct netlink_ctx *ctx,nftnl_obj_get_u32 (nlo,NFTNL_OBJ_QUOTA_FLAGS );break ;case NFT_OBJECT_CT_HELPER : -snprintf (obj->ct.helper_name,sizeof (obj->ct.helper_name),"%s" , +snprintf (obj->ct_helper.name,sizeof (obj->ct_helper.name),"%s" ,nftnl_obj_get_str (nlo,NFTNL_OBJ_CT_HELPER_NAME )); - obj->ct.l3proto =nftnl_obj_get_u16 (nlo,NFTNL_OBJ_CT_HELPER_L3PROTO ); - obj->ct.l4proto =nftnl_obj_get_u8 (nlo,NFTNL_OBJ_CT_HELPER_L4PROTO ); + obj->ct_helper.l3proto =nftnl_obj_get_u16 (nlo,NFTNL_OBJ_CT_HELPER_L3PROTO ); + obj->ct_helper.l4proto =nftnl_obj_get_u8 (nlo,NFTNL_OBJ_CT_HELPER_L4PROTO );break ; } obj->type = type;
src/parser_bison.y +6 -6
@@ -2706,14 +2706,14 @@ ct_l4protoname : TCP { $$ = IPPROTO_TCP; } ct_config : TYPE QUOTED_STRING PROTOCOL ct_l4protoname stmt_seperator { - struct ct *ct; + struct ct_helper *ct; int ret; - ct = &$<obj>0->ct; + ct = &$<obj>0->ct_helper; - ret = snprintf(ct->helper_name, sizeof(ct->helper_name), "%s", $2); - if (ret <= 0 || ret >= (int)sizeof(ct->helper_name)) { - erec_queue(error(&@2, "invalid name '%s', max length is %u\n", $2, (int)sizeof(ct->helper_name)), state->msgs); + ret = snprintf(ct->name, sizeof(ct->name), "%s", $2); + if (ret <= 0 || ret >= (int)sizeof(ct->name)) { + erec_queue(error(&@2, "invalid name '%s', max length is %u\n", $2, (int)sizeof(ct->name)), state->msgs); YYERROR; }
@@ -2721,7 +2721,7 @@ ct_config : TYPE QUOTED_STRING PROTOCOL ct_l4protoname stmt_seperator } | L3PROTOCOL family_spec_explicit stmt_seperator { - $<obj>0->ct.l3proto = $2; + $<obj>0->ct_helper.l3proto = $2; } ;
src/rule.c +3 -3
@@ -1258,9 +1258,9 @@ static void obj_print_data(const struct obj *obj,break ;case NFT_OBJECT_CT_HELPER : {printf ("ct helper %s {\n" , obj->handle.obj); -printf ("\t\ttype \"%s\" protocol " , obj->ct.helper_name); -print_proto_name_proto (obj->ct.l4proto); -printf ("\t\tl3proto %s" ,family2str (obj->ct.l3proto)); +printf ("\t\ttype \"%s\" protocol " , obj->ct_helper.name); +print_proto_name_proto (obj->ct_helper.l4proto); +printf ("\t\tl3proto %s" ,family2str (obj->ct_helper.l3proto));break ; }default :
Signature · 1 line
2.13.0
Florian Westphal
maintainerPATCH 2/17 src: prepare for future ct timeout policy support
In reply to Florian WestphalChange all places that expect ct helper tokens (ct helper configuration)
to CT HELPER. Also rename ct_block to ct_helper_block; we want to
add a ct_timeout_pol_block (or similar), notg extend ct_block.
--- include/rule.h | 2 +- src/ct.c | 10 ----- src/parser_bison.y | 109 +++++++++++++++-------------------------------------- src/rule.c | 7 +++- src/scanner.l | 1 + 5 files changed, 38 insertions(+), 91 deletions(-)
include/rule.h +1 -1
@@ -448,7 +448,7 @@ extern struct cmd *cmd_alloc(enum cmd_ops op, enum cmd_obj obj,extern void nft_cmd_expand (struct cmd *cmd);extern struct cmd *cmd_alloc_obj_ct (enum cmd_ops op,int type,const struct handle *h, -const struct location *loc,void *data); +const struct location *loc,struct obj *obj);extern void cmd_free (struct cmd *cmd);#include <payload.h>
src/ct.c +0 -10
@@ -384,16 +384,6 @@ struct error_record *ct_key_parse(const struct location *loc, const char *str,return error (loc,"syntax error, unexpected %s, known keys are %s" , str, buf); } -struct error_record *ct_objtype_parse (const struct location *loc,const char *str,int *type) -{ -if (strcmp (str,"helper" ) ==0 ) { - *type =NFT_OBJECT_CT_HELPER ; -return NULL ; - } - -return error (loc,"unknown ct class '%s', want 'helper'" , str); -} -struct expr *ct_expr_alloc (const struct location *loc,enum nft_ct_keys key,int8_t direction) {
src/parser_bison.y +31 -78
205 lines not on this page · raw message
src/rule.c +5 -2
@@ -1664,10 +1664,13 @@ static int do_command_describe(struct netlink_ctx *ctx, struct cmd *cmd) }struct cmd *cmd_alloc_obj_ct (enum cmd_ops op,int type,const struct handle *h, -const struct location *loc,void *data) +const struct location *loc,struct obj *obj) {enum cmd_obj cmd_obj; +if (obj) + obj->type = type; +switch (type) {case NFT_OBJECT_CT_HELPER : cmd_obj =CMD_OBJ_CT_HELPER ;
@@ -1676,7 +1679,7 @@ struct cmd *cmd_alloc_obj_ct(enum cmd_ops op, int type, const struct handle *h,BUG ("missing type mapping" ); } -return cmd_alloc (op, cmd_obj, h, loc, data); +return cmd_alloc (op, cmd_obj, h, loc, obj); }int do_command (struct netlink_ctx *ctx,struct cmd *cmd)
src/scanner.l +1 -0
@@ -478,6 +478,7 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "nexthop" { return NEXTHOP; } "ct" { return CT; } +"helper" { return HELPER; } "l3proto" { return L3PROTOCOL; } "proto-src" { return PROTO_SRC; } "proto-dst" { return PROTO_DST; }
Signature · 1 line
2.13.0
Florian Westphal
maintainerPATCH 3/17 parser: use scanner tokens again for ct key handling
In reply to Florian WestphalThis partially reverts commitc992153402c78d91e8beba791171bced21c62d3f
("ct: allow resolving ct keys at run time").
It was a bad idea; problem is that if we want to support a syntax like
ct origin ip saddr @foo
(to indicate that we want to match ip addresses, not ipv6), then we get a failure here because "ip" is a token and not a string.
We could work around this by convertig ip to a string in that case but thats worse than using tokens again.
--- include/ct.h | 2 -- src/ct.c | 35 ----------------------------------- src/parser_bison.y | 54 ++++++++++++++++++++++-------------------------------- src/scanner.l | 6 ++++++ 4 files changed, 28 insertions(+), 69 deletions(-)
include/ct.h +0 -2
@@ -29,8 +29,6 @@ extern void ct_expr_update_type(struct proto_ctx *ctx, struct expr *expr);extern struct error_record *ct_dir_parse (const struct location *loc,const char *str,int8_t *dir); -extern struct error_record *ct_key_parse (const struct location *loc,const char *str, -unsigned int *key);extern struct error_record *ct_objtype_parse (const struct location *loc,const char *str,int *type);extern struct stmt *notrack_stmt_alloc (const struct location *loc);
src/ct.c +0 -35
@@ -349,41 +349,6 @@ struct error_record *ct_dir_parse(const struct location *loc, const char *str,return error (loc,"Could not parse direction %s" , str); } -struct error_record *ct_key_parse (const struct location *loc,const char *str, -unsigned int *key) -{ -int ret, len, offset =0 ; -const char *sep ="" ; -unsigned int i; -char buf[1024 ]; -size_t size; - -for (i =0 ; i <array_size (ct_templates); i++) { -if (!ct_templates[i].token ||strcmp (ct_templates[i].token, str)) -continue ; - - *key = i; -return NULL ; - } - - len = (int )sizeof (buf); - size =sizeof (buf); - -for (i =0 ; i <array_size (ct_templates); i++) { -if (!ct_templates[i].token) -continue ; - -if (offset) - sep =", " ; - - ret =snprintf (buf+offset, len,"%s%s" , sep, ct_templates[i].token); -SNPRINTF_BUFFER_SIZE (ret, size, len, offset); -assert (offset < (int )sizeof (buf)); - } - -return error (loc,"syntax error, unexpected %s, known keys are %s" , str, buf); -} -struct expr *ct_expr_alloc (const struct location *loc,enum nft_ct_keys key,int8_t direction) {
src/parser_bison.y +22 -32
92 lines not on this page · raw message
src/scanner.l +6 -0
@@ -483,6 +483,12 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "proto-src" { return PROTO_SRC; } "proto-dst" { return PROTO_DST; } "zone" { return ZONE; } +"direction" { return DIRECTION; } +"state" { return STATE; } +"status" { return STATUS; } +"expiration" { return EXPIRATION; } +"event" { return EVENT; } +"label" { return LABEL; } "numgen" { return NUMGEN; } "inc" { return INC; }
Signature · 1 line
2.13.0
Florian Westphal
maintainerPATCH 4/17 parser: compact list of rhs keyword expressions
In reply to Florian WestphalCondenses the copy/pastry via a define, will make it less of a hassle to extend this list later if needed.
Based on earlier patch from Pablo.
--- src/parser_bison.y | 72 ++++++++++++------------------------------------------ 1 file changed, 16 insertions(+), 56 deletions(-)
src/parser_bison.y +16 -56
@@ -97,6 +97,8 @@ static void location_update(struct location *loc, struct location *rhs, int n) #define YYLLOC_DEFAULT(Current, Rhs, N) location_update(&Current, Rhs, N) +#define symbol_value(loc, str) \ + symbol_expr_alloc(loc, SYMBOL_VALUE, current_scope(state), str) %} /* Declaration section */
@@ -580,8 +582,8 @@ static void location_update(struct location *loc, struct location *rhs, int n) %type <expr> flow_key_expr flow_key_expr_alloc %destructor { expr_free($$); } flow_key_expr flow_key_expr_alloc -%type <expr> expr initializer_expr -%destructor { expr_free($$); } expr initializer_expr +%type <expr> expr initializer_expr keyword_expr +%destructor { expr_free($$); } expr initializer_expr keyword_expr %type <expr> rhs_expr concat_rhs_expr basic_rhs_expr %destructor { expr_free($$); } rhs_expr concat_rhs_expr basic_rhs_expr
@@ -2795,39 +2797,21 @@ boolean_expr : boolean_keys } ; +keyword_expr : ETHER { $$ = symbol_value(&@$, "ether"); } + | IP { $$ = symbol_value(&@$, "ip"); } + | IP6 { $$ = symbol_value(&@$, "ip6"); } + | VLAN { $$ = symbol_value(&@$, "vlan"); } + | ARP { $$ = symbol_value(&@$, "arp"); } + | DNAT { $$ = symbol_value(&@$, "dnat"); } + | SNAT { $$ = symbol_value(&@$, "snat"); } + | ECN { $$ = symbol_value(&@$, "ecn"); } + | RESET { $$ = symbol_value(&@$, "reset"); } + ; + primary_rhs_expr : symbol_expr { $$ = $1; } | integer_expr { $$ = $1; } | boolean_expr { $$ = $1; } - | ETHER - { - $$ = symbol_expr_alloc(&@$, SYMBOL_VALUE, - current_scope(state), - "ether"); - } - | IP - { - $$ = symbol_expr_alloc(&@$, SYMBOL_VALUE, - current_scope(state), - "ip"); - } - | IP6 - { - $$ = symbol_expr_alloc(&@$, SYMBOL_VALUE, - current_scope(state), - "ip6"); - } - | VLAN - { - $$ = symbol_expr_alloc(&@$, SYMBOL_VALUE, - current_scope(state), - "vlan"); - } - | ARP - { - $$ = symbol_expr_alloc(&@$, SYMBOL_VALUE, - current_scope(state), - "arp"); - } + | keyword_expr { $$ = $1; } | TCP { uint8_t data = IPPROTO_TCP;
@@ -2905,30 +2889,6 @@ primary_rhs_expr : symbol_expr { $$ = $1; } BYTEORDER_HOST_ENDIAN, sizeof(data) * BITS_PER_BYTE, &data); } - | SNAT - { - $$ = symbol_expr_alloc(&@$, SYMBOL_VALUE, - current_scope(state), - "snat"); - } - | DNAT - { - $$ = symbol_expr_alloc(&@$, SYMBOL_VALUE, - current_scope(state), - "dnat"); - } - | ECN - { - $$ = symbol_expr_alloc(&@$, SYMBOL_VALUE, - current_scope(state), - "ecn"); - } - | RESET - { - $$ = symbol_expr_alloc(&@$, SYMBOL_VALUE, - current_scope(state), - "reset"); - } ; relational_op : EQ { $$ = OP_EQ; }
Signature · 1 line
2.13.0
Florian Westphal
maintainerPATCH 5/17 bison: permit 'label' on rhs side of expression
In reply to Florian Westphalneeded to make 'ct event set label' work, as its also a token. This change is broken:
ct event set label
and
ct event set label,new
cause conflict in grammar.
--- src/parser_bison.y | 1 + 1 file changed, 1 insertion(+)
src/parser_bison.y +1 -0
@@ -2806,6 +2806,7 @@ keyword_expr : ETHER { $$ = symbol_value(&@$, "ether"); } | SNAT { $$ = symbol_value(&@$, "snat"); } | ECN { $$ = symbol_value(&@$, "ecn"); } | RESET { $$ = symbol_value(&@$, "reset"); } + | LABEL { $$ = symbol_value(&@$, "label"); } ; primary_rhs_expr : symbol_expr { $$ = $1; }
Signature · 1 line
2.13.0
Florian Westphal
maintainerPATCH 6/17 bison: permit keywords in list_stmt_expressions
In reply to Florian Westphalprevious patch makes 'ct event set label' work, but we also need to allow "set new, label".
This changes the definition to also contain keyword symbol expressions. Unfortunately, the older "|" syntax, "ct event new | label" (not in any release) doesn't work anymore because it requires primary_expr to work and that causes ambiguities in the parser (we can only re-use keywords if they're restricted to RHS expressions).
--- src/parser_bison.y | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
src/parser_bison.y +8 -4
@@ -587,8 +587,8 @@ static void location_update(struct location *loc, struct location *rhs, int n) %type <expr> rhs_expr concat_rhs_expr basic_rhs_expr %destructor { expr_free($$); } rhs_expr concat_rhs_expr basic_rhs_expr -%type <expr> primary_rhs_expr list_rhs_expr shift_rhs_expr -%destructor { expr_free($$); } primary_rhs_expr list_rhs_expr shift_rhs_expr +%type <expr> primary_rhs_expr list_rhs_expr shift_rhs_expr symbol_rhs_expr +%destructor { expr_free($$); } primary_rhs_expr list_rhs_expr shift_rhs_expr symbol_rhs_expr %type <expr> and_rhs_expr exclusive_or_rhs_expr inclusive_or_rhs_expr %destructor { expr_free($$); } and_rhs_expr exclusive_or_rhs_expr inclusive_or_rhs_expr
@@ -3092,13 +3092,17 @@ ct_key_dir_optional : BYTES { $$ = NFT_CT_BYTES; } | ZONE { $$ = NFT_CT_ZONE; } ; -list_stmt_expr : symbol_expr COMMA symbol_expr +symbol_rhs_expr : symbol_expr + | keyword_expr + ; + +list_stmt_expr : symbol_rhs_expr COMMA symbol_rhs_expr { $$ = list_expr_alloc(&@$); compound_expr_add($$, $1); compound_expr_add($$, $3); } - | list_stmt_expr COMMA symbol_expr + | list_stmt_expr COMMA symbol_rhs_expr { $1->location = @$; compound_expr_add($1, $3);
Signature · 1 line
2.13.0
Florian Westphal
maintainerPATCH 7/17 tests: ct: remove unsupported syntax
In reply to Florian Westphal--- tests/py/any/ct.t | 3 +-- tests/py/any/ct.t.payload | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-)
tests/py/any/ct.t +1 -2
@@ -105,8 +105,7 @@ ct original mark 42;fail ct mark original;fail ct event set new;ok -ct event set new or related or destroy or foobar;fail -ct event set 'new | related | destroy | label';ok;ct event set new,related,destroy,label +ct event set new, related , foobar;fail ct event set new,destroy;ok ct event set 1;ok;ct event set new ct event set 0x0;ok
tests/py/any/ct.t.payload +0 -5
@@ -396,11 +396,6 @@ ip test-ip4 output [ immediate reg 1 0x00000001 ] [ ct set event with reg 1 ] -# ct event set 'new | related | destroy | label' -ip test-ip4 output - [ immediate reg 1 0x00000407 ] - [ ct set event with reg 1 ] - # ct event set new,destroy ip test-ip4 output [ immediate reg 1 0x00000005 ]
Signature · 1 line
2.13.0
Florian Westphal
maintainerPATCH 8/17 src: add alternate syntax for ct saddr
In reply to Florian Westphalcurrent syntax is:
ct original saddr $address
problem is that in inet, bridge etc. we lack context to figure out if this should fetch ipv6 or ipv4 from the conntrack structure.
$address might not exist, rhs could e.g. be a set reference.
One way to do this is to have users manually specifiy the dependeny:
ct l3proto ipv4 ct original saddr $address
Thats ugly, and, moreover, only needed for table families other than ip or ipv6.
Pablo suggested to instead specify ip saddr, ip6 saddr:
ct original ip saddr $address
and let nft handle the dependency injection.
This adds the required parts to the scanner and the grammar, next commit adds code to eval step to make use of this.
--- include/ct.h | 3 ++- include/expression.h | 1 + src/ct.c | 3 ++- src/netlink_delinearize.c | 2 +- src/parser_bison.y | 27 ++++++++++++++++++++++++--- 5 files changed, 30 insertions(+), 6 deletions(-)
include/ct.h +2 -1
@@ -24,7 +24,8 @@ struct ct_template { }extern struct expr *ct_expr_alloc (const struct location *loc, -enum nft_ct_keys key,int8_t direction); +enum nft_ct_keys key,int8_t direction, +uint8_t nfproto);extern void ct_expr_update_type (struct proto_ctx *ctx,struct expr *expr); extern struct error_record *ct_dir_parse(const struct location *loc,
include/expression.h +1 -0
@@ -300,6 +300,7 @@ struct expr {/* EXPR_CT */ enum nft_ct_keys key;int8_t direction; +uint8_t nfproto; } ct;struct {/* EXPR_NUMGEN */
src/ct.c +2 -1
@@ -350,7 +350,7 @@ struct error_record *ct_dir_parse(const struct location *loc, const char *str, }struct expr *ct_expr_alloc (const struct location *loc,enum nft_ct_keys key, -int8_t direction) +int8_t direction,uint8_t nfproto) {const struct ct_template *tmpl = &ct_templates[key];struct expr *expr;
@@ -359,6 +359,7 @@ struct expr *ct_expr_alloc(const struct location *loc, enum nft_ct_keys key, tmpl->byteorder, tmpl->len); expr->ct.key = key; expr->ct.direction = direction; + expr->ct.nfproto = nfproto;switch (key) {case NFT_CT_PROTOCOL :
src/netlink_delinearize.c +1 -1
@@ -699,7 +699,7 @@ static void netlink_parse_ct_expr(struct netlink_parse_ctx *ctx, dir =nftnl_expr_get_u8 (nle,NFTNL_EXPR_CT_DIR ); key =nftnl_expr_get_u32 (nle,NFTNL_EXPR_CT_KEY ); - expr =ct_expr_alloc (loc, key, dir); + expr =ct_expr_alloc (loc, key, dir,NFPROTO_UNSPEC ); dreg =netlink_parse_register (nle,NFTNL_EXPR_CT_DREG );netlink_set_register (ctx, dreg, expr);
src/parser_bison.y +24 -3
@@ -649,7 +649,7 @@ static void location_update(struct location *loc, struct location *rhs, int n) %type <expr> ct_expr ct_stmt_expr %destructor { expr_free($$); } ct_expr ct_stmt_expr -%type <val> ct_key ct_key_dir ct_key_dir_optional +%type <val> ct_key ct_key_dir ct_key_dir_optional ct_key_proto ct_key_proto_field %type <expr> fib_expr %destructor { expr_free($$); } fib_expr
@@ -3047,7 +3047,7 @@ rt_key : CLASSID { $$ = NFT_RT_CLASSID; } ct_expr : CT ct_key { - $$ = ct_expr_alloc(&@$, $2, -1); + $$ = ct_expr_alloc(&@$, $2, -1, NFPROTO_UNSPEC); } | CT STRING ct_key_dir {
@@ -3060,7 +3060,20 @@ ct_expr : CT ct_key YYERROR; } - $$ = ct_expr_alloc(&@$, $3, direction); + $$ = ct_expr_alloc(&@$, $3, direction, NFPROTO_UNSPEC); + } + | CT STRING ct_key_proto ct_key_proto_field + { + struct error_record *erec; + int8_t direction; + + erec = ct_dir_parse(&@$, $2, &direction); + if (erec != NULL) { + erec_queue(erec, state->msgs); + YYERROR; + } + + $$ = ct_expr_alloc(&@$, $4, direction, $3); } ;
@@ -3086,6 +3099,14 @@ ct_key_dir : L3PROTOCOL { $$ = NFT_CT_L3PROTOCOL; } | ct_key_dir_optional ; +ct_key_proto : IP { $$ = NFPROTO_IPV4; } + | IP6 { $$ = NFPROTO_IPV6; } + ; + +ct_key_proto_field : SADDR { $$ = NFT_CT_SRC; } + | DADDR { $$ = NFT_CT_DST; } + ; + ct_key_dir_optional : BYTES { $$ = NFT_CT_BYTES; } | PACKETS { $$ = NFT_CT_PKTS; } | AVGPKT { $$ = NFT_CT_AVGPKT; }
Signature · 1 line
2.13.0
Florian Westphal
maintainerPATCH 9/17 src: ct: store proto base of ct key, if any
In reply to Florian Westphalct keys can match on network and tranasport header protocol elements, such as port numbers or ip addresses.
Store this base type so a followup commit can store and kill dependencies, e.g. if bsae is network header we might be able to kill an earlier expression because the dependency is implicit.
--- include/expression.h | 1 + src/ct.c | 13 +++++++++++++ 2 files changed, 14 insertions(+)
include/expression.h +1 -0
@@ -299,6 +299,7 @@ struct expr {struct {/* EXPR_CT */ enum nft_ct_keys key; +enum proto_bases base;int8_t direction;uint8_t nfproto; } ct;
src/ct.c +13 -0
@@ -362,8 +362,21 @@ struct expr *ct_expr_alloc(const struct location *loc, enum nft_ct_keys key, expr->ct.nfproto = nfproto;switch (key) { +case NFT_CT_SRC : +case NFT_CT_DST : + expr->ct.base =PROTO_BASE_NETWORK_HDR ; +break ; +case NFT_CT_PROTO_SRC : +case NFT_CT_PROTO_DST : + expr->ct.base =PROTO_BASE_TRANSPORT_HDR ; +break ;case NFT_CT_PROTOCOL : expr->flags =EXPR_F_PROTOCOL ; + expr->ct.base =PROTO_BASE_NETWORK_HDR ; +break ; +case NFT_CT_L3PROTOCOL : + expr->flags =EXPR_F_PROTOCOL ; + expr->ct.base =PROTO_BASE_LL_HDR ;break ;default :break ;
Signature · 1 line
2.13.0
Florian Westphal
maintainerPATCH 10/17 src: ct: add eval part to inject dependencies for ct saddr/daddr
In reply to Florian Westphalnft has enough context to determine if a dependeny is needed.
add rule ip filter ct original ip6 saddr
allows nft to generate an error due to conflicting bases (ip vs ip6).
add rule inet filter ct original ip6 saddr allows nft to inject an ipv6 dependency expression.
add rule inet filter ct original saddr
will print an error and will suggest to add ip/ip6 keyword.
Delinerize and print support will be added in followup patches.
--- src/ct.c | 26 +++++++++++----------- src/evaluate.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 77 insertions(+), 19 deletions(-)
src/ct.c +13 -13
@@ -308,21 +308,21 @@ static void ct_expr_clone(struct expr *new, const struct expr *expr)static void ct_expr_pctx_update (struct proto_ctx *ctx,const struct expr *expr) {const struct expr *left = expr->left, *right = expr->right; -const struct proto_desc *base, *desc; +const struct proto_desc *base =NULL , *desc; +uint32_t nhproto;assert (expr->op ==OP_EQ ); -switch (left->ct.key) { -case NFT_CT_PROTOCOL : - base = ctx->protocol[PROTO_BASE_NETWORK_HDR ].desc; - desc =proto_find_upper (base,mpz_get_uint32 (right->value)); + nhproto =mpz_get_uint32 (right->value); -proto_ctx_update (ctx,PROTO_BASE_TRANSPORT_HDR , - &expr->location, desc); -break ; -default : -break ; - } + base = ctx->protocol[left->ct.base].desc; +if (!base) +return ; + desc =proto_find_upper (base, nhproto); +if (!desc) +return ; + +proto_ctx_update (ctx, left->ct.base +1 , &expr->location, desc); }static const struct expr_ops ct_expr_ops = {
@@ -389,10 +389,11 @@ void ct_expr_update_type(struct proto_ctx *ctx, struct expr *expr) {const struct proto_desc *desc; + desc = ctx->protocol[expr->ct.base].desc; +switch (expr->ct.key) {case NFT_CT_SRC :case NFT_CT_DST : - desc = ctx->protocol[PROTO_BASE_NETWORK_HDR ].desc;if (desc == &proto_ip) expr->dtype = &ipaddr_type;else if (desc == &proto_ip6)
@@ -402,7 +403,6 @@ void ct_expr_update_type(struct proto_ctx *ctx, struct expr *expr)break ;case NFT_CT_PROTO_SRC :case NFT_CT_PROTO_DST : - desc = ctx->protocol[PROTO_BASE_TRANSPORT_HDR ].desc;if (desc ==NULL )break ; expr->dtype = &inet_service_type;
src/evaluate.c +64 -6
91 lines not on this page · raw message
Signature · 1 line
2.13.0
Florian Westphal
maintainerPATCH 11/17 src: unifiy meta and ct postprocessing
In reply to Florian WestphalQuoted 1 line
From postprocess point of view meta and ct are logically the same,
except that their storage area overlaps (union type), so if we extract the relevant fields we can move all of it into a single helper and support dependency store/kill for both expressions.
--- src/netlink_delinearize.c | 50 +++++++++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 28 deletions(-)
src/netlink_delinearize.c +22 -28
@@ -1367,12 +1367,29 @@ static void payload_match_postprocess(struct rule_pp_ctx *ctx, } } -static void ct_meta_common_postprocess (const struct expr *expr) +static void ct_meta_common_postprocess (struct rule_pp_ctx *ctx, +const struct expr *expr, +enum proto_bases base) {const struct expr *left = expr->left;struct expr *right = expr->right;switch (expr->op) { +case OP_EQ : +if (expr->right->ops->type ==EXPR_RANGE ) +break ; + + expr->left->ops->pctx_update (&ctx->pctx, expr); + +if (ctx->pdctx.pbase ==PROTO_BASE_INVALID && + left->flags &EXPR_F_PROTOCOL ) { +payload_dependency_store (&ctx->pdctx, ctx->stmt, base); + }else if (ctx->pdctx.pbase <PROTO_BASE_TRANSPORT_HDR ) { +__payload_dependency_kill (&ctx->pdctx, base); +if (left->flags &EXPR_F_PROTOCOL ) +payload_dependency_store (&ctx->pdctx, ctx->stmt, base); + } +break ;case OP_NEQ :if (right->ops->type !=EXPR_SET && right->ops->type !=EXPR_SET_REF )break ;
@@ -1388,40 +1405,17 @@ static void ct_meta_common_postprocess(const struct expr *expr)static void meta_match_postprocess (struct rule_pp_ctx *ctx,const struct expr *expr) { -struct expr *left = expr->left; - -switch (expr->op) { -case OP_EQ : -if (expr->right->ops->type ==EXPR_RANGE ) -break ; - - expr->left->ops->pctx_update (&ctx->pctx, expr); +const struct expr *left = expr->left; -if (ctx->pdctx.pbase ==PROTO_BASE_INVALID && - left->flags &EXPR_F_PROTOCOL ) -payload_dependency_store (&ctx->pdctx, ctx->stmt, - left->meta.base); -break ; -default : -ct_meta_common_postprocess (expr); -break ; - } +ct_meta_common_postprocess (ctx, expr, left->meta.base); }static void ct_match_postprocess (struct rule_pp_ctx *ctx,const struct expr *expr) { -switch (expr->op) { -case OP_EQ : -if (expr->right->ops->type ==EXPR_RANGE ) -break ; +const struct expr *left = expr->left; - expr->left->ops->pctx_update (&ctx->pctx, expr); -break ; -default : -ct_meta_common_postprocess (expr); -break ; - } +ct_meta_common_postprocess (ctx, expr, left->ct.base); }/* Convert a bitmask to a prefix length */
Signature · 1 line
2.13.0
Florian Westphal
maintainerPATCH 13/17 src: ct: print nfproto name for some header fields
this prints "original saddr|daddr $NFPROTO" to make output symmetric with the syntax that we now prefer on input side.
--- src/ct.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-)
src/ct.c +23 -5
@@ -16,6 +16,8 @@#include <inttypes.h> #include <string.h> +#include <netinet/ip.h> +#include <linux/netfilter.h> #include <linux/netfilter/nf_tables.h> #include <linux/netfilter/nf_conntrack_common.h> #include <linux/netfilter/nf_conntrack_tuple_common.h>
@@ -269,9 +271,10 @@ static const struct ct_template ct_templates[] = { BYTEORDER_HOST_ENDIAN, 32), }; -static void ct_print (enum nft_ct_keys key,int8_t dir) +static void ct_print (enum nft_ct_keys key,int8_t dir,uint8_t nfproto) {const struct symbolic_constant *s; +const struct proto_desc *desc;printf ("ct " );if (dir <0 )
@@ -283,13 +286,25 @@ static void ct_print(enum nft_ct_keys key, int8_t dir)break ; } } + +switch (key) { +case NFT_CT_SRC :/* fallthrough */ +case NFT_CT_DST : + desc =proto_find_upper (&proto_inet, nfproto); +if (desc) +printf ("%s " , desc->name); +break ; +default : +break ; + } + done:printf ("%s" , ct_templates[key].token); }static void ct_expr_print (const struct expr *expr,struct output_ctx *octx) { -ct_print (expr->ct.key, expr->ct.direction); +ct_print (expr->ct.key, expr->ct.direction, expr->ct.nfproto); }static bool ct_expr_cmp (const struct expr *e1,const struct expr *e2)
@@ -394,10 +409,13 @@ void ct_expr_update_type(struct proto_ctx *ctx, struct expr *expr)switch (expr->ct.key) {case NFT_CT_SRC :case NFT_CT_DST : -if (desc == &proto_ip) +if (desc == &proto_ip) { expr->dtype = &ipaddr_type; -else if (desc == &proto_ip6) + expr->ct.nfproto =NFPROTO_IPV4 ; + }else if (desc == &proto_ip6) { expr->dtype = &ip6addr_type; + expr->ct.nfproto =NFPROTO_IPV6 ; + } expr->len = expr->dtype->size;break ;
@@ -414,7 +432,7 @@ void ct_expr_update_type(struct proto_ctx *ctx, struct expr *expr)static void ct_stmt_print (const struct stmt *stmt,struct output_ctx *octx) { -ct_print (stmt->ct.key, stmt->ct.direction); +ct_print (stmt->ct.key, stmt->ct.direction,0 );printf (" set " );expr_print (stmt->ct.expr, octx); }
Signature · 1 line
2.13.0
Florian Westphal
maintainerPATCH 12/17 tests: update inet/bridge icmp test case
In reply to Florian Westphalafter previous change nft now culls the dependency chain:
'icmpv6 type echo-request' is shown as-is, and not
'meta nfproto ipv6 meta l4proto 58 icmpv6 type echo-request' anymore.
--- tests/py/bridge/icmpX.t | 4 ++-- tests/py/inet/icmpX.t | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
tests/py/bridge/icmpX.t +2 -2
@@ -3,6 +3,6 @@ *bridge;test-bridge;input ip protocol icmp icmp type echo-request;ok;icmp type echo-request -icmp type echo-request;ok;ether type ip meta l4proto 1 icmp type echo-request +icmp type echo-request;ok ip6 nexthdr icmpv6 icmpv6 type echo-request;ok;icmpv6 type echo-request -icmpv6 type echo-request;ok;ether type ip6 meta l4proto 58 icmpv6 type echo-request +icmpv6 type echo-request;ok
tests/py/inet/icmpX.t +2 -2
@@ -3,6 +3,6 @@ *inet;test-inet;input ip protocol icmp icmp type echo-request;ok;icmp type echo-request -icmp type echo-request;ok;meta nfproto ipv4 meta l4proto 1 icmp type echo-request +icmp type echo-request;ok ip6 nexthdr icmpv6 icmpv6 type echo-request;ok;icmpv6 type echo-request -icmpv6 type echo-request;ok;meta nfproto ipv6 meta l4proto 58 icmpv6 type echo-request +icmpv6 type echo-request;ok
Signature · 1 line
2.13.0
Florian Westphal
maintainerPATCH 14/17 tests: ct: adjust test case commands
In reply to Florian Westphaluse 'ip saddr', 'ip6 saddr', etc.
--- tests/py/inet/ct.t | 7 +++++-- tests/py/inet/ct.t.payload | 4 ++-- tests/py/ip/ct.t | 18 +++++++++--------- tests/py/ip/ct.t.payload | 16 ++++++++-------- 4 files changed, 24 insertions(+), 21 deletions(-)
tests/py/inet/ct.t +5 -2
@@ -3,8 +3,11 @@ *inet;test-inet;input -meta nfproto ipv4 ct original saddr 1.2.3.4;ok -meta nfproto ipv6 ct original saddr ::1;ok +meta nfproto ipv4 ct original saddr 1.2.3.4;ok;ct original ip saddr 1.2.3.4 +ct original ip6 saddr ::1;ok # missing protocol context ct original saddr ::1;fail + +# wrong protocol context +ct original ip saddr ::1;fail
tests/py/inet/ct.t.payload +2 -2
@@ -5,9 +5,9 @@ ip test-ip4 output [ ct load src => reg 1 , dir original ] [ cmp eq reg 1 0x04030201 ] -# meta nfproto ipv6 ct original saddr ::1 +# ct original ip6 saddr ::1 inet test-inet input - [ meta load nfproto => reg 1 ] + [ ct load l3protocol => reg 1 , dir original ] [ cmp eq reg 1 0x0000000a ] [ ct load src => reg 1 , dir original ] [ cmp eq reg 1 0x00000000 0x00000000 0x00000000 0x01000000 ]
tests/py/ip/ct.t +9 -9
@@ -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
tests/py/ip/ct.t.payload +8 -8
@@ -1,42 +1,42 @@ -# ct original saddr 192.168.0.1 +# ct original ip saddr 192.168.0.1 ip test-ip4 output [ ct load src => reg 1 , dir original ] [ cmp eq reg 1 0x0100a8c0 ] -# ct reply saddr 192.168.0.1 +# ct reply ip saddr 192.168.0.1 ip test-ip4 output [ ct load src => reg 1 , dir reply ] [ cmp eq reg 1 0x0100a8c0 ] -# ct original daddr 192.168.0.1 +# ct original ip daddr 192.168.0.1 ip test-ip4 output [ ct load dst => reg 1 , dir original ] [ cmp eq reg 1 0x0100a8c0 ] -# ct reply daddr 192.168.0.1 +# ct reply ip daddr 192.168.0.1 ip test-ip4 output [ ct load dst => reg 1 , dir reply ] [ cmp eq reg 1 0x0100a8c0 ] -# ct original saddr 192.168.1.0/24 +# ct original ip 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 reply saddr 192.168.1.0/24 +# ct reply ip 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 original daddr 192.168.1.0/24 +# ct original ip 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 reply daddr 192.168.1.0/24 +# ct reply ip daddr 192.168.1.0/24 ip test-ip4 output [ ct load dst => reg 1 , dir reply ] [ bitwise reg 1 = (reg=1 & 0x00ffffff ) ^ 0x00000000 ]
Signature · 1 line
2.13.0
Florian Westphal
maintainerPATCH 16/17 tests: rt: fix test cases
In reply to Florian Westphalnfproto meta dependency is no longer needed, keep one test since we still support this syntax.
When meta is not provided, no need to add a dependency because nft_rt already checks pf number before checking skb->dst.
--- tests/py/inet/rt.t | 9 +++++++-- tests/py/inet/rt.t.payload | 4 +--- tests/py/ip/rt.t | 3 ++- tests/py/ip6/rt0.t | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-)
tests/py/inet/rt.t +7 -2
@@ -4,5 +4,10 @@ rt nexthop 192.168.0.1;fail rt nexthop fd00::1;fail -meta nfproto ipv4 rt nexthop 192.168.0.1;ok -meta nfproto ipv6 rt nexthop fd00::1;ok +meta nfproto ipv4 rt nexthop 192.168.0.1;ok;meta nfproto ipv4 rt ip nexthop 192.168.0.1 +rt ip6 nexthop fd00::1;ok + +# missing context +rt nexthop fd00::1;fail +# wrong context +rt ip nexthop fd00::1;fail
tests/py/inet/rt.t.payload +1 -3
@@ -5,10 +5,8 @@ inet test-inet output [ rt load nexthop4 => reg 1 ] [ cmp eq reg 1 0x0100a8c0 ] -# meta nfproto ipv6 rt nexthop fd00::1 +# rt ip6 nexthop fd00::1 inet test-inet output - [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] [ rt load nexthop6 => reg 1 ] [ cmp eq reg 1 0x000000fd 0x00000000 0x00000000 0x01000000 ]
tests/py/ip/rt.t +2 -1
@@ -2,5 +2,6 @@ *ip;test-ip4;output -rt nexthop 192.168.0.1;ok +rt nexthop 192.168.0.1;ok;rt ip nexthop 192.168.0.1 rt nexthop fd00::1;fail +rt ip6 nexthop fd00::1;fail
tests/py/ip6/rt0.t +1 -1
@@ -3,4 +3,4 @@ *ip6;test-ip6;output rt nexthop 192.168.0.1;fail -rt nexthop fd00::1;ok +rt nexthop fd00::1;ok;rt ip6 nexthop fd00::1
Signature · 1 line
2.13.0
Florian Westphal
maintainerPATCH 17/17 doc: update man page
In reply to Florian Westphalyou can now use "rt ip|ip6 nexthop" and "ct original|reply ip|ip6 saddr|daddr" to tell nft if you want to match ipv4 or ipv6.
--- doc/nft.xml | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-)
doc/nft.xml +18 -5
@@ -492,7 +492,6 @@ filter input iif $int_ifs accept hybrid IPv4/IPv6 tables. The <literal>meta</literal> expression <literal>nfproto</literal> keyword can be used to test which family (ipv4 or ipv6) context the packet is being processed in. - When no address family is specified, <literal>ip</literal> is used by default. </para>
@@ -2265,8 +2264,8 @@ filter output rt classid 10 # IP family dependent rt expressions ip filter output rt nexthop 192.168.0.1 ip6 filter output rt nexthop fd00::1 -inet filter meta nfproto ipv4 output rt nexthop 192.168.0.1 -inet filter meta nfproto ipv6 output rt nexthop fd00::1 +inet filter output rt ip nexthop 192.168.0.1 +inet filter output rt ip6 nexthop fd00::1 </programlisting> </example> </para>
@@ -3385,8 +3384,6 @@ ip6 filter input frag more-fragments 1 counter <group choice="req"> <arg>l3proto</arg> <arg>protocol</arg> - <arg>saddr</arg> - <arg>daddr</arg> <arg>proto-src</arg> <arg>proto-dst</arg> <arg>bytes</arg>
@@ -3395,6 +3392,22 @@ ip6 filter input frag more-fragments 1 counter <arg>zone</arg> </group> </cmdsynopsis> + <cmdsynopsis> + <command>ct</command> + <group choice="req"> + <arg>original</arg> + <arg>reply</arg> + </group> + <group choice="req"> + <arg>ip</arg> + <arg>ip6</arg> + </group> + <group choice="req"> + <arg>saddr</arg> + <arg>daddr</arg> + </group> + </cmdsynopsis> + </para> <para> <table frame="all">
Signature · 1 line
2.13.0
Florian Westphal
maintainerPATCH 15/17 src: rt: add keyword distinction for nexthop vs nexthop6
In reply to Florian Westphalthe rt expression currently always sets NFT_RT_NEXTHOP4 and then uses the network base to determine if its really supposed to be NEXTHOP6.
For inet, this will fail because the network base is not known, so this currently enforces need for "meta nfproto" to dermine the type.
Allow following syntax instead:
rt ip nexthop
rt ip6 nexthop
There is no need for a dependency anymore, as rt expression checks the hook protocol, ie. NEXTHOP4 will break if the hook pf is not NFPROTO_IPV4.
--- src/evaluate.c | 22 +++++++++------------- src/parser_bison.y | 24 +++++++++++++++++++++++- src/rt.c | 14 +++++++++++++- 3 files changed, 45 insertions(+), 15 deletions(-)
src/evaluate.c +9 -13
@@ -651,32 +651,28 @@ static int expr_evaluate_payload(struct eval_ctx *ctx, struct expr **exprp)return 0 ; } -static int expr_error_base (struct list_head *msgs,const struct expr *e) -{ -return expr_error (msgs, e, -"meta nfproto ipv4 or ipv6 must be specified " -"before %s expression" , e->ops->name); -} -/* * RT expression: validate protocol dependencies. */ static int expr_evaluate_rt (struct eval_ctx *ctx,struct expr **expr) { -const struct proto_desc *base; +static const char emsg[] ="cannot determine ip protocol version, use \"ip nexthop\" or \"ip6 nexthop\" instead" ;struct expr *rt = *expr;rt_expr_update_type (&ctx->pctx, rt); - base = ctx->pctx.protocol[PROTO_BASE_NETWORK_HDR ].desc;switch (rt->rt.key) {case NFT_RT_NEXTHOP4 : -if (base != &proto_ip) -return expr_error_base (ctx->msgs, rt); +if (rt->dtype != &ipaddr_type) +return expr_error (ctx->msgs, rt,"%s" , emsg); +if (ctx->pctx.family ==NFPROTO_IPV6 ) +return expr_error (ctx->msgs, rt,"%s nexthop will not match" ,"ip" );break ;case NFT_RT_NEXTHOP6 : -if (base != &proto_ip6) -return expr_error_base (ctx->msgs, rt); +if (rt->dtype != &ip6addr_type) +return expr_error (ctx->msgs, rt,"%s" , emsg); +if (ctx->pctx.family ==NFPROTO_IPV4 ) +return expr_error (ctx->msgs, rt,"%s nexthop will not match" ,"ip6" );break ;default :break ;
src/parser_bison.y +23 -1
@@ -642,7 +642,7 @@ static void location_update(struct location *loc, struct location *rhs, int n) %type <expr> rt_expr %destructor { expr_free($$); } rt_expr -%type <val> rt_key +%type <val> rt_key_proto rt_key %type <expr> list_stmt_expr %destructor { expr_free($$); } list_stmt_expr
@@ -3035,10 +3035,32 @@ hash_expr : JHASH expr MOD NUM SEED NUM offset_opt } ; +rt_key_proto : IP { $$ = NFPROTO_IPV4; } + | IP6 { $$ = NFPROTO_IPV6; } + ; + rt_expr : RT rt_key { $$ = rt_expr_alloc(&@$, $2, true); } + | RT rt_key_proto rt_key + { + enum nft_rt_keys rtk = $3; + + switch ($2) { + case NFPROTO_IPV4: + break; + case NFPROTO_IPV6: + if ($3 == NFT_RT_NEXTHOP4) + rtk = NFT_RT_NEXTHOP6; + break; + default: + YYERROR; + break; + } + + $$ = rt_expr_alloc(&@$, rtk, false); + } ; rt_key : CLASSID { $$ = NFT_RT_CLASSID; }
src/rt.c +13 -1
@@ -77,7 +77,19 @@ static const struct rt_template rt_templates[] = {static void rt_expr_print (const struct expr *expr,struct output_ctx *octx) { -printf ("rt %s" , rt_templates[expr->rt.key].token); +printf ("rt " ); + +switch (expr->rt.key) { +case NFT_RT_NEXTHOP4 : +printf ("ip " ); +break ; +case NFT_RT_NEXTHOP6 : +printf ("ip6 " ); +break ; +default : +break ; + } +printf ("%s" , rt_templates[expr->rt.key].token); }static bool rt_expr_cmp (const struct expr *e1,const struct expr *e2)
Signature · 1 line
2.13.0
Pablo Neira Ayuso
maintainerQuoted 9 lines · Florian Westphal
I am running out of time so I have to send this unfinished/non-working state.
It breaks because ct is riddled with conflicts,
in nft we've handled original/reply as STRING to avoid conflicts with 'arp reply', so we cannot addct original ip saddr
Quoted 7 lines
because it is
ct STRING IP SADDRand that conflicts with basic use where 'ip saddr' could be payload expression, and STRING is one of the normal ct tokens and not a direction.
I am trying to fix this here by moving all ct keywords back to tokens.
Yes. We have a very compact syntax here, tokens helps bison decide where to go. If we would have a well-structure syntax, looking less human-readable, it would be more simple. But given what we have, we have to use many tokens.
Quoted 9 lines
There are no shift/reduce errors, things compile fine, and all test cases work. Its just that we break 'ct event set label':
Works:
ct event set new or reply
ct event set new,reply
ct event set new,label
fails:
ct event set label ('expects COMMA')
This can be fixed, it's just a matter we need more time, right?
No problem, we can take the time.
Thanks for working on this!
Florian Westphal
maintainerQuoted 11 lines · Pablo Neira Ayuso
Quoted 9 lines
There are no shift/reduce errors, things compile fine, and all test cases work. Its just that we break 'ct event set label':
Works:
ct event set new or reply
ct event set new,reply
ct event set new,label
fails:
ct event set label ('expects COMMA')This can be fixed, it's just a matter we need more time, right?
Actually this makes it work for me:
src/parser_bison.y +3 -2
@@ -2432,11 +2432,11 @@ fib_tuple : fib_flag DOT fib_tuple ; shift_expr : primary_expr - | shift_expr LSHIFT primary_expr + | shift_expr LSHIFT primary_rhs_expr { $$ = binop_expr_alloc(&@$, OP_LSHIFT, $1, $3); } - | shift_expr RSHIFT primary_expr + | shift_expr RSHIFT primary_rhs_expr { $$ = binop_expr_alloc(&@$, OP_RSHIFT, $1, $3); }
@@ -3154,6 +3154,7 @@ list_stmt_expr : symbol_rhs_expr COMMA symbol_rhs_expr ; ct_stmt_expr : expr + | keyword_expr | list_stmt_expr ;
(I added keyword_expr before and that causes reduce error, but did
not have time to figure out where they come from).
Restricting shift_expr RHS to primary_rhs_expr makes this work for me, all test cases that are expected to pass work.
Only effect AFAICS this has is that this:
nft add rule f i iif lshift mark eq 0
<cmdline>:1:25-28: Error: Right hand side of binary operation (<<) must be constant
turns into
<cmdline>:1:25-28: Error: syntax error, unexpected mark add rule f i iif lshift mark eq 0
so I think restricting shift_expr rhs in grammar is fine.
Florian Westphal
maintainerQuoted 4 lines · Florian Westphal
Quoted 3 lines · Pablo Neira Ayuso
Quoted 3 lines
There are no shift/reduce errors, things compile fine, and all test cases work. Its just that we break 'ct event set label':
Quoted 8 lines
Quoted 8 lines
Quoted 6 lines
Works:
ct event set new or reply
ct event set new,reply
ct event set new,label
fails:
ct event set label ('expects COMMA')This can be fixed, it's just a matter we need more time, right?
Actually 'event set label' is simple to fix; just add keyword_expr to the ct_stmt_expr list.
But another problem(?) is this:
works:
ct event label or new
ct event set reply or new
doesn't work:
ct event set label or new
(not strictly related to 'label', any other keyword like tcp, ip, etc.
has same problem, they just don't overlap with event names so would not work anyway).
I currently see no way to resolve this, unfortunately.
For ct statements (and meta) we need to support plain expressions as SET argument, at least in some cases, such as:
meta set mark or 42
This is ambiguous because we have both tokens and symbolic constants.
If we can live with the 'or' not being supported for ct event mask I think we're fine (it will work when forcing string type, i.e. ct event set "label" or new).
Also, the 'label, new' format will work fine.
Pablo Neira Ayuso
maintainerRe: [PATCH 01/17] rename struct ct to ct_helper
In reply to Florian WestphalHi,
I apply these series, from 2 to 17, but this doesn't compile.
make[1]: Entering directory
'/home/pablo/devel/scm/git-netfilter/nftables'
Making all in src
make[2]: Entering directory
'/home/pablo/devel/scm/git-netfilter/nftables/src'
YACC parser_bison.c
/home/pablo/devel/scm/git-netfilter/nftables/src/parser_bison.y:3146.33-44: error: symbol keyword_expr is used, but is not defined as a token and has no rules
| keyword_expr
^^^^^^^^^^^^
/home/pablo/devel/scm/git-netfilter/nftables/src/parser_bison.y:3146.33-44: warning: type clash on default action: <expr> != <> [-Wother]
| keyword_expr
^^^^^^^^^^^^This changeset is large and it is making it a bit hard for me to review.
Could you send me a smaller batch?
I want to understand why the parser is hitting shift/reduce problems from set statements.
Thanks.