src: add per-bytes limit
Pablo Neira Ayuso
maintainerPATCH 1/3 src: add per-bytes limit
This example show how to accept packets below the ratelimit:
... limit rate 1024 mbytes/second counter accept
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- include/datatype.h | 4 +++ include/linux/netfilter/nf_tables.h | 9 ++++++ include/statement.h | 1 + src/datatype.c | 55 +++++++++++++++++++++++++++++++++++ src/netlink_delinearize.c | 1 + src/netlink_linearize.c | 1 + src/parser_bison.y | 17 +++++++++++ src/statement.c | 43 +++++++++++++++++++++++++-- 8 files changed, 129 insertions(+), 2 deletions(-)
include/datatype.h +4 -0
@@ -235,4 +235,8 @@ extern void time_print(uint64_t seconds);extern struct error_record *time_parse (const struct location *loc,const char *c,uint64_t *res); +extern struct error_record *rate_parse (const struct location *loc, +const char *str,uint64_t *rate, +uint64_t *unit); +#endif /* NFTABLES_DATATYPE_H */
include/linux/netfilter/nf_tables.h +9 -0
@@ -747,16 +747,25 @@ enum nft_ct_attributes { };#define NFTA_CT_MAX (__NFTA_CT_MAX - 1) +enum nft_limit_type { +NFT_LIMIT_PKTS , +NFT_LIMIT_PKT_BYTES +}; +/** * enum nft_limit_attributes - nf_tables limit expression netlink attributes * * @NFTA_LIMIT_RATE: refill rate (NLA_U64) * @NFTA_LIMIT_UNIT: refill unit (NLA_U64) +* @NFTA_LIMIT_BURST: burst (NLA_U32) +* @NFTA_LIMIT_TYPE: type of limit (NLA_U32: enum nft_limit_type) */ enum nft_limit_attributes {NFTA_LIMIT_UNSPEC ,NFTA_LIMIT_RATE ,NFTA_LIMIT_UNIT , +NFTA_LIMIT_BURST , +NFTA_LIMIT_TYPE , __NFTA_LIMIT_MAX };#define NFTA_LIMIT_MAX (__NFTA_LIMIT_MAX - 1)
include/statement.h +1 -0
@@ -51,6 +51,7 @@ extern struct stmt *log_stmt_alloc(const struct location *loc);struct limit_stmt {uint64_t rate;uint64_t unit; +enum nft_limit_type type; };extern struct stmt *limit_stmt_alloc (const struct location *loc);
src/datatype.c +55 -0
58 lines not on this page · raw message
src/netlink_delinearize.c +1 -0
@@ -583,6 +583,7 @@ static void netlink_parse_limit(struct netlink_parse_ctx *ctx, stmt =limit_stmt_alloc (loc); stmt->limit.rate =nftnl_expr_get_u64 (nle,NFTNL_EXPR_LIMIT_RATE ); stmt->limit.unit =nftnl_expr_get_u64 (nle,NFTNL_EXPR_LIMIT_UNIT ); + stmt->limit.type =nftnl_expr_get_u32 (nle,NFTNL_EXPR_LIMIT_TYPE );list_add_tail (&stmt->list, &ctx->rule->stmts); }
src/netlink_linearize.c +1 -0
@@ -656,6 +656,7 @@ static void netlink_gen_limit_stmt(struct netlink_linearize_ctx *ctx, nle =alloc_nft_expr ("limit" );nftnl_expr_set_u64 (nle,NFTNL_EXPR_LIMIT_RATE , stmt->limit.rate);nftnl_expr_set_u64 (nle,NFTNL_EXPR_LIMIT_UNIT , stmt->limit.unit); +nftnl_expr_set_u32 (nle,NFTNL_EXPR_LIMIT_TYPE , stmt->limit.type);nftnl_rule_add_expr (ctx->nlr, nle); }
src/parser_bison.y +17 -0
@@ -1446,6 +1446,23 @@ limit_stmt : LIMIT RATE NUM SLASH time_unit $$ = limit_stmt_alloc(&@$); $$->limit.rate = $3; $$->limit.unit = $5; + $$->limit.type = NFT_LIMIT_PKTS; + } + | LIMIT RATE NUM STRING + { + struct error_record *erec; + uint64_t rate, unit; + + erec = rate_parse(&@$, $4, &rate, &unit); + if (erec != NULL) { + erec_queue(erec, state->msgs); + YYERROR; + } + + $$ = limit_stmt_alloc(&@$); + $$->limit.rate = rate * $3; + $$->limit.unit = unit; + $$->limit.type = NFT_LIMIT_PKT_BYTES; } ;
src/statement.c +41 -2
51 lines not on this page · raw message
Signature · 1 line
1.7.10.4
Pablo Neira Ayuso
maintainerPATCH 2/3 src: add burst parameter to limit
... limit rate 1024 mbytes/second burst 10240 bytes ... limit rate 1/second burst 3 packets
This parameter is optional.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- include/datatype.h | 3 +++ include/statement.h | 1 + src/datatype.c | 4 ++-- src/netlink_delinearize.c | 1 + src/netlink_linearize.c | 4 ++++ src/parser_bison.y | 26 +++++++++++++++++++++++--- src/scanner.l | 1 + src/statement.c | 8 ++++++++ 8 files changed, 43 insertions(+), 5 deletions(-)
include/datatype.h +3 -0
@@ -239,4 +239,7 @@ extern struct error_record *rate_parse(const struct location *loc, const char *str, uint64_t *rate, uint64_t *unit); +extern struct error_record *data_unit_parse (const struct location *loc, +const char *str,uint64_t *rate); +#endif /* NFTABLES_DATATYPE_H */
include/statement.h +1 -0
@@ -52,6 +52,7 @@ struct limit_stmt {uint64_t rate;uint64_t unit;enum nft_limit_type type; +uint32_t burst; };extern struct stmt *limit_stmt_alloc (const struct location *loc);
src/datatype.c +2 -2
@@ -996,8 +996,8 @@ static struct error_record *time_unit_parse(const struct location *loc,return NULL ; } -static struct error_record *data_unit_parse (const struct location *loc, -const char *str,uint64_t *rate) +struct error_record *data_unit_parse (const struct location *loc, +const char *str,uint64_t *rate) {if (strncmp (str,"bytes" ,strlen ("bytes" )) ==0 ) *rate =1ULL ;
src/netlink_delinearize.c +1 -0
@@ -584,6 +584,7 @@ static void netlink_parse_limit(struct netlink_parse_ctx *ctx, stmt->limit.rate =nftnl_expr_get_u64 (nle,NFTNL_EXPR_LIMIT_RATE ); stmt->limit.unit =nftnl_expr_get_u64 (nle,NFTNL_EXPR_LIMIT_UNIT ); stmt->limit.type =nftnl_expr_get_u32 (nle,NFTNL_EXPR_LIMIT_TYPE ); + stmt->limit.burst =nftnl_expr_get_u32 (nle,NFTNL_EXPR_LIMIT_BURST );list_add_tail (&stmt->list, &ctx->rule->stmts); }
src/netlink_linearize.c +4 -0
@@ -657,6 +657,10 @@ static void netlink_gen_limit_stmt(struct netlink_linearize_ctx *ctx,nftnl_expr_set_u64 (nle,NFTNL_EXPR_LIMIT_RATE , stmt->limit.rate);nftnl_expr_set_u64 (nle,NFTNL_EXPR_LIMIT_UNIT , stmt->limit.unit);nftnl_expr_set_u32 (nle,NFTNL_EXPR_LIMIT_TYPE , stmt->limit.type); +if (stmt->limit.burst >0 ) +nftnl_expr_set_u32 (nle,NFTNL_EXPR_LIMIT_BURST , + stmt->limit.burst); +nftnl_rule_add_expr (ctx->nlr, nle); }
src/parser_bison.y +23 -3
@@ -364,6 +364,7 @@ static void location_update(struct location *loc, struct location *rhs, int n) %token LIMIT "limit" %token RATE "rate" +%token BURST "burst" %token NANOSECOND "nanosecond" %token MICROSECOND "microsecond"
@@ -450,7 +451,7 @@ static void location_update(struct location *loc, struct location *rhs, int n) %type <val> level_type %type <stmt> limit_stmt %destructor { stmt_free($$); } limit_stmt -%type <val> time_unit +%type <val> limit_burst time_unit %type <stmt> reject_stmt reject_stmt_alloc %destructor { stmt_free($$); } reject_stmt reject_stmt_alloc %type <stmt> nat_stmt nat_stmt_alloc masq_stmt masq_stmt_alloc redir_stmt redir_stmt_alloc
@@ -1441,14 +1442,15 @@ level_type : LEVEL_EMERG { $$ = LOG_EMERG; } | LEVEL_DEBUG { $$ = LOG_DEBUG; } ; -limit_stmt : LIMIT RATE NUM SLASH time_unit +limit_stmt : LIMIT RATE NUM SLASH time_unit limit_burst { $$ = limit_stmt_alloc(&@$); $$->limit.rate = $3; $$->limit.unit = $5; + $$->limit.burst = $6; $$->limit.type = NFT_LIMIT_PKTS; } - | LIMIT RATE NUM STRING + | LIMIT RATE NUM STRING limit_burst { struct error_record *erec; uint64_t rate, unit;
@@ -1462,10 +1464,28 @@ limit_stmt : LIMIT RATE NUM SLASH time_unit $$ = limit_stmt_alloc(&@$); $$->limit.rate = rate * $3; $$->limit.unit = unit; + $$->limit.burst = $5; $$->limit.type = NFT_LIMIT_PKT_BYTES; } ; +limit_burst : /* empty */ { $$ = 0; } + | BURST NUM PACKETS { $$ = $2; } + | BURST NUM BYTES { $$ = $2; } + | BURST NUM STRING + { + struct error_record *erec; + uint64_t rate; + + erec = data_unit_parse(&@$, $3, &rate); + if (erec != NULL) { + erec_queue(erec, state->msgs); + YYERROR; + } + $$ = $2 * rate; + } + ; + time_unit : SECOND { $$ = 1ULL; } | MINUTE { $$ = 1ULL * 60; } | HOUR { $$ = 1ULL * 60 * 60; }
src/scanner.l +1 -0
@@ -309,6 +309,7 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "limit" { return LIMIT; } "rate" { return RATE; } +"burst" { return BURST; } "nanosecond" { return NANOSECOND; } "microsecond" { return MICROSECOND; }
src/statement.c +8 -0
@@ -220,12 +220,20 @@ static void limit_stmt_print(const struct stmt *stmt)case NFT_LIMIT_PKTS :printf ("limit rate %" PRIu64"/%s" , stmt->limit.rate,get_unit (stmt->limit.unit)); +if (stmt->limit.burst >0 ) +printf (" burst %u packets" , stmt->limit.burst);break ;case NFT_LIMIT_PKT_BYTES : data_unit =get_rate (stmt->limit.rate, &rate);printf ("limit rate %" PRIu64" %s/%s" , rate, data_unit,get_unit (stmt->limit.unit)); +if (stmt->limit.burst >0 ) { +uint64_t burst; + + data_unit =get_rate (stmt->limit.burst, &burst); +printf (" burst %" PRIu64" %s" , burst, data_unit); + }break ; } }
Signature · 1 line
1.7.10.4
Pablo Neira Ayuso
maintainerPATCH 3/3 tests: limit: extend them to validate new bytes/second and burst parameters
In reply to Pablo Neira AyusoSigned-off-by Pablo Neira Ayuso <[email protected]>
--- tests/regression/any/limit.t | 15 +++++++++- tests/regression/any/limit.t.payload | 54 ++++++++++++++++++++++++++++++---- 2 files changed, 63 insertions(+), 6 deletions(-)
tests/regression/any/limit.t +14 -1
@@ -8,5 +8,18 @@ limit rate 400/minute;ok limit rate 20/second;ok limit rate 400/hour;ok -limit rate 400/week;ok limit rate 40/day;ok +limit rate 400/week;ok +limit rate 1023/second burst 10 packets;ok + +limit rate 1 kbytes/second;ok +limit rate 2 kbytes/second;ok +limit rate 1025 kbytes/second;ok +limit rate 1023 mbytes/second;ok +limit rate 10230 mbytes/second;ok +limit rate 1023000 mbytes/second;ok + +limit rate 1025 bytes/second burst 512 bytes;ok +limit rate 1025 kbytes/second burst 1023 kbytes;ok +limit rate 1025 mbytes/second burst 1025 kbytes;ok +limit rate 1025000 mbytes/second burst 1023 mbytes;ok
tests/regression/any/limit.t.payload +49 -5
69 lines not on this page · raw message
Signature · 1 line
1.7.10.4