netlink: remove unused parameter from netlink_gen_stmt_stateful()
Subsystems (3)
Pablo Neira Ayuso
maintainerPATCH 1/2 netlink: remove unused parameter from netlink_gen_stmt_stateful()
Remove context from netlink_gen_stmt_stateful().
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/netlink_linearize.c | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-)
src/netlink_linearize.c +13 -23
@@ -822,9 +822,7 @@ static void netlink_gen_objref_stmt(struct netlink_linearize_ctx *ctx,nftnl_rule_add_expr (ctx->nlr, nle); } -static struct nftnl_expr * -netlink_gen_connlimit_stmt (struct netlink_linearize_ctx *ctx, -const struct stmt *stmt) +static struct nftnl_expr *netlink_gen_connlimit_stmt (const struct stmt *stmt) {struct nftnl_expr *nle;
@@ -837,9 +835,7 @@ netlink_gen_connlimit_stmt(struct netlink_linearize_ctx *ctx,return nle; } -static struct nftnl_expr * -netlink_gen_counter_stmt (struct netlink_linearize_ctx *ctx, -const struct stmt *stmt) +static struct nftnl_expr *netlink_gen_counter_stmt (const struct stmt *stmt) {struct nftnl_expr *nle;
@@ -856,9 +852,7 @@ netlink_gen_counter_stmt(struct netlink_linearize_ctx *ctx,return nle; } -static struct nftnl_expr * -netlink_gen_limit_stmt (struct netlink_linearize_ctx *ctx, -const struct stmt *stmt) +static struct nftnl_expr *netlink_gen_limit_stmt (const struct stmt *stmt) {struct nftnl_expr *nle;
@@ -874,9 +868,7 @@ netlink_gen_limit_stmt(struct netlink_linearize_ctx *ctx,return nle; } -static struct nftnl_expr * -netlink_gen_quota_stmt (struct netlink_linearize_ctx *ctx, -const struct stmt *stmt) +static struct nftnl_expr *netlink_gen_quota_stmt (const struct stmt *stmt) {struct nftnl_expr *nle;
@@ -888,19 +880,17 @@ netlink_gen_quota_stmt(struct netlink_linearize_ctx *ctx,return nle; } -static struct nftnl_expr * -netlink_gen_stmt_stateful (struct netlink_linearize_ctx *ctx, -const struct stmt *stmt) +static struct nftnl_expr *netlink_gen_stmt_stateful (const struct stmt *stmt) {switch (stmt->ops->type) {case STMT_CONNLIMIT : -return netlink_gen_connlimit_stmt (ctx, stmt); +return netlink_gen_connlimit_stmt (stmt);case STMT_COUNTER : -return netlink_gen_counter_stmt (ctx, stmt); +return netlink_gen_counter_stmt (stmt);case STMT_LIMIT : -return netlink_gen_limit_stmt (ctx, stmt); +return netlink_gen_limit_stmt (stmt);case STMT_QUOTA : -return netlink_gen_quota_stmt (ctx, stmt); +return netlink_gen_quota_stmt (stmt);default :BUG ("unknown stateful statement type %s\n" , stmt->ops->name); }
@@ -1378,7 +1368,7 @@ static void netlink_gen_set_stmt(struct netlink_linearize_ctx *ctx,if (stmt->set.stmt)nftnl_expr_set (nle,NFTNL_EXPR_DYNSET_EXPR , -netlink_gen_stmt_stateful (ctx, stmt->set.stmt),0 ); +netlink_gen_stmt_stateful (stmt->set.stmt),0 ); } static void netlink_gen_map_stmt(struct netlink_linearize_ctx *ctx,
@@ -1408,7 +1398,7 @@ static void netlink_gen_map_stmt(struct netlink_linearize_ctx *ctx,if (stmt->map.stmt)nftnl_expr_set (nle,NFTNL_EXPR_DYNSET_EXPR , -netlink_gen_stmt_stateful (ctx, stmt->map.stmt),0 ); +netlink_gen_stmt_stateful (stmt->map.stmt),0 );nftnl_rule_add_expr (ctx->nlr, nle); }
@@ -1440,7 +1430,7 @@ static void netlink_gen_meter_stmt(struct netlink_linearize_ctx *ctx,nftnl_expr_set_str (nle,NFTNL_EXPR_DYNSET_SET_NAME , set->handle.set.name);nftnl_expr_set_u32 (nle,NFTNL_EXPR_DYNSET_SET_ID , set->handle.set_id);nftnl_expr_set (nle,NFTNL_EXPR_DYNSET_EXPR , -netlink_gen_stmt_stateful (ctx, stmt->meter.stmt),0 ); +netlink_gen_stmt_stateful (stmt->meter.stmt),0 );nftnl_rule_add_expr (ctx->nlr, nle); }
@@ -1486,7 +1476,7 @@ static void netlink_gen_stmt(struct netlink_linearize_ctx *ctx,case STMT_COUNTER :case STMT_LIMIT :case STMT_QUOTA : - nle =netlink_gen_stmt_stateful (ctx, stmt); + nle =netlink_gen_stmt_stateful (stmt);nftnl_rule_add_expr (ctx->nlr, nle);break ;case STMT_NOTRACK :
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 2/2 src: support for restoring element counters
This patch allows you to restore counters in dynamic sets:
table ip test {
set test {
type ipv4_addr
size 65535
flags dynamic,timeout
timeout 30d
gc-interval 1d
elements = { 192.168.10.13 expires 19d23h52m27s576ms counter packets 51 bytes 17265 }
}
chain output {
type filter hook output priority 0;
update @test { ip saddr }
}}
You can also add counters to elements from the control place, ie.
table ip test {
set test {
type ipv4_addr
size 65535
elements = { 192.168.2.1 counter packets 75 bytes 19043 }
}
chain output {
type filter hook output priority filter; policy accept;
ip daddr @test
}}
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- include/netlink.h | 1 + src/netlink.c | 3 +++ src/netlink_linearize.c | 2 +- src/parser_bison.y | 36 +++++++++++++++++++++++++++++++++++- 4 files changed, 40 insertions(+), 2 deletions(-)
include/netlink.h +1 -0
@@ -113,6 +113,7 @@ extern void netlink_gen_data(const struct expr *expr,extern void netlink_gen_raw_data (const mpz_t value,enum byteorder byteorder,unsigned int len,struct nft_data_linearize *data); +extern struct nftnl_expr *netlink_gen_stmt_stateful (const struct stmt *stmt);extern struct expr *netlink_alloc_value (const struct location *loc,const struct nft_data_delinearize *nld);
src/netlink.c +3 -0
@@ -138,6 +138,9 @@ static struct nftnl_set_elem *alloc_nftnl_setelem(const struct expr *set,if (elem->expiration)nftnl_set_elem_set_u64 (nlse,NFTNL_SET_ELEM_EXPIRATION , elem->expiration); +if (elem->stmt) +nftnl_set_elem_set (nlse,NFTNL_SET_ELEM_EXPR , +netlink_gen_stmt_stateful (elem->stmt),0 );if (elem->comment || expr->elem_flags) { udbuf =nftnl_udata_buf_alloc (NFT_USERDATA_MAXLEN );if (!udbuf)
src/netlink_linearize.c +1 -1
@@ -880,7 +880,7 @@ static struct nftnl_expr *netlink_gen_quota_stmt(const struct stmt *stmt)return nle; } -static struct nftnl_expr *netlink_gen_stmt_stateful (const struct stmt *stmt) +struct nftnl_expr *netlink_gen_stmt_stateful (const struct stmt *stmt) {switch (stmt->ops->type) {case STMT_CONNLIMIT :
src/parser_bison.y +35 -1
@@ -3671,7 +3671,7 @@ meter_key_expr_alloc : concat_expr ; set_elem_expr : set_elem_expr_alloc - | set_elem_expr_alloc set_elem_options + | set_elem_expr_alloc set_elem_expr_options ; set_elem_expr_alloc : set_lhs_expr
@@ -3701,6 +3701,40 @@ set_elem_option : TIMEOUT time_spec } ; +set_elem_expr_options : set_elem_expr_option + { + $<expr>$ = $<expr>0; + } + | set_elem_expr_options set_elem_expr_option + ; + +set_elem_expr_option : TIMEOUT time_spec + { + $<expr>0->timeout = $2; + } + | EXPIRES time_spec + { + $<expr>0->expiration = $2; + } + | COUNTER + { + $<expr>0->stmt = counter_stmt_alloc(&@$); + } + | COUNTER PACKETS NUM BYTES NUM + { + struct stmt *stmt; + + stmt = counter_stmt_alloc(&@$); + stmt->counter.packets = $3; + stmt->counter.bytes = $5; + $<expr>0->stmt = stmt; + } + | comment_spec + { + $<expr>0->comment = $1; + } + ; + set_lhs_expr : concat_rhs_expr | wildcard_expr ;
Signature · 1 line
2.11.0