rework tcp option handling
Florian Westphal
maintainercover rework tcp option handling
This reworks how tcp options are handled in nft internally. First patches refactor and condense code.
In particular, it removes the duplication of 'sack-perm'/permitted maxseg/mss lexer keys -- synproxy and tcp option used different tokens, leading to confusing sytax errors when using the 'wrong' word in the 'wrong' place.
patch 5 is the first one with a new feature: it allows to check for presence of any tcp option kind, i.e. 'tcp option $number'. patch 6 and 7 add 'raw' payload matching for tcp options to allow testing for tcp options that do not have an internal template.
Florian Westphal
maintainerPATCH 1/7 parser: merge sack-perm/sack-permitted and maxseg/mss
One was added by the tcp option parsing ocde, the other by synproxy.
So we have:
synproxy ... sack-perm
synproxy ... mss
and
tcp option maxseg
tcp option sack-permitted
This kills the extra tokens on the scanner/parser side, so sack-perm and sack-permitted can both be used.
Likewise, 'synproxy maxseg' and 'tcp option mss size 42' will work too. On the output side, the shorter form is now preferred, i.e. sack-perm and mss.
--- doc/payload-expression.txt | 8 ++++---- src/parser_bison.y | 13 ++++++------- src/scanner.l | 8 ++++---- src/tcpopt.c | 2 +- tests/py/any/tcpopt.t | 4 ++-- tests/py/any/tcpopt.t.json | 8 ++++---- tests/py/any/tcpopt.t.payload | 12 ++++++------ 7 files changed, 27 insertions(+), 28 deletions(-)
doc/payload-expression.txt +4 -4
@@ -525,13 +525,13 @@ nftables currently supports matching (finding) a given ipv6 extension header, TC *dst* {*nexthdr* | *hdrlength*} *mh* {*nexthdr* | *hdrlength* | *checksum* | *type*} *srh* {*flags* | *tag* | *sid* | *seg-left*} -*tcp option* {*eol* | *noop* | *maxseg* | *window* | *sack-permitted* | *sack* | *sack0* | *sack1* | *sack2* | *sack3* | *timestamp*} 'tcp_option_field' +*tcp option* {*eol* | *noop* | *maxseg* | *window* | *sack-perm* | *sack* | *sack0* | *sack1* | *sack2* | *sack3* | *timestamp*} 'tcp_option_field' *ip option* { lsrr | ra | rr | ssrr } 'ip_option_field' The following syntaxes are valid only in a relational expression with boolean type on right-hand side for checking header existence only: [verse] *exthdr* {*hbh* | *frag* | *rt* | *dst* | *mh*} -*tcp option* {*eol* | *noop* | *maxseg* | *window* | *sack-permitted* | *sack* | *sack0* | *sack1* | *sack2* | *sack3* | *timestamp*} +*tcp option* {*eol* | *noop* | *maxseg* | *window* | *sack-perm* | *sack* | *sack0* | *sack1* | *sack2* | *sack3* | *timestamp*} *ip option* { lsrr | ra | rr | ssrr } .IPv6 extension headers
@@ -568,7 +568,7 @@ kind, length, size |window| TCP Window Scaling | kind, length, count -|sack-permitted| +|sack-perm | TCP SACK permitted | kind, length |sack|
@@ -611,7 +611,7 @@ type, length, ptr, addr .finding TCP options -------------------- -filter input tcp option sack-permitted kind 1 counter +filter input tcp option sack-perm kind 1 counter -------------------- .matching IPv6 exthdr
src/parser_bison.y +6 -7
@@ -233,7 +233,6 @@ int nft_lex(void *, void *, void *); %token SYNPROXY "synproxy" %token MSS "mss" %token WSCALE "wscale" -%token SACKPERM "sack-perm" %token TYPEOF "typeof"
@@ -400,14 +399,13 @@ int nft_lex(void *, void *, void *); %token OPTION "option" %token ECHO "echo" %token EOL "eol" -%token MAXSEG "maxseg" %token NOOP "noop" %token SACK "sack" %token SACK0 "sack0" %token SACK1 "sack1" %token SACK2 "sack2" %token SACK3 "sack3" -%token SACK_PERMITTED "sack-permitted" +%token SACK_PERM "sack-permitted" %token TIMESTAMP "timestamp" %token KIND "kind" %token COUNT "count"
@@ -3279,7 +3277,7 @@ synproxy_arg : MSS NUM { $<stmt>0->synproxy.flags |= NF_SYNPROXY_OPT_TIMESTAMP; } - | SACKPERM + | SACK_PERM { $<stmt>0->synproxy.flags |= NF_SYNPROXY_OPT_SACK_PERM; }
@@ -3334,7 +3332,7 @@ synproxy_ts : /* empty */ { $$ = 0; } ; synproxy_sack : /* empty */ { $$ = 0; } - | SACKPERM + | SACK_PERM { $$ = NF_SYNPROXY_OPT_SACK_PERM; }
@@ -5216,9 +5214,10 @@ tcp_hdr_field : SPORT { $$ = TCPHDR_SPORT; } tcp_hdr_option_type : EOL { $$ = TCPOPTHDR_EOL; } | NOOP { $$ = TCPOPTHDR_NOOP; } - | MAXSEG { $$ = TCPOPTHDR_MAXSEG; } + | MSS { $$ = TCPOPTHDR_MAXSEG; } + | SACK_PERM { $$ = TCPOPTHDR_SACK_PERMITTED; } | WINDOW { $$ = TCPOPTHDR_WINDOW; } - | SACK_PERMITTED { $$ = TCPOPTHDR_SACK_PERMITTED; } + | WSCALE { $$ = TCPOPTHDR_WINDOW; } | SACK { $$ = TCPOPTHDR_SACK0; } | SACK0 { $$ = TCPOPTHDR_SACK0; } | SACK1 { $$ = TCPOPTHDR_SACK1; }
src/scanner.l +4 -4
@@ -421,14 +421,16 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "echo" { return ECHO; } "eol" { return EOL; } -"maxseg" { return MAXSEG; } +"maxseg" { return MSS; } +"mss" { return MSS; } "noop" { return NOOP; } "sack" { return SACK; } "sack0" { return SACK0; } "sack1" { return SACK1; } "sack2" { return SACK2; } "sack3" { return SACK3; } -"sack-permitted" { return SACK_PERMITTED; } +"sack-permitted" { return SACK_PERM; } +"sack-perm" { return SACK_PERM; } "timestamp" { return TIMESTAMP; } "time" { return TIME; }
@@ -565,9 +567,7 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "osf" { return OSF; } "synproxy" { return SYNPROXY; } -"mss" { return MSS; } "wscale" { return WSCALE; } -"sack-perm" { return SACKPERM; } "notrack" { return NOTRACK; }
src/tcpopt.c +1 -1
@@ -55,7 +55,7 @@ static const struct exthdr_desc tcpopt_window = { };static const struct exthdr_desc tcpopt_sack_permitted = { - .name ="sack-permitted" , + .name ="sack-perm" , .type =TCPOPT_SACK_PERMITTED , .templates = { [TCPOPTHDR_FIELD_KIND ] =PHT ("kind" ,0 ,8 ),
tests/py/any/tcpopt.t +2 -2
@@ -12,8 +12,8 @@ tcp option maxseg size 1;ok tcp option window kind 1;ok tcp option window length 1;ok tcp option window count 1;ok -tcp option sack-permitted kind 1;ok -tcp option sack-permitted length 1;ok +tcp option sack-perm kind 1;ok +tcp option sack-perm length 1;ok tcp option sack kind 1;ok tcp option sack length 1;ok tcp option sack left 1;ok
tests/py/any/tcpopt.t.json +4 -4
@@ -126,14 +126,14 @@ } ] -# tcp option sack-permitted kind 1 +# tcp option sack-perm kind 1 [ { "match": { "left": { "tcp option": { "field": "kind", - "name": "sack-permitted" + "name": "sack-perm" } }, "op": "==",
@@ -142,14 +142,14 @@ } ] -# tcp option sack-permitted length 1 +# tcp option sack-perm length 1 [ { "match": { "left": { "tcp option": { "field": "length", - "name": "sack-permitted" + "name": "sack-perm" } }, "op": "==",
tests/py/any/tcpopt.t.payload +6 -6
@@ -166,42 +166,42 @@ inet [ exthdr load tcpopt 1b @ 3 + 2 => reg 1 ] [ cmp eq reg 1 0x00000001 ] -# tcp option sack-permitted kind 1 +# tcp option sack-perm kind 1 ip [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ exthdr load tcpopt 1b @ 4 + 0 => reg 1 ] [ cmp eq reg 1 0x00000001 ] -# tcp option sack-permitted kind 1 +# tcp option sack-perm kind 1 ip6 [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ exthdr load tcpopt 1b @ 4 + 0 => reg 1 ] [ cmp eq reg 1 0x00000001 ] -# tcp option sack-permitted kind 1 +# tcp option sack-perm kind 1 inet [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ exthdr load tcpopt 1b @ 4 + 0 => reg 1 ] [ cmp eq reg 1 0x00000001 ] -# tcp option sack-permitted length 1 +# tcp option sack-perm length 1 ip [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ exthdr load tcpopt 1b @ 4 + 1 => reg 1 ] [ cmp eq reg 1 0x00000001 ] -# tcp option sack-permitted length 1 +# tcp option sack-perm length 1 ip6 [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ exthdr load tcpopt 1b @ 4 + 1 => reg 1 ] [ cmp eq reg 1 0x00000001 ] -# tcp option sack-permitted length 1 +# tcp option sack-perm length 1 inet [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ]
Signature · 1 line
2.26.2
Re: [PATCH nft 1/7] parser: merge sack-perm/sack-permitted and maxseg/mss
Quoted 114 lines · Florian Westphal
One was added by the tcp option parsing ocde, the other by synproxy.
So we have:
synproxy ... sack-perm
synproxy ... mssand
tcp option maxseg
tcp option sack-permittedThis kills the extra tokens on the scanner/parser side, so sack-perm and sack-permitted can both be used.
Likewise, 'synproxy maxseg' and 'tcp option mss size 42' will work too. On the output side, the shorter form is now preferred, i.e. sack-perm and mss.
Signed-off-by Florian Westphal <[email protected]>--- doc/payload-expression.txt | 8 ++++---- src/parser_bison.y | 13 ++++++------- src/scanner.l | 8 ++++---- src/tcpopt.c | 2 +- tests/py/any/tcpopt.t | 4 ++-- tests/py/any/tcpopt.t.json | 8 ++++---- tests/py/any/tcpopt.t.payload | 12 ++++++------ 7 files changed, 27 insertions(+), 28 deletions(-)doc/payload-expression.txt +4
-4@@ -525,13 +525,13 @@ nftables currently supports matching (finding) a given ipv6 extension header, TC *dst* {*nexthdr* | *hdrlength*} *mh* {*nexthdr* | *hdrlength* | *checksum* | *type*} *srh* {*flags* | *tag* | *sid* | *seg-left*} -*tcp option* {*eol* | *noop* | *maxseg* | *window* | *sack-permitted* | *sack* | *sack0* | *sack1* | *sack2* | *sack3* | *timestamp*} 'tcp_option_field' +*tcp option* {*eol* | *noop* | *maxseg* | *window* | *sack-perm* | *sack* | *sack0* | *sack1* | *sack2* | *sack3* | *timestamp*} 'tcp_option_field' *ip option* { lsrr | ra | rr | ssrr } 'ip_option_field' The following syntaxes are valid only in a relational expression with boolean type on right-hand side for checking header existence only: [verse] *exthdr* {*hbh* | *frag* | *rt* | *dst* | *mh*} -*tcp option* {*eol* | *noop* | *maxseg* | *window* | *sack-permitted* | *sack* | *sack0* | *sack1* | *sack2* | *sack3* | *timestamp*} +*tcp option* {*eol* | *noop* | *maxseg* | *window* | *sack-perm* | *sack* | *sack0* | *sack1* | *sack2* | *sack3* | *timestamp*} *ip option* { lsrr | ra | rr | ssrr } .IPv6 extension headers@@ -568,7 +568,7 @@ kind, length, size |window| TCP Window Scaling | kind, length, count -|sack-permitted| +|sack-perm | TCP SACK permitted | kind, length |sack|@@ -611,7 +611,7 @@ type, length, ptr, addr .finding TCP options -------------------- -filter input tcp option sack-permitted kind 1 counter +filter input tcp option sack-perm kind 1 counter -------------------- .matching IPv6 exthdrsrc/parser_bison.y +3
-5@@ -233,7 +233,6 @@ int nft_lex(void *, void *, void *); %token SYNPROXY "synproxy" %token MSS "mss" %token WSCALE "wscale" -%token SACKPERM "sack-perm" %token TYPEOF "typeof"@@ -400,14 +399,13 @@ int nft_lex(void *, void *, void *); %token OPTION "option" %token ECHO "echo" %token EOL "eol" -%token MAXSEG "maxseg" %token NOOP "noop" %token SACK "sack" %token SACK0 "sack0" %token SACK1 "sack1" %token SACK2 "sack2" %token SACK3 "sack3" -%token SACK_PERMITTED "sack-permitted" +%token SACK_PERM "sack-permitted" %token TIMESTAMP "timestamp" %token KIND "kind" %token COUNT "count"@@ -3279,7 +3277,7 @@ synproxy_arg : MSS NUM { $<stmt>0->synproxy.flags |= NF_SYNPROXY_OPT_TIMESTAMP; } - | SACKPERM + | SACK_PERM { $<stmt>0->synproxy.flags |= NF_SYNPROXY_OPT_SACK_PERM; }@@ -3334,7 +3332,7 @@ synproxy_ts : /* empty */ { $$ = 0; } ; synproxy_sack : /* empty */ { $$ = 0; } - | SACKPERM + | SACK_PERM { $$ = NF_SYNPROXY_OPT_SACK_PERM; }
src/parser_bison.y tcp_hdr_field : SPORT { $$ = TCPHDR_SPORT; } · line 5220
Quoted 9 lines
src/parser_bison.y +3
-2@@ -5216,9 +5214,10 @@ tcp_hdr_field : SPORT { $$ = TCPHDR_SPORT; } tcp_hdr_option_type : EOL { $$ = TCPOPTHDR_EOL; } | NOOP { $$ = TCPOPTHDR_NOOP; } - | MAXSEG { $$ = TCPOPTHDR_MAXSEG; } + | MSS { $$ = TCPOPTHDR_MAXSEG; } + | SACK_PERM { $$ = TCPOPTHDR_SACK_PERMITTED; } | WINDOW { $$ = TCPOPTHDR_WINDOW; } - | SACK_PERMITTED { $$ = TCPOPTHDR_SACK_PERMITTED; } + | WSCALE { $$ = TCPOPTHDR_WINDOW; }
Did you mean to add this here?
Quoted 159 lines
src/parser_bison.y +0
-0| SACK { $$ = TCPOPTHDR_SACK0; } | SACK0 { $$ = TCPOPTHDR_SACK0; } | SACK1 { $$ = TCPOPTHDR_SACK1; }src/scanner.l +4
-4@@ -421,14 +421,16 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "echo" { return ECHO; } "eol" { return EOL; } -"maxseg" { return MAXSEG; } +"maxseg" { return MSS; } +"mss" { return MSS; } "noop" { return NOOP; } "sack" { return SACK; } "sack0" { return SACK0; } "sack1" { return SACK1; } "sack2" { return SACK2; } "sack3" { return SACK3; } -"sack-permitted" { return SACK_PERMITTED; } +"sack-permitted" { return SACK_PERM; } +"sack-perm" { return SACK_PERM; } "timestamp" { return TIMESTAMP; } "time" { return TIME; }@@ -565,9 +567,7 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "osf" { return OSF; } "synproxy" { return SYNPROXY; } -"mss" { return MSS; } "wscale" { return WSCALE; } -"sack-perm" { return SACKPERM; } "notrack" { return NOTRACK; }src/tcpopt.c +1
-1@@ -55,7 +55,7 @@ static const struct exthdr_desc tcpopt_window = { };static const struct exthdr_desc tcpopt_sack_permitted = { - .name ="sack-permitted" , + .name ="sack-perm" , .type =TCPOPT_SACK_PERMITTED , .templates = { [TCPOPTHDR_FIELD_KIND ] =PHT ("kind" ,0 ,8 ),tests/py/any/tcpopt.t +2
-2@@ -12,8 +12,8 @@ tcp option maxseg size 1;ok tcp option window kind 1;ok tcp option window length 1;ok tcp option window count 1;ok -tcp option sack-permitted kind 1;ok -tcp option sack-permitted length 1;ok +tcp option sack-perm kind 1;ok +tcp option sack-perm length 1;ok tcp option sack kind 1;ok tcp option sack length 1;ok tcp option sack left 1;oktests/py/any/tcpopt.t.json +4
-4@@ -126,14 +126,14 @@ } ] -# tcp option sack-permitted kind 1 +# tcp option sack-perm kind 1 [ { "match": { "left": { "tcp option": { "field": "kind", - "name": "sack-permitted" + "name": "sack-perm" } }, "op": "==",@@ -142,14 +142,14 @@ } ] -# tcp option sack-permitted length 1 +# tcp option sack-perm length 1 [ { "match": { "left": { "tcp option": { "field": "length", - "name": "sack-permitted" + "name": "sack-perm" } }, "op": "==",tests/py/any/tcpopt.t.payload +6
-7@@ -166,42 +166,42 @@ inet [ exthdr load tcpopt 1b @ 3 + 2 => reg 1 ] [ cmp eq reg 1 0x00000001 ] -# tcp option sack-permitted kind 1 +# tcp option sack-perm kind 1 ip [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ exthdr load tcpopt 1b @ 4 + 0 => reg 1 ] [ cmp eq reg 1 0x00000001 ] -# tcp option sack-permitted kind 1 +# tcp option sack-perm kind 1 ip6 [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ exthdr load tcpopt 1b @ 4 + 0 => reg 1 ] [ cmp eq reg 1 0x00000001 ] -# tcp option sack-permitted kind 1 +# tcp option sack-perm kind 1 inet [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ exthdr load tcpopt 1b @ 4 + 0 => reg 1 ] [ cmp eq reg 1 0x00000001 ] -# tcp option sack-permitted length 1 +# tcp option sack-perm length 1 ip [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ exthdr load tcpopt 1b @ 4 + 1 => reg 1 ] [ cmp eq reg 1 0x00000001 ] -# tcp option sack-permitted length 1 +# tcp option sack-perm length 1 ip6 [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] [ exthdr load tcpopt 1b @ 4 + 1 => reg 1 ] [ cmp eq reg 1 0x00000001 ] -# tcp option sack-permitted length 1 +# tcp option sack-perm length 1 inet [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] --2.26.2
Florian Westphal
maintainerRe: [PATCH nft 1/7] parser: merge sack-perm/sack-permitted and maxseg/mss
Quoted 8 lines · Jeremy Sowden
src/parser_bison.y tcp_hdr_field : SPORT { $$ = TCPHDR_SPORT; } · line 5220
Quoted 6 lines
src/parser_bison.y +3
-2- | MAXSEG { $$ = TCPOPTHDR_MAXSEG; } + | MSS { $$ = TCPOPTHDR_MAXSEG; } + | SACK_PERM { $$ = TCPOPTHDR_SACK_PERMITTED; } | WINDOW { $$ = TCPOPTHDR_WINDOW; } - | SACK_PERMITTED { $$ = TCPOPTHDR_SACK_PERMITTED; } + | WSCALE { $$ = TCPOPTHDR_WINDOW; }Did you mean to add this here?
Right, this could be a distinct change.
ATM there is
... synproxy ... wscale
and
... tcp option window ...
Like the sack-perm vs. sack-permitted mess it probably makes sense to get rid of one of those tokens so both work interchangeably, i.e.
tcp option wscale
and
tcp option window
are the same.
I will remove this chunk before pushing it out.
Florian Westphal
maintainerPATCH 2/7 tcpopts: clean up parser -> tcpopt.c plumbing
In reply to Florian Westphaltcpopt template mapping is asymmetric:
one mapping is to match dumped netlink exthdr expression to the original tcp option template.
This struct is indexed by the raw, on-write kind/type number.
The other mapping maps parsed options to the tcp option template. Remove the latter. The parser is changed to translate the textual option name, e.g. "maxseg" to the on-wire number.
This avoids the second mapping, it will also allow to more easily support raw option matching in a followup patch.
--- doc/payload-expression.txt | 4 +- include/tcpopt.h | 35 ++++++++------- src/parser_bison.y | 28 ++++++------ src/parser_json.c | 10 ++--- src/scanner.l | 3 +- src/tcpopt.c | 92 +++++++++++++++----------------------- 6 files changed, 76 insertions(+), 96 deletions(-)
doc/payload-expression.txt +2 -2
@@ -525,13 +525,13 @@ nftables currently supports matching (finding) a given ipv6 extension header, TC *dst* {*nexthdr* | *hdrlength*} *mh* {*nexthdr* | *hdrlength* | *checksum* | *type*} *srh* {*flags* | *tag* | *sid* | *seg-left*} -*tcp option* {*eol* | *noop* | *maxseg* | *window* | *sack-perm* | *sack* | *sack0* | *sack1* | *sack2* | *sack3* | *timestamp*} 'tcp_option_field' +*tcp option* {*eol* | *nop* | *maxseg* | *window* | *sack-perm* | *sack* | *sack0* | *sack1* | *sack2* | *sack3* | *timestamp*} 'tcp_option_field' *ip option* { lsrr | ra | rr | ssrr } 'ip_option_field' The following syntaxes are valid only in a relational expression with boolean type on right-hand side for checking header existence only: [verse] *exthdr* {*hbh* | *frag* | *rt* | *dst* | *mh*} -*tcp option* {*eol* | *noop* | *maxseg* | *window* | *sack-perm* | *sack* | *sack0* | *sack1* | *sack2* | *sack3* | *timestamp*} +*tcp option* {*eol* | *nop* | *maxseg* | *window* | *sack-perm* | *sack* | *sack0* | *sack1* | *sack2* | *sack3* | *timestamp*} *ip option* { lsrr | ra | rr | ssrr } .IPv6 extension headers
include/tcpopt.h +18 -17
@@ -6,7 +6,7 @@#include <statement.h> extern struct expr *tcpopt_expr_alloc (const struct location *loc, -uint8_t type,uint8_t field); +unsigned int kind,unsigned int field); extern void tcpopt_init_raw(struct expr *expr, uint8_t type, unsigned int offset, unsigned int len,
@@ -15,21 +15,22 @@ extern void tcpopt_init_raw(struct expr *expr, uint8_t type,extern bool tcpopt_find_template (struct expr *expr,const struct expr *mask,unsigned int *shift); -enum tcpopt_hdr_types { -TCPOPTHDR_INVALID , -TCPOPTHDR_EOL , -TCPOPTHDR_NOOP , -TCPOPTHDR_MAXSEG , -TCPOPTHDR_WINDOW , -TCPOPTHDR_SACK_PERMITTED , -TCPOPTHDR_SACK0 , -TCPOPTHDR_SACK1 , -TCPOPTHDR_SACK2 , -TCPOPTHDR_SACK3 , -TCPOPTHDR_TIMESTAMP , -TCPOPTHDR_ECHO , -TCPOPTHDR_ECHO_REPLY , - __TCPOPTHDR_MAX +/* TCP option numbers used on wire */ +enum tcpopt_kind { +TCPOPT_KIND_EOL =0 , +TCPOPT_KIND_NOP =1 , +TCPOPT_KIND_MAXSEG =2 , +TCPOPT_KIND_WINDOW =3 , +TCPOPT_KIND_SACK_PERMITTED =4 , +TCPOPT_KIND_SACK =5 , +TCPOPT_KIND_TIMESTAMP =8 , +TCPOPT_KIND_ECHO =8 , + __TCPOPT_KIND_MAX, + +/* extra oob info, internal to nft */ +TCPOPT_KIND_SACK1 =256 , +TCPOPT_KIND_SACK2 =257 , +TCPOPT_KIND_SACK3 =258 , };enum tcpopt_hdr_fields {
@@ -44,6 +45,6 @@ enum tcpopt_hdr_fields { TCPOPTHDR_FIELD_TSECR, }; -extern const struct exthdr_desc *tcpopthdr_protocols[__TCPOPTHDR_MAX]; +extern const struct exthdr_desc *tcpopt_protocols[__TCPOPT_KIND_MAX];#endif /* NFTABLES_TCPOPT_H */
src/parser_bison.y +14 -14
@@ -399,7 +399,7 @@ int nft_lex(void *, void *, void *); %token OPTION "option" %token ECHO "echo" %token EOL "eol" -%token NOOP "noop" +%token NOP "nop" %token SACK "sack" %token SACK0 "sack0" %token SACK1 "sack1"
@@ -5212,19 +5212,19 @@ tcp_hdr_field : SPORT { $$ = TCPHDR_SPORT; } | URGPTR { $$ = TCPHDR_URGPTR; } ; -tcp_hdr_option_type : EOL { $$ = TCPOPTHDR_EOL; } - | NOOP { $$ = TCPOPTHDR_NOOP; } - | MSS { $$ = TCPOPTHDR_MAXSEG; } - | SACK_PERM { $$ = TCPOPTHDR_SACK_PERMITTED; } - | WINDOW { $$ = TCPOPTHDR_WINDOW; } - | WSCALE { $$ = TCPOPTHDR_WINDOW; } - | SACK { $$ = TCPOPTHDR_SACK0; } - | SACK0 { $$ = TCPOPTHDR_SACK0; } - | SACK1 { $$ = TCPOPTHDR_SACK1; } - | SACK2 { $$ = TCPOPTHDR_SACK2; } - | SACK3 { $$ = TCPOPTHDR_SACK3; } - | ECHO { $$ = TCPOPTHDR_ECHO; } - | TIMESTAMP { $$ = TCPOPTHDR_TIMESTAMP; } +tcp_hdr_option_type : EOL { $$ = TCPOPT_KIND_EOL; } + | NOP { $$ = TCPOPT_KIND_NOP; } + | MSS { $$ = TCPOPT_KIND_MAXSEG; } + | SACK_PERM { $$ = TCPOPT_KIND_SACK_PERMITTED; } + | WINDOW { $$ = TCPOPT_KIND_WINDOW; } + | WSCALE { $$ = TCPOPT_KIND_WINDOW; } + | SACK { $$ = TCPOPT_KIND_SACK; } + | SACK0 { $$ = TCPOPT_KIND_SACK; } + | SACK1 { $$ = TCPOPT_KIND_SACK1; } + | SACK2 { $$ = TCPOPT_KIND_SACK2; } + | SACK3 { $$ = TCPOPT_KIND_SACK3; } + | ECHO { $$ = TCPOPT_KIND_ECHO; } + | TIMESTAMP { $$ = TCPOPT_KIND_TIMESTAMP; } ; tcp_hdr_option_field : KIND { $$ = TCPOPTHDR_FIELD_KIND; }
src/parser_json.c +5 -5
@@ -458,9 +458,9 @@ static int json_parse_tcp_option_type(const char *name, int *val) {unsigned int i; -for (i =0 ; i <array_size (tcpopthdr_protocols); i++) { -if (tcpopthdr_protocols[i] && - !strcmp (tcpopthdr_protocols[i]->name, name)) { +for (i =0 ; i <array_size (tcpopt_protocols); i++) { +if (tcpopt_protocols[i] && + !strcmp (tcpopt_protocols[i]->name, name)) {if (val) *val = i;return 0 ;
@@ -469,7 +469,7 @@ static int json_parse_tcp_option_type(const char *name, int *val)/* special case for sack0 - sack3 */ if (sscanf (name,"sack%u" , &i) ==1 && i <4 ) {if (val) - *val =TCPOPTHDR_SACK0 + i; + *val =TCPOPT_KIND_SACK + i;return 0 ; }return 1 ;
@@ -478,7 +478,7 @@ static int json_parse_tcp_option_type(const char *name, int *val)static int json_parse_tcp_option_field (int type,const char *name,int *val) {unsigned int i; -const struct exthdr_desc *desc = tcpopthdr_protocols[type]; +const struct exthdr_desc *desc = tcpopt_protocols[type];for (i =0 ; i <array_size (desc->templates); i++) { if (desc->templates[i].token &&
src/scanner.l +2 -1
@@ -423,7 +423,8 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "eol" { return EOL; } "maxseg" { return MSS; } "mss" { return MSS; } -"noop" { return NOOP; } +"nop" { return NOP; } +"noop" { return NOP; } "sack" { return SACK; } "sack0" { return SACK0; } "sack1" { return SACK1; }
src/tcpopt.c +35 -57
161 lines not on this page · raw message
Signature · 1 line
2.26.2
Florian Westphal
maintainerPATCH 3/7 tcpopt: rename noop to nop
In reply to Florian Westphal'nop' is the tcp padding "option". "noop" is retained for compatibility on parser side.
--- doc/payload-expression.txt | 4 ++-- src/tcpopt.c | 2 +- tests/py/any/tcpopt.t | 2 +- tests/py/any/tcpopt.t.json | 4 ++-- tests/py/any/tcpopt.t.payload | 16 +--------------- 5 files changed, 7 insertions(+), 21 deletions(-)
doc/payload-expression.txt +2 -2
@@ -559,8 +559,8 @@ Segment Routing Header |eol| End if option list| kind -|noop| -1 Byte TCP No-op options | +|nop| +1 Byte TCP Nop padding option | kind |maxseg| TCP Maximum Segment Size|
src/tcpopt.c +1 -1
@@ -27,7 +27,7 @@ static const struct exthdr_desc tcpopt_eol = { };static const struct exthdr_desc tcpopt_nop = { - .name ="noop" , + .name ="nop" , .type =TCPOPT_KIND_NOP , .templates = { [TCPOPTHDR_FIELD_KIND ] =PHT ("kind" ,0 ,8 ),
tests/py/any/tcpopt.t +1 -1
@@ -5,7 +5,7 @@ *inet;test-inet;input tcp option eol kind 1;ok -tcp option noop kind 1;ok +tcp option nop kind 1;ok tcp option maxseg kind 1;ok tcp option maxseg length 1;ok tcp option maxseg size 1;ok
tests/py/any/tcpopt.t.json +2 -2
@@ -14,14 +14,14 @@ } ] -# tcp option noop kind 1 +# tcp option nop kind 1 [ { "match": { "left": { "tcp option": { "field": "kind", - "name": "noop" + "name": "nop" } }, "op": "==",
tests/py/any/tcpopt.t.payload +1 -15
@@ -19,21 +19,7 @@ inet [ exthdr load tcpopt 1b @ 0 + 0 => reg 1 ] [ cmp eq reg 1 0x00000001 ] -# tcp option noop kind 1 -ip - [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] - [ exthdr load tcpopt 1b @ 1 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000001 ] - -# tcp option noop kind 1 -ip6 - [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] - [ exthdr load tcpopt 1b @ 1 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000001 ] - -# tcp option noop kind 1 +# tcp option nop kind 1 inet [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ]
Signature · 1 line
2.26.2
Florian Westphal
maintainerPATCH 4/7 tcpopt: split tcpopt_hdr_fields into per-option enum
In reply to Florian WestphalCurrently we're limited to ten template fields in exthdr_desc struct. Using a single enum for all tpc option fields thus won't work indefinitely (TCPOPTHDR_FIELD_TSECR is 9) when new option templates get added.
Fortunately we can just use one enum per tcp option to avoid this. As a side effect this also allows to simplify the sack offset calculations. Rather than computing that on-the-fly, just add extra fields to the SACK template.
expr->exthdr.offset now holds the 'raw' value, filled in from the option template. This would ease implementation of 'raw option matching' using offset and length to load from the option.
--- include/tcpopt.h | 46 +++++++++++---- src/evaluate.c | 16 ++--- src/exthdr.c | 1 + src/ipopt.c | 2 +- src/netlink_delinearize.c | 2 +- src/netlink_linearize.c | 4 +- src/parser_bison.y | 18 +++--- src/parser_json.c | 36 ++++++++++-- src/tcpopt.c | 119 ++++++++++++++++---------------------- 9 files changed, 139 insertions(+), 105 deletions(-)
include/tcpopt.h +36 -10
@@ -33,16 +33,42 @@ enum tcpopt_kind { TCPOPT_KIND_SACK3 = 258, }; -enum tcpopt_hdr_fields { -TCPOPTHDR_FIELD_INVALID , -TCPOPTHDR_FIELD_KIND , -TCPOPTHDR_FIELD_LENGTH , -TCPOPTHDR_FIELD_SIZE , -TCPOPTHDR_FIELD_COUNT , -TCPOPTHDR_FIELD_LEFT , -TCPOPTHDR_FIELD_RIGHT , -TCPOPTHDR_FIELD_TSVAL , -TCPOPTHDR_FIELD_TSECR , +/* Internal identifiers */ +enum tcpopt_common { +TCPOPT_COMMON_KIND , +TCPOPT_COMMON_LENGTH , +}; + +enum tcpopt_maxseg { +TCPOPT_MAXSEG_KIND , +TCPOPT_MAXSEG_LENGTH , +TCPOPT_MAXSEG_SIZE , +}; + +enum tcpopt_timestamp { +TCPOPT_TS_KIND , +TCPOPT_TS_LENGTH , +TCPOPT_TS_TSVAL , +TCPOPT_TS_TSECR , +}; + +enum tcpopt_windowscale { +TCPOPT_WINDOW_KIND , +TCPOPT_WINDOW_LENGTH , +TCPOPT_WINDOW_COUNT , +}; + +enum tcpopt_hdr_field_sack { +TCPOPT_SACK_KIND , +TCPOPT_SACK_LENGTH , +TCPOPT_SACK_LEFT , +TCPOPT_SACK_RIGHT , +TCPOPT_SACK_LEFT1 , +TCPOPT_SACK_RIGHT1 , +TCPOPT_SACK_LEFT2 , +TCPOPT_SACK_RIGHT2 , +TCPOPT_SACK_LEFT3 , +TCPOPT_SACK_RIGHT3 , };extern const struct exthdr_desc *tcpopt_protocols[__TCPOPT_KIND_MAX];
src/evaluate.c +6 -10
@@ -477,7 +477,7 @@ static void expr_evaluate_bits(struct eval_ctx *ctx, struct expr **exprp) &extra_len);break ;case EXPR_EXTHDR : - shift =expr_offset_shift (expr, expr->exthdr.tmpl->offset, + shift =expr_offset_shift (expr, expr->exthdr.offset, &extra_len);break ;default :
@@ -530,18 +530,16 @@ static int __expr_evaluate_exthdr(struct eval_ctx *ctx, struct expr **exprp)if (expr_evaluate_primary (ctx, exprp) <0 )return -1 ; -if (expr->exthdr.tmpl->offset %BITS_PER_BYTE !=0 || +if (expr->exthdr.offset %BITS_PER_BYTE !=0 || expr->len %BITS_PER_BYTE !=0 )expr_evaluate_bits (ctx, exprp);switch (expr->exthdr.op) {case NFT_EXTHDR_OP_TCPOPT : {static const unsigned int max_tcpoptlen = (15 *4 -20 ) *BITS_PER_BYTE ; -unsigned int totlen =0 ; +unsigned int totlen; - totlen += expr->exthdr.tmpl->offset; - totlen += expr->exthdr.tmpl->len; - totlen += expr->exthdr.offset; + totlen = expr->exthdr.tmpl->len + expr->exthdr.offset;if (totlen > max_tcpoptlen) return expr_error(ctx->msgs, expr,
@@ -551,11 +549,9 @@ static int __expr_evaluate_exthdr(struct eval_ctx *ctx, struct expr **exprp) }case NFT_EXTHDR_OP_IPV4 : {static const unsigned int max_ipoptlen =40 *BITS_PER_BYTE ; -unsigned int totlen =0 ; +unsigned int totlen; - totlen += expr->exthdr.tmpl->offset; - totlen += expr->exthdr.tmpl->len; - totlen += expr->exthdr.offset; + totlen = expr->exthdr.offset + expr->exthdr.tmpl->len;if (totlen > max_ipoptlen) return expr_error(ctx->msgs, expr,
src/exthdr.c +1 -0
@@ -193,6 +193,7 @@ struct expr *exthdr_expr_alloc(const struct location *loc, BYTEORDER_BIG_ENDIAN, tmpl->len); expr->exthdr.desc = desc; expr->exthdr.tmpl = tmpl; + expr->exthdr.offset = tmpl->offset;return expr; }
src/ipopt.c +1 -1
@@ -102,7 +102,7 @@ struct expr *ipopt_expr_alloc(const struct location *loc, uint8_t type, expr->exthdr.desc = desc; expr->exthdr.tmpl = tmpl; expr->exthdr.op =NFT_EXTHDR_OP_IPV4 ; - expr->exthdr.offset =calc_offset (desc, tmpl, ptr); + expr->exthdr.offset = tmpl->offset +calc_offset (desc, tmpl, ptr);return expr; }
src/netlink_delinearize.c +1 -1
@@ -809,8 +809,8 @@ static void netlink_parse_numgen(struct netlink_parse_ctx *ctx,const struct location *loc, const struct nftnl_expr *nle) { - enum nft_registers dreg; uint32_t type, until, offset; +enum nft_registers dreg;struct expr *expr; type =nftnl_expr_get_u32 (nle,NFTNL_EXPR_NG_TYPE );
src/netlink_linearize.c +2 -2
@@ -200,7 +200,7 @@ static void netlink_gen_exthdr(struct netlink_linearize_ctx *ctx,const struct expr *expr, enum nft_registers dreg) { - unsigned int offset = expr->exthdr.tmpl->offset + expr->exthdr.offset; + unsigned int offset = expr->exthdr.offset;struct nftnl_expr *nle; nle =alloc_nft_expr ("exthdr" );
@@ -966,7 +966,7 @@ static void netlink_gen_exthdr_stmt(struct netlink_linearize_ctx *ctx, expr = stmt->exthdr.expr; - offset = expr->exthdr.tmpl->offset + expr->exthdr.offset; + offset = expr->exthdr.offset; nle =alloc_nft_expr ("exthdr" );netlink_put_register (nle,NFTNL_EXPR_EXTHDR_SREG , sreg);
src/parser_bison.y +9 -9
@@ -5195,7 +5195,7 @@ tcp_hdr_expr : TCP tcp_hdr_field } | TCP OPTION tcp_hdr_option_type { - $$ = tcpopt_expr_alloc(&@$, $3, TCPOPTHDR_FIELD_KIND); + $$ = tcpopt_expr_alloc(&@$, $3, TCPOPT_COMMON_KIND); $$->exthdr.flags = NFT_EXTHDR_F_PRESENT; } ;
@@ -5227,14 +5227,14 @@ tcp_hdr_option_type : EOL { $$ = TCPOPT_KIND_EOL; } | TIMESTAMP { $$ = TCPOPT_KIND_TIMESTAMP; } ; -tcp_hdr_option_field : KIND { $$ = TCPOPTHDR_FIELD_KIND; } - | LENGTH { $$ = TCPOPTHDR_FIELD_LENGTH; } - | SIZE { $$ = TCPOPTHDR_FIELD_SIZE; } - | COUNT { $$ = TCPOPTHDR_FIELD_COUNT; } - | LEFT { $$ = TCPOPTHDR_FIELD_LEFT; } - | RIGHT { $$ = TCPOPTHDR_FIELD_RIGHT; } - | TSVAL { $$ = TCPOPTHDR_FIELD_TSVAL; } - | TSECR { $$ = TCPOPTHDR_FIELD_TSECR; } +tcp_hdr_option_field : KIND { $$ = TCPOPT_COMMON_KIND; } + | LENGTH { $$ = TCPOPT_COMMON_LENGTH; } + | SIZE { $$ = TCPOPT_MAXSEG_SIZE; } + | COUNT { $$ = TCPOPT_WINDOW_COUNT; } + | LEFT { $$ = TCPOPT_SACK_LEFT; } + | RIGHT { $$ = TCPOPT_SACK_RIGHT; } + | TSVAL { $$ = TCPOPT_TS_TSVAL; } + | TSECR { $$ = TCPOPT_TS_TSECR; } ; dccp_hdr_expr : DCCP dccp_hdr_field
src/parser_json.c +32 -4
@@ -468,8 +468,10 @@ static int json_parse_tcp_option_type(const char *name, int *val) }/* special case for sack0 - sack3 */ if (sscanf (name,"sack%u" , &i) ==1 && i <4 ) { -if (val) - *val =TCPOPT_KIND_SACK + i; +if (val && i ==0 ) + *val =TCPOPT_KIND_SACK ; +else if (val && i >0 ) + *val =TCPOPT_KIND_SACK1 + i -1 ;return 0 ; }return 1 ;
@@ -477,12 +479,38 @@ static int json_parse_tcp_option_type(const char *name, int *val)static int json_parse_tcp_option_field (int type,const char *name,int *val) { +const struct exthdr_desc *desc; +unsigned int block =0 ;unsigned int i; -const struct exthdr_desc *desc = tcpopt_protocols[type]; + +switch (type) { +case TCPOPT_KIND_SACK1 : + type =TCPOPT_KIND_SACK ; + block =1 ; +break ; +case TCPOPT_KIND_SACK2 : + type =TCPOPT_KIND_SACK ; + block =2 ; +break ; +case TCPOPT_KIND_SACK3 : + type =TCPOPT_KIND_SACK ; + block =3 ; +break ; + } + +if (type <0 || type >= (int )array_size (tcpopt_protocols)) +return 1 ; + + desc = tcpopt_protocols[type];for (i =0 ; i <array_size (desc->templates); i++) {if (desc->templates[i].token && !strcmp (desc->templates[i].token, name)) { +if (block) { + block--; +continue ; + } +if (val) *val = i;return 0 ;
@@ -587,7 +615,7 @@ static struct expr *json_parse_tcp_option_expr(struct json_ctx *ctx,if (json_unpack (root,"{s:s}" ,"field" , &field)) { expr =tcpopt_expr_alloc (int_loc, descval, -TCPOPTHDR_FIELD_KIND ); +TCPOPT_COMMON_KIND ); expr->exthdr.flags =NFT_EXTHDR_F_PRESENT ;return expr;
src/tcpopt.c +51 -68
212 lines not on this page · raw message
Signature · 1 line
2.26.2
Florian Westphal
maintainerPATCH 5/7 tcpopt: allow to check for presence of any tcp option
In reply to Florian Westphalnft currently doesn't allow to check for presence of arbitrary tcp options. Only known options where nft provides a template can be tested for.
This allows to test for presence of raw protocol values as well.
Example:
tcp option 42 exists
--- include/expression.h | 3 +- src/exthdr.c | 12 ++++++++ src/ipopt.c | 1 + src/netlink_linearize.c | 2 +- src/parser_bison.y | 7 +++++ src/tcpopt.c | 42 +++++++++++++++++++++++---- tests/py/any/tcpopt.t | 2 ++ tests/py/any/tcpopt.t.payload | 53 +++-------------------------------- 8 files changed, 65 insertions(+), 57 deletions(-)
include/expression.h +2 -1
@@ -311,7 +311,8 @@ struct expr {/* EXPR_EXTHDR */ const struct exthdr_desc *desc;const struct proto_hdr_template *tmpl; -unsigned int offset; +uint16_t offset; +uint8_t raw_type;enum nft_exthdr_op op;unsigned int flags; } exthdr;
src/exthdr.c +12 -0
@@ -52,6 +52,13 @@ static void exthdr_expr_print(const struct expr *expr, struct output_ctx *octx)*/ unsigned int offset = expr->exthdr.offset /64 ; +if (expr->exthdr.desc ==NULL && + expr->exthdr.offset ==0 && + expr->exthdr.flags &NFT_EXTHDR_F_PRESENT ) { +nft_print (octx,"tcp option %d" , expr->exthdr.raw_type); +return ; + } +nft_print (octx,"tcp option %s" , expr->exthdr.desc->name);if (expr->exthdr.flags &NFT_EXTHDR_F_PRESENT )return ;
@@ -79,6 +86,7 @@ static bool exthdr_expr_cmp(const struct expr *e1, const struct expr *e2)return e1->exthdr.desc == e2->exthdr.desc && e1->exthdr.tmpl == e2->exthdr.tmpl && e1->exthdr.op == e2->exthdr.op && + e1->exthdr.raw_type == e2->exthdr.raw_type && e1->exthdr.flags == e2->exthdr.flags; }
@@ -89,6 +97,7 @@ static void exthdr_expr_clone(struct expr *new, const struct expr *expr) new->exthdr.offset = expr->exthdr.offset; new->exthdr.op = expr->exthdr.op; new->exthdr.flags = expr->exthdr.flags; + new->exthdr.raw_type = expr->exthdr.raw_type; }#define NFTNL_UDATA_EXTHDR_DESC 0
@@ -192,6 +201,7 @@ struct expr *exthdr_expr_alloc(const struct location *loc, expr =expr_alloc (loc,EXPR_EXTHDR , tmpl->dtype,BYTEORDER_BIG_ENDIAN , tmpl->len); expr->exthdr.desc = desc; + expr->exthdr.raw_type = desc ? desc->type :0 ; expr->exthdr.tmpl = tmpl; expr->exthdr.offset = tmpl->offset;return expr;
@@ -270,6 +280,8 @@ void exthdr_init_raw(struct expr *expr, uint8_t type,unsigned int i;assert (expr->etype ==EXPR_EXTHDR ); + expr->exthdr.raw_type = type; +if (op ==NFT_EXTHDR_OP_TCPOPT )return tcpopt_init_raw (expr, type, offset, len, flags);if (op ==NFT_EXTHDR_OP_IPV4 )
src/ipopt.c +1 -0
@@ -103,6 +103,7 @@ struct expr *ipopt_expr_alloc(const struct location *loc, uint8_t type, expr->exthdr.tmpl = tmpl; expr->exthdr.op =NFT_EXTHDR_OP_IPV4 ; expr->exthdr.offset = tmpl->offset +calc_offset (desc, tmpl, ptr); + expr->exthdr.raw_type = desc->type;return expr; }
src/netlink_linearize.c +1 -1
@@ -206,7 +206,7 @@ static void netlink_gen_exthdr(struct netlink_linearize_ctx *ctx, nle =alloc_nft_expr ("exthdr" );netlink_put_register (nle,NFTNL_EXPR_EXTHDR_DREG , dreg);nftnl_expr_set_u8 (nle,NFTNL_EXPR_EXTHDR_TYPE , - expr->exthdr.desc->type); + expr->exthdr.raw_type);nftnl_expr_set_u32 (nle,NFTNL_EXPR_EXTHDR_OFFSET , offset /BITS_PER_BYTE );nftnl_expr_set_u32 (nle,NFTNL_EXPR_EXTHDR_LEN ,div_round_up (expr->len,BITS_PER_BYTE ));
src/parser_bison.y +7 -0
@@ -5225,6 +5225,13 @@ tcp_hdr_option_type : EOL { $$ = TCPOPT_KIND_EOL; } | SACK3 { $$ = TCPOPT_KIND_SACK3; } | ECHO { $$ = TCPOPT_KIND_ECHO; } | TIMESTAMP { $$ = TCPOPT_KIND_TIMESTAMP; } + | NUM { + if ($1 > 255) { + erec_queue(error(&@1, "value too large"), state->msgs); + YYERROR; + } + $$ = $1; + } ; tcp_hdr_option_field : KIND { $$ = TCPOPT_COMMON_KIND; }
src/tcpopt.c +36 -6
74 lines not on this page · raw message
tests/py/any/tcpopt.t +2 -0
@@ -30,6 +30,7 @@ tcp option timestamp kind 1;ok tcp option timestamp length 1;ok tcp option timestamp tsval 1;ok tcp option timestamp tsecr 1;ok +tcp option 255 missing;ok tcp option foobar;fail tcp option foo bar;fail
@@ -38,6 +39,7 @@ tcp option eol left 1;fail tcp option eol left 1;fail tcp option sack window;fail tcp option sack window 1;fail +tcp option 256 exists;fail tcp option window exists;ok tcp option window missing;ok
tests/py/any/tcpopt.t.payload +4 -49
79 lines not on this page · raw message
Signature · 1 line
2.26.2
Re: [PATCH nft 5/7] tcpopt: allow to check for presence of any tcp option
Quoted 244 lines · Florian Westphal
nft currently doesn't allow to check for presence of arbitrary tcp options. Only known options where nft provides a template can be tested for.
This allows to test for presence of raw protocol values as well.
Example:
tcp option 42 exists
Signed-off-by Florian Westphal <[email protected]>--- include/expression.h | 3 +- src/exthdr.c | 12 ++++++++ src/ipopt.c | 1 + src/netlink_linearize.c | 2 +- src/parser_bison.y | 7 +++++ src/tcpopt.c | 42 +++++++++++++++++++++++---- tests/py/any/tcpopt.t | 2 ++ tests/py/any/tcpopt.t.payload | 53 +++-------------------------------- 8 files changed, 65 insertions(+), 57 deletions(-)include/expression.h +2
-1@@ -311,7 +311,8 @@ struct expr {/* EXPR_EXTHDR */ const struct exthdr_desc *desc;const struct proto_hdr_template *tmpl; -unsigned int offset; +uint16_t offset; +uint8_t raw_type;enum nft_exthdr_op op;unsigned int flags; } exthdr;src/exthdr.c +12
-0@@ -52,6 +52,13 @@ static void exthdr_expr_print(const struct expr *expr, struct output_ctx *octx)*/ unsigned int offset = expr->exthdr.offset /64 ; +if (expr->exthdr.desc ==NULL && + expr->exthdr.offset ==0 && + expr->exthdr.flags &NFT_EXTHDR_F_PRESENT ) { +nft_print (octx,"tcp option %d" , expr->exthdr.raw_type); +return ; + } +nft_print (octx,"tcp option %s" , expr->exthdr.desc->name);if (expr->exthdr.flags &NFT_EXTHDR_F_PRESENT )return ;@@ -79,6 +86,7 @@ static bool exthdr_expr_cmp(const struct expr *e1, const struct expr *e2)return e1->exthdr.desc == e2->exthdr.desc && e1->exthdr.tmpl == e2->exthdr.tmpl && e1->exthdr.op == e2->exthdr.op && + e1->exthdr.raw_type == e2->exthdr.raw_type && e1->exthdr.flags == e2->exthdr.flags; }@@ -89,6 +97,7 @@ static void exthdr_expr_clone(struct expr *new, const struct expr *expr) new->exthdr.offset = expr->exthdr.offset; new->exthdr.op = expr->exthdr.op; new->exthdr.flags = expr->exthdr.flags; + new->exthdr.raw_type = expr->exthdr.raw_type; }#define NFTNL_UDATA_EXTHDR_DESC 0@@ -192,6 +201,7 @@ struct expr *exthdr_expr_alloc(const struct location *loc, expr =expr_alloc (loc,EXPR_EXTHDR , tmpl->dtype,BYTEORDER_BIG_ENDIAN , tmpl->len); expr->exthdr.desc = desc; + expr->exthdr.raw_type = desc ? desc->type :0 ; expr->exthdr.tmpl = tmpl; expr->exthdr.offset = tmpl->offset;return expr;@@ -270,6 +280,8 @@ void exthdr_init_raw(struct expr *expr, uint8_t type,unsigned int i;assert (expr->etype ==EXPR_EXTHDR ); + expr->exthdr.raw_type = type; +if (op ==NFT_EXTHDR_OP_TCPOPT )return tcpopt_init_raw (expr, type, offset, len, flags);if (op ==NFT_EXTHDR_OP_IPV4 )src/ipopt.c +1
-0@@ -103,6 +103,7 @@ struct expr *ipopt_expr_alloc(const struct location *loc, uint8_t type, expr->exthdr.tmpl = tmpl; expr->exthdr.op =NFT_EXTHDR_OP_IPV4 ; expr->exthdr.offset = tmpl->offset +calc_offset (desc, tmpl, ptr); + expr->exthdr.raw_type = desc->type;return expr; }src/netlink_linearize.c +1
-1@@ -206,7 +206,7 @@ static void netlink_gen_exthdr(struct netlink_linearize_ctx *ctx, nle =alloc_nft_expr ("exthdr" );netlink_put_register (nle,NFTNL_EXPR_EXTHDR_DREG , dreg);nftnl_expr_set_u8 (nle,NFTNL_EXPR_EXTHDR_TYPE , - expr->exthdr.desc->type); + expr->exthdr.raw_type);nftnl_expr_set_u32 (nle,NFTNL_EXPR_EXTHDR_OFFSET , offset /BITS_PER_BYTE );nftnl_expr_set_u32 (nle,NFTNL_EXPR_EXTHDR_LEN ,div_round_up (expr->len,BITS_PER_BYTE ));src/parser_bison.y +7
-0@@ -5225,6 +5225,13 @@ tcp_hdr_option_type : EOL { $$ = TCPOPT_KIND_EOL; } | SACK3 { $$ = TCPOPT_KIND_SACK3; } | ECHO { $$ = TCPOPT_KIND_ECHO; } | TIMESTAMP { $$ = TCPOPT_KIND_TIMESTAMP; } + | NUM { + if ($1 > 255) { + erec_queue(error(&@1, "value too large"), state->msgs); + YYERROR; + } + $$ = $1; + } ; tcp_hdr_option_field : KIND { $$ = TCPOPT_COMMON_KIND; }src/tcpopt.c +36
-6@@ -103,6 +103,19 @@ const struct exthdr_desc *tcpopt_protocols[] = { [TCPOPT_KIND_TIMESTAMP] = &tcpopt_timestamp, }; +/** +* tcpopt_expr_alloc - allocate tcp option extension expression +* +* @loc: location from parser +* @kind: raw tcp option value to find in packet +* @field: highlevel field to find in the option if @kind is present in packet +* +* Allocate a new tcp option expression. +* @kind is the raw option value to find in the packet. +* Exception: SACK may use extra OOB data that is mangled here. +* +* @field is the optional field to extract from the @type option. +*/ struct expr *tcpopt_expr_alloc (const struct location *loc,unsigned int kind,unsigned int field)@@ -138,8 +151,22 @@ struct expr *tcpopt_expr_alloc(const struct location *loc,if (kind <array_size (tcpopt_protocols)) desc = tcpopt_protocols[kind]; -if (!desc) -return NULL ; +if (!desc) { +if (field !=TCPOPT_COMMON_KIND || kind >255 ) +return NULL ; + + expr =expr_alloc (loc,EXPR_EXTHDR , &integer_type, +BYTEORDER_BIG_ENDIAN ,8 ); + + desc = tcpopt_protocols[TCPOPT_NOP ]; + tmpl = &desc->templates[field]; + expr->exthdr.desc = desc; + expr->exthdr.tmpl = tmpl; + expr->exthdr.op =NFT_EXTHDR_OP_TCPOPT ; + expr->exthdr.raw_type = kind; +return expr; + } + tmpl = &desc->templates[field];if (!tmpl)return NULL ;@@ -149,6 +176,7 @@ struct expr *tcpopt_expr_alloc(const struct location *loc, expr->exthdr.desc = desc; expr->exthdr.tmpl = tmpl; expr->exthdr.op =NFT_EXTHDR_OP_TCPOPT ; + expr->exthdr.raw_type = desc->type; expr->exthdr.offset = tmpl->offset;return expr;@@ -165,6 +193,10 @@ void tcpopt_init_raw(struct expr *expr, uint8_t type, unsigned int off, expr->len = len; expr->exthdr.flags = flags; expr->exthdr.offset = off; + expr->exthdr.op =NFT_EXTHDR_OP_TCPOPT ; + +if (flags &NFT_EXTHDR_F_PRESENT ) +datatype_set (expr, &boolean_type);if (type >=array_size (tcpopt_protocols))return ;@@ -178,12 +210,10 @@ void tcpopt_init_raw(struct expr *expr, uint8_t type, unsigned int off,if (tmpl->offset != off || tmpl->len != len)continue ; -if (flags &NFT_EXTHDR_F_PRESENT ) -datatype_set (expr, &boolean_type); -else +if ((flags &NFT_EXTHDR_F_PRESENT ) ==0 )datatype_set (expr, tmpl->dtype); + expr->exthdr.tmpl = tmpl; - expr->exthdr.op =NFT_EXTHDR_OP_TCPOPT ;break ; } }tests/py/any/tcpopt.t +2
-0@@ -30,6 +30,7 @@ tcp option timestamp kind 1;ok tcp option timestamp length 1;ok tcp option timestamp tsval 1;ok tcp option timestamp tsecr 1;ok +tcp option 255 missing;ok tcp option foobar;fail tcp option foo bar;fail@@ -38,6 +39,7 @@ tcp option eol left 1;fail tcp option eol left 1;fail tcp option sack window;fail tcp option sack window 1;fail +tcp option 256 exists;fail tcp option window exists;ok tcp option window missing;oktests/py/any/tcpopt.t.payload +0
-4@@ -509,20 +509,6 @@ inet [ exthdr load tcpopt 4b @ 8 + 2 => reg 1 ] [ cmp eq reg 1 0x01000000 ] -# tcp option timestamp tsecr 1 -ip - [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ]
tests/py/any/tcpopt.t.payload inet · line 525
Quoted 10 lines
tests/py/any/tcpopt.t.payload +0
-10- [ exthdr load tcpopt 4b @ 8 + 6 => reg 1 ] - [ cmp eq reg 1 0x01000000 ] - -# tcp option timestamp tsecr 1 -ip6 - [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] - [ exthdr load tcpopt 4b @ 8 + 6 => reg 1 ] - [ cmp eq reg 1 0x01000000 ] -
You are removing unrelated duplicate payloads. Is it worth doing that separately?
Quoted 69 lines
tests/py/any/tcpopt.t.payload +4
-36# tcp option timestamp tsecr 1 inet [ meta load l4proto => reg 1 ]@@ -530,19 +516,12 @@ inet [ exthdr load tcpopt 4b @ 8 + 6 => reg 1 ] [ cmp eq reg 1 0x01000000 ] -# tcp option window exists -ip - [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] - [ exthdr load tcpopt 1b @ 3 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000001 ] - -# tcp option window exists -ip6 +# tcp option 255 missing +inet [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] - [ exthdr load tcpopt 1b @ 3 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ exthdr load tcpopt 1b @ 255 + 0 present => reg 1 ] + [ cmp eq reg 1 0x00000000 ] # tcp option window exists inet@@ -551,20 +530,6 @@ inet [ exthdr load tcpopt 1b @ 3 + 0 present => reg 1 ] [ cmp eq reg 1 0x00000001 ] -# tcp option window missing -ip - [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] - [ exthdr load tcpopt 1b @ 3 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000000 ] - -# tcp option window missing -ip6 - [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] - [ exthdr load tcpopt 1b @ 3 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000000 ] - # tcp option window missing inet [ meta load l4proto => reg 1 ]@@ -572,16 +537,6 @@ inet [ exthdr load tcpopt 1b @ 3 + 0 present => reg 1 ] [ cmp eq reg 1 0x00000000 ] -# tcp option maxseg size set 1360 -ip - [ immediate reg 1 0x00005005 ] - [ exthdr write tcpopt reg 1 => 2b @ 2 + 2 ] - -# tcp option maxseg size set 1360 -ip6 - [ immediate reg 1 0x00005005 ] - [ exthdr write tcpopt reg 1 => 2b @ 2 + 2 ] - # tcp option maxseg size set 1360 inet [ immediate reg 1 0x00005005 ] --2.26.2
Re: [PATCH nft 5/7] tcpopt: allow to check for presence of any tcp option
Quoted 250 lines · Jeremy Sowden
Quoted 249 lines · Florian Westphal
nft currently doesn't allow to check for presence of arbitrary tcp options. Only known options where nft provides a template can be tested for.
This allows to test for presence of raw protocol values as well.
Example:
tcp option 42 exists
Signed-off-by Florian Westphal <[email protected]>--- include/expression.h | 3 +- src/exthdr.c | 12 ++++++++ src/ipopt.c | 1 + src/netlink_linearize.c | 2 +- src/parser_bison.y | 7 +++++ src/tcpopt.c | 42 +++++++++++++++++++++++---- tests/py/any/tcpopt.t | 2 ++ tests/py/any/tcpopt.t.payload | 53 +++-------------------------------- 8 files changed, 65 insertions(+), 57 deletions(-)include/expression.h +2
-1@@ -311,7 +311,8 @@ struct expr {/* EXPR_EXTHDR */ const struct exthdr_desc *desc;const struct proto_hdr_template *tmpl; -unsigned int offset; +uint16_t offset; +uint8_t raw_type;enum nft_exthdr_op op;unsigned int flags; } exthdr;src/exthdr.c +12
-0@@ -52,6 +52,13 @@ static void exthdr_expr_print(const struct expr *expr, struct output_ctx *octx)*/ unsigned int offset = expr->exthdr.offset /64 ; +if (expr->exthdr.desc ==NULL && + expr->exthdr.offset ==0 && + expr->exthdr.flags &NFT_EXTHDR_F_PRESENT ) { +nft_print (octx,"tcp option %d" , expr->exthdr.raw_type); +return ; + } +nft_print (octx,"tcp option %s" , expr->exthdr.desc->name);if (expr->exthdr.flags &NFT_EXTHDR_F_PRESENT )return ;@@ -79,6 +86,7 @@ static bool exthdr_expr_cmp(const struct expr *e1, const struct expr *e2)return e1->exthdr.desc == e2->exthdr.desc && e1->exthdr.tmpl == e2->exthdr.tmpl && e1->exthdr.op == e2->exthdr.op && + e1->exthdr.raw_type == e2->exthdr.raw_type && e1->exthdr.flags == e2->exthdr.flags; }@@ -89,6 +97,7 @@ static void exthdr_expr_clone(struct expr *new, const struct expr *expr) new->exthdr.offset = expr->exthdr.offset; new->exthdr.op = expr->exthdr.op; new->exthdr.flags = expr->exthdr.flags; + new->exthdr.raw_type = expr->exthdr.raw_type; }#define NFTNL_UDATA_EXTHDR_DESC 0@@ -192,6 +201,7 @@ struct expr *exthdr_expr_alloc(const struct location *loc, expr =expr_alloc (loc,EXPR_EXTHDR , tmpl->dtype,BYTEORDER_BIG_ENDIAN , tmpl->len); expr->exthdr.desc = desc; + expr->exthdr.raw_type = desc ? desc->type :0 ; expr->exthdr.tmpl = tmpl; expr->exthdr.offset = tmpl->offset;return expr;@@ -270,6 +280,8 @@ void exthdr_init_raw(struct expr *expr, uint8_t type,unsigned int i;assert (expr->etype ==EXPR_EXTHDR ); + expr->exthdr.raw_type = type; +if (op ==NFT_EXTHDR_OP_TCPOPT )return tcpopt_init_raw (expr, type, offset, len, flags);if (op ==NFT_EXTHDR_OP_IPV4 )src/ipopt.c +1
-0@@ -103,6 +103,7 @@ struct expr *ipopt_expr_alloc(const struct location *loc, uint8_t type, expr->exthdr.tmpl = tmpl; expr->exthdr.op =NFT_EXTHDR_OP_IPV4 ; expr->exthdr.offset = tmpl->offset +calc_offset (desc, tmpl, ptr); + expr->exthdr.raw_type = desc->type;return expr; }src/netlink_linearize.c +1
-1@@ -206,7 +206,7 @@ static void netlink_gen_exthdr(struct netlink_linearize_ctx *ctx, nle =alloc_nft_expr ("exthdr" );netlink_put_register (nle,NFTNL_EXPR_EXTHDR_DREG , dreg);nftnl_expr_set_u8 (nle,NFTNL_EXPR_EXTHDR_TYPE , - expr->exthdr.desc->type); + expr->exthdr.raw_type);nftnl_expr_set_u32 (nle,NFTNL_EXPR_EXTHDR_OFFSET , offset /BITS_PER_BYTE );nftnl_expr_set_u32 (nle,NFTNL_EXPR_EXTHDR_LEN ,div_round_up (expr->len,BITS_PER_BYTE ));src/parser_bison.y +7
-0@@ -5225,6 +5225,13 @@ tcp_hdr_option_type : EOL { $$ = TCPOPT_KIND_EOL; } | SACK3 { $$ = TCPOPT_KIND_SACK3; } | ECHO { $$ = TCPOPT_KIND_ECHO; } | TIMESTAMP { $$ = TCPOPT_KIND_TIMESTAMP; } + | NUM { + if ($1 > 255) { + erec_queue(error(&@1, "value too large"), state->msgs); + YYERROR; + } + $$ = $1; + } ; tcp_hdr_option_field : KIND { $$ = TCPOPT_COMMON_KIND; }src/tcpopt.c +36
-6@@ -103,6 +103,19 @@ const struct exthdr_desc *tcpopt_protocols[] = { [TCPOPT_KIND_TIMESTAMP] = &tcpopt_timestamp, }; +/** +* tcpopt_expr_alloc - allocate tcp option extension expression +* +* @loc: location from parser +* @kind: raw tcp option value to find in packet +* @field: highlevel field to find in the option if @kind is present in packet +* +* Allocate a new tcp option expression. +* @kind is the raw option value to find in the packet. +* Exception: SACK may use extra OOB data that is mangled here. +* +* @field is the optional field to extract from the @type option. +*/ struct expr *tcpopt_expr_alloc (const struct location *loc,unsigned int kind,unsigned int field)@@ -138,8 +151,22 @@ struct expr *tcpopt_expr_alloc(const struct location *loc,if (kind <array_size (tcpopt_protocols)) desc = tcpopt_protocols[kind]; -if (!desc) -return NULL ; +if (!desc) { +if (field !=TCPOPT_COMMON_KIND || kind >255 ) +return NULL ; + + expr =expr_alloc (loc,EXPR_EXTHDR , &integer_type, +BYTEORDER_BIG_ENDIAN ,8 ); + + desc = tcpopt_protocols[TCPOPT_NOP ]; + tmpl = &desc->templates[field]; + expr->exthdr.desc = desc; + expr->exthdr.tmpl = tmpl; + expr->exthdr.op =NFT_EXTHDR_OP_TCPOPT ; + expr->exthdr.raw_type = kind; +return expr; + } + tmpl = &desc->templates[field];if (!tmpl)return NULL ;@@ -149,6 +176,7 @@ struct expr *tcpopt_expr_alloc(const struct location *loc, expr->exthdr.desc = desc; expr->exthdr.tmpl = tmpl; expr->exthdr.op =NFT_EXTHDR_OP_TCPOPT ; + expr->exthdr.raw_type = desc->type; expr->exthdr.offset = tmpl->offset;return expr;@@ -165,6 +193,10 @@ void tcpopt_init_raw(struct expr *expr, uint8_t type, unsigned int off, expr->len = len; expr->exthdr.flags = flags; expr->exthdr.offset = off; + expr->exthdr.op =NFT_EXTHDR_OP_TCPOPT ; + +if (flags &NFT_EXTHDR_F_PRESENT ) +datatype_set (expr, &boolean_type);if (type >=array_size (tcpopt_protocols))return ;@@ -178,12 +210,10 @@ void tcpopt_init_raw(struct expr *expr, uint8_t type, unsigned int off,if (tmpl->offset != off || tmpl->len != len)continue ; -if (flags &NFT_EXTHDR_F_PRESENT ) -datatype_set (expr, &boolean_type); -else +if ((flags &NFT_EXTHDR_F_PRESENT ) ==0 )datatype_set (expr, tmpl->dtype); + expr->exthdr.tmpl = tmpl; - expr->exthdr.op =NFT_EXTHDR_OP_TCPOPT ;break ; } }tests/py/any/tcpopt.t +2
-0@@ -30,6 +30,7 @@ tcp option timestamp kind 1;ok tcp option timestamp length 1;ok tcp option timestamp tsval 1;ok tcp option timestamp tsecr 1;ok +tcp option 255 missing;ok tcp option foobar;fail tcp option foo bar;fail@@ -38,6 +39,7 @@ tcp option eol left 1;fail tcp option eol left 1;fail tcp option sack window;fail tcp option sack window 1;fail +tcp option 256 exists;fail tcp option window exists;ok tcp option window missing;oktests/py/any/tcpopt.t.payload +0
-9@@ -509,20 +509,6 @@ inet [ exthdr load tcpopt 4b @ 8 + 2 => reg 1 ] [ cmp eq reg 1 0x01000000 ] -# tcp option timestamp tsecr 1 -ip - [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] - [ exthdr load tcpopt 4b @ 8 + 6 => reg 1 ] - [ cmp eq reg 1 0x01000000 ] - -# tcp option timestamp tsecr 1 -ip6
Quoted 8 lines
tests/py/any/tcpopt.t.payload inet · line 518
Quoted 5 lines
tests/py/any/tcpopt.t.payload +0
-5- [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] - [ exthdr load tcpopt 4b @ 8 + 6 => reg 1 ] - [ cmp eq reg 1 0x01000000 ] -You are removing unrelated duplicate payloads. Is it worth doing that separately?
This seems to dedup' the payloads correctly:
perl -nle '
our @payload;
our $rule;
if (/^# (.+)/) {
if ($rule ne $1) {
print for @payload;
$rule = $1
}
@payload = ()
}
push @payload, $_;
END { print for @payload }
' tests/py/any/tcpopt.t.payload > tests/py/any/tcpopt.t.payload.tmp
mv tests/py/any/tcpopt.t.payload.tmp tests/py/any/tcpopt.t.payloadOne could use perl's -i switch, but the printing of the final payload will be to stdout and not in-place.
Quoted 69 lines
Quoted 69 lines
tests/py/any/tcpopt.t.payload +4
-36# tcp option timestamp tsecr 1 inet [ meta load l4proto => reg 1 ]@@ -530,19 +516,12 @@ inet [ exthdr load tcpopt 4b @ 8 + 6 => reg 1 ] [ cmp eq reg 1 0x01000000 ] -# tcp option window exists -ip - [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] - [ exthdr load tcpopt 1b @ 3 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000001 ] - -# tcp option window exists -ip6 +# tcp option 255 missing +inet [ meta load l4proto => reg 1 ] [ cmp eq reg 1 0x00000006 ] - [ exthdr load tcpopt 1b @ 3 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ exthdr load tcpopt 1b @ 255 + 0 present => reg 1 ] + [ cmp eq reg 1 0x00000000 ] # tcp option window exists inet@@ -551,20 +530,6 @@ inet [ exthdr load tcpopt 1b @ 3 + 0 present => reg 1 ] [ cmp eq reg 1 0x00000001 ] -# tcp option window missing -ip - [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] - [ exthdr load tcpopt 1b @ 3 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000000 ] - -# tcp option window missing -ip6 - [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] - [ exthdr load tcpopt 1b @ 3 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000000 ] - # tcp option window missing inet [ meta load l4proto => reg 1 ]@@ -572,16 +537,6 @@ inet [ exthdr load tcpopt 1b @ 3 + 0 present => reg 1 ] [ cmp eq reg 1 0x00000000 ] -# tcp option maxseg size set 1360 -ip - [ immediate reg 1 0x00005005 ] - [ exthdr write tcpopt reg 1 => 2b @ 2 + 2 ] - -# tcp option maxseg size set 1360 -ip6 - [ immediate reg 1 0x00005005 ] - [ exthdr write tcpopt reg 1 => 2b @ 2 + 2 ] - # tcp option maxseg size set 1360 inet [ immediate reg 1 0x00005005 ] --2.26.2
Florian Westphal
maintainerRe: [PATCH nft 5/7] tcpopt: allow to check for presence of any tcp option
Quoted 17 lines · Jeremy Sowden
This seems to dedup' the payloads correctly:
perl -nle ' our @payload; our $rule; if (/^# (.+)/) { if ($rule ne $1) { print for @payload; $rule = $1 } @payload = () } push @payload, $_; END { print for @payload } ' tests/py/any/tcpopt.t.payload > tests/py/any/tcpopt.t.payload.tmp mv tests/py/any/tcpopt.t.payload.tmp tests/py/any/tcpopt.t.payload
Quoted 2 lines
One could use perl's -i switch, but the printing of the final payload will be to stdout and not in-place.
Feel free to send a patch that weeds out all duplicates.
Re: [PATCH nft 5/7] tcpopt: allow to check for presence of any tcp option
Quoted 18 lines · Florian Westphal
Quoted 17 lines · Jeremy Sowden
This seems to dedup' the payloads correctly:
perl -nle ' our @payload; our $rule; if (/^# (.+)/) { if ($rule ne $1) { print for @payload; $rule = $1 } @payload = () } push @payload, $_; END { print for @payload } ' tests/py/any/tcpopt.t.payload > tests/py/any/tcpopt.t.payload.tmp mv tests/py/any/tcpopt.t.payload.tmp tests/py/any/tcpopt.t.payload
Quoted 4 lines
Quoted 2 lines
One could use perl's -i switch, but the printing of the final payload will be to stdout and not in-place.
Feel free to send a patch that weeds out all duplicates.
Yup, will do.
J.
Florian Westphal
maintainerPATCH 6/7 tcp: add raw tcp option match support
In reply to Florian Westphaltcp option @42,16,4 (@kind,offset,length).
--- doc/payload-expression.txt | 6 ++++++ src/exthdr.c | 13 +++++++++---- src/parser_bison.y | 5 +++++ src/tcpopt.c | 2 ++ tests/py/any/tcpopt.t | 2 ++ tests/py/any/tcpopt.t.payload | 7 +++++++ 6 files changed, 31 insertions(+), 4 deletions(-)
doc/payload-expression.txt +6 -0
@@ -591,6 +591,12 @@ TCP Timestamps | kind, length, tsval, tsecr |============================ +TCP option matching also supports raw expression syntax to access arbitrary options: +[verse] +*tcp option* +[verse] +*tcp option* *@*'number'*,*'offset'*,*'length' + .IP Options [options="header"] |==================
src/exthdr.c +9 -4
@@ -52,10 +52,15 @@ static void exthdr_expr_print(const struct expr *expr, struct output_ctx *octx)*/ unsigned int offset = expr->exthdr.offset /64 ; -if (expr->exthdr.desc ==NULL && - expr->exthdr.offset ==0 && - expr->exthdr.flags &NFT_EXTHDR_F_PRESENT ) { -nft_print (octx,"tcp option %d" , expr->exthdr.raw_type); +if (expr->exthdr.desc ==NULL ) { +if (expr->exthdr.offset ==0 && + expr->exthdr.flags &NFT_EXTHDR_F_PRESENT ) { +nft_print (octx,"tcp option %d" , expr->exthdr.raw_type); +return ; + } + +nft_print (octx,"tcp option @%u,%u,%u" , expr->exthdr.raw_type, + expr->exthdr.offset, expr->len);return ; }
src/parser_bison.y +5 -0
@@ -5198,6 +5198,11 @@ tcp_hdr_expr : TCP tcp_hdr_field $$ = tcpopt_expr_alloc(&@$, $3, TCPOPT_COMMON_KIND); $$->exthdr.flags = NFT_EXTHDR_F_PRESENT; } + | TCP OPTION AT tcp_hdr_option_type COMMA NUM COMMA NUM + { + $$ = tcpopt_expr_alloc(&@$, $4, 0); + tcpopt_init_raw($$, $4, $6, $8, 0); + } ; tcp_hdr_field : SPORT { $$ = TCPHDR_SPORT; }
src/tcpopt.c +2 -0
@@ -197,6 +197,8 @@ void tcpopt_init_raw(struct expr *expr, uint8_t type, unsigned int off,if (flags &NFT_EXTHDR_F_PRESENT )datatype_set (expr, &boolean_type); +else +datatype_set (expr, &integer_type);if (type >=array_size (tcpopt_protocols))return ;
tests/py/any/tcpopt.t +2 -0
@@ -31,6 +31,7 @@ tcp option timestamp length 1;ok tcp option timestamp tsval 1;ok tcp option timestamp tsecr 1;ok tcp option 255 missing;ok +tcp option @255,8,8 255;ok tcp option foobar;fail tcp option foo bar;fail
@@ -40,6 +41,7 @@ tcp option eol left 1;fail tcp option sack window;fail tcp option sack window 1;fail tcp option 256 exists;fail +tcp option @255,8,8 256;fail tcp option window exists;ok tcp option window missing;ok
tests/py/any/tcpopt.t.payload +7 -0
@@ -523,6 +523,13 @@ inet [ exthdr load tcpopt 1b @ 255 + 0 present => reg 1 ] [ cmp eq reg 1 0x00000000 ] +# tcp option @255,8,8 255 +inet + [ meta load l4proto => reg 1 ] + [ cmp eq reg 1 0x00000006 ] + [ exthdr load tcpopt 1b @ 255 + 1 => reg 1 ] + [ cmp eq reg 1 0x000000ff ] + # tcp option window exists inet [ meta load l4proto => reg 1 ]
Signature · 1 line
2.26.2
Florian Westphal
maintainerPATCH 7/7 json: tcp: add raw tcp option match support
In reply to Florian WestphalTo similar change as in previous one, this time for the jason (de)serialization.
Re-uses the raw payload match syntax, i.e. base,offset,length.
--- src/json.c | 22 ++++++++-------- src/parser_json.c | 52 ++++++++++++++++++++++++++------------ tests/py/any/tcpopt.t.json | 34 +++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 26 deletions(-)
src/json.c +12 -10
@@ -665,30 +665,32 @@ json_t *map_expr_json(const struct expr *expr, struct output_ctx *octx)json_t *exthdr_expr_json (const struct expr *expr,struct output_ctx *octx) {const char *desc = expr->exthdr.desc ? - expr->exthdr.desc->name : -"unknown-exthdr" ; + expr->exthdr.desc->name :NULL ;const char *field = expr->exthdr.tmpl->token;json_t *root;bool is_exists = expr->exthdr.flags &NFT_EXTHDR_F_PRESENT ;if (expr->exthdr.op ==NFT_EXTHDR_OP_TCPOPT ) { +static const char *offstrs[] = {"" ,"1" ,"2" ,"3" };unsigned int offset = expr->exthdr.offset /64 ; +const char *offstr ="" ; -if (offset) { -const char *offstrs[] = {"0" ,"1" ,"2" ,"3" }; -const char *offstr ="" ; - +if (desc) {if (offset <4 ) offstr = offstrs[offset]; root =json_pack ("{s:s+}" ,"name" , desc, offstr); + +if (!is_exists) +json_object_set_new (root,"field" ,json_string (field)); }else { - root =json_pack ("{s:s}" ,"name" , desc); + root =json_pack ("{s:i, s:i, s:i}" , +"base" , expr->exthdr.raw_type, +"offset" , expr->exthdr.offset, +"len" , expr->len); + is_exists = false; } -if (!is_exists) -json_object_set_new (root,"field" ,json_string (field)); -return json_pack ("{s:o}" ,"tcp option" , root); }if (expr->exthdr.op ==NFT_EXTHDR_OP_IPV4 ) {
src/parser_json.c +36 -16
72 lines not on this page · raw message
tests/py/any/tcpopt.t.json +34 -0
@@ -414,6 +414,40 @@ } ] +# tcp option 255 missing +[ + { + "match": { + "left": { + "tcp option": { + "base": 255, + "len": 8, + "offset": 0 + } + }, + "op": "==", + "right": false + } + } +] + +# tcp option @255,8,8 255 +[ + { + "match": { + "left": { + "tcp option": { + "base": 255, + "len": 8, + "offset": 8 + } + }, + "op": "==", + "right": 255 + } + } +] + # tcp option window exists [ {
Signature · 1 line
2.26.2