tests: py: idempotent tcp flags & syn != 0 to tcp flag syn
Pablo Neira Ayuso
maintainerPATCH 1/2 tests: py: idempotent tcp flags & syn != 0 to tcp flag syn
Add a test to cover this case.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- tests/py/inet/tcp.t | 1 + tests/py/inet/tcp.t.json | 16 ++++++++++++++++ tests/py/inet/tcp.t.payload | 8 ++++++++ 3 files changed, 25 insertions(+)
tests/py/inet/tcp.t +1 -0
@@ -69,6 +69,7 @@ tcp flags != cwr;ok tcp flags == syn;ok tcp flags fin,syn / fin,syn;ok tcp flags != syn / fin,syn;ok +tcp flags & syn != 0;ok;tcp flags syn tcp flags & (fin | syn | rst | ack) syn;ok;tcp flags syn / fin,syn,rst,ack tcp flags & (fin | syn | rst | ack) != syn;ok;tcp flags != syn / fin,syn,rst,ack tcp flags & (fin | syn | rst | psh | ack | urg | ecn | cwr) == fin | syn | rst | psh | ack | urg | ecn | cwr;ok;tcp flags == 0xff
tests/py/inet/tcp.t.json +16 -0
@@ -1521,6 +1521,22 @@ } ] +# tcp flags & syn != 0 +[ + { + "match": { + "left": { + "payload": { + "field": "flags", + "protocol": "tcp" + } + }, + "op": "in", + "right": "syn" + } + } +] + # tcp flags & (fin | syn | rst | ack) syn [ {
tests/py/inet/tcp.t.payload +8 -0
@@ -370,6 +370,14 @@ inet test-inet input [ bitwise reg 1 = ( reg 1 & 0x00000003 ) ^ 0x00000000 ] [ cmp neq reg 1 0x00000002 ] +# tcp flags & syn != 0 +inet test-inet input + [ meta load l4proto => reg 1 ] + [ cmp eq reg 1 0x00000006 ] + [ payload load 1b @ transport header + 13 => reg 1 ] + [ bitwise reg 1 = ( reg 1 & 0x00000002 ) ^ 0x00000000 ] + [ cmp neq reg 1 0x00000000 ] + # tcp flags & (fin | syn | rst | ack) syn inet test-inet input [ meta load l4proto => reg 1 ]
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH 2/2 netlink_delinearize: skip flags / mask notation for singleton bitmask
Instead of 'syn / syn', just print the most simple form 'syn'.
Fixes c3d57114f119 ("parser_bison: add shortcut syntax for matching flags without binary operations")
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/netlink_delinearize.c | 9 ++++++--- tests/py/inet/tcp.t | 1 + tests/py/inet/tcp.t.payload | 8 ++++++++ 3 files changed, 15 insertions(+), 3 deletions(-)
src/netlink_delinearize.c +6 -3
@@ -2258,13 +2258,16 @@ static void relational_binop_postprocess(struct rule_pp_ctx *ctx, struct expr **exprp) {struct expr *expr = *exprp, *binop = expr->left, *value = expr->right; +struct expr *list;if (binop->op ==OP_AND && (expr->op ==OP_NEQ || expr->op ==OP_EQ ) && value->dtype->basetype && value->dtype->basetype->type ==TYPE_BITMASK ) { + list =binop_tree_to_list (NULL , binop->right); +switch (value->etype) {case EXPR_VALUE : -if (!mpz_cmp_ui (value->value,0 )) { +if (!mpz_cmp_ui (value->value,0 ) && list->size <=1 ) {/* Flag comparison: data & flags != 0 * * Split the flags into a list of flag values and convert the
@@ -2273,7 +2276,7 @@ static void relational_binop_postprocess(struct rule_pp_ctx *ctx,expr_free (value); expr->left =expr_get (binop->left); - expr->right =binop_tree_to_list (NULL , binop->right); + expr->right = list;switch (expr->op) {case OP_NEQ : expr->op =OP_IMPLICIT ;
@@ -2288,7 +2291,7 @@ static void relational_binop_postprocess(struct rule_pp_ctx *ctx, }else { *exprp =flagcmp_expr_alloc (&expr->location, expr->op,expr_get (binop->left), -binop_tree_to_list (NULL , binop->right), + list,expr_get (value));expr_free (expr); }
tests/py/inet/tcp.t +1 -0
@@ -70,6 +70,7 @@ tcp flags == syn;ok tcp flags fin,syn / fin,syn;ok tcp flags != syn / fin,syn;ok tcp flags & syn != 0;ok;tcp flags syn +tcp flags & syn == syn;ok;tcp flags syn tcp flags & (fin | syn | rst | ack) syn;ok;tcp flags syn / fin,syn,rst,ack tcp flags & (fin | syn | rst | ack) != syn;ok;tcp flags != syn / fin,syn,rst,ack tcp flags & (fin | syn | rst | psh | ack | urg | ecn | cwr) == fin | syn | rst | psh | ack | urg | ecn | cwr;ok;tcp flags == 0xff
tests/py/inet/tcp.t.payload +8 -0
@@ -378,6 +378,14 @@ inet test-inet input [ bitwise reg 1 = ( reg 1 & 0x00000002 ) ^ 0x00000000 ] [ cmp neq reg 1 0x00000000 ] +# tcp flags & syn == syn +inet test-inet input + [ meta load l4proto => reg 1 ] + [ cmp eq reg 1 0x00000006 ] + [ payload load 1b @ transport header + 13 => reg 1 ] + [ bitwise reg 1 = ( reg 1 & 0x00000002 ) ^ 0x00000000 ] + [ cmp eq reg 1 0x00000002 ] + # tcp flags & (fin | syn | rst | ack) syn inet test-inet input [ meta load l4proto => reg 1 ]
Signature · 1 line
2.20.1