| Message ID | 20190617161541.ppjn6nf57mfkz77j@nevthink |
|---|---|
| State | Accepted |
| Delegated to: | Pablo Neira |
| Headers | show |
| Series | [nft] src: enable set expiration date for set elements | expand |
On Mon, Jun 17, 2019 at 06:15:41PM +0200, nevola wrote: > Currently, the expiration of every element in a set or map > is a read-only parameter generated at kernel side. > > This change will permit to set a certain expiration date > per element that will be required, for example, during > stateful replication among several nodes. > > This patch will enable the _expires_ input parameter in > the parser and propagate NFTNL_SET_ELEM_EXPIRATION in > order to send the configured value. Applied, thanks Laura.
diff --git a/src/netlink.c b/src/netlink.c index a6d81b4..40dc41a 100644 --- a/src/netlink.c +++ b/src/netlink.c @@ -122,6 +122,9 @@ static struct nftnl_set_elem *alloc_nftnl_setelem(const struct expr *set, if (elem->timeout) nftnl_set_elem_set_u64(nlse, NFTNL_SET_ELEM_TIMEOUT, elem->timeout); + if (elem->expiration) + nftnl_set_elem_set_u64(nlse, NFTNL_SET_ELEM_EXPIRATION, + elem->expiration); if (elem->comment || expr->elem_flags) { udbuf = nftnl_udata_buf_alloc(NFT_USERDATA_MAXLEN); if (!udbuf) diff --git a/src/parser_bison.y b/src/parser_bison.y index 1c0b60c..f732350 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -255,6 +255,7 @@ int nft_lex(void *, void *, void *); %token TIMEOUT "timeout" %token GC_INTERVAL "gc-interval" %token ELEMENTS "elements" +%token EXPIRES "expires" %token POLICY "policy" %token MEMORY "memory" @@ -3367,6 +3368,10 @@ set_elem_option : TIMEOUT time_spec { $<expr>0->timeout = $2; } + | EXPIRES time_spec + { + $<expr>0->expiration = $2; + } | comment_spec { $<expr>0->comment = $1; diff --git a/src/scanner.l b/src/scanner.l index d1f6e87..b46b25e 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -302,6 +302,7 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "timeout" { return TIMEOUT; } "gc-interval" { return GC_INTERVAL; } "elements" { return ELEMENTS; } +"expires" { return EXPIRES; } "policy" { return POLICY; } "size" { return SIZE; }
Currently, the expiration of every element in a set or map is a read-only parameter generated at kernel side. This change will permit to set a certain expiration date per element that will be required, for example, during stateful replication among several nodes. This patch will enable the _expires_ input parameter in the parser and propagate NFTNL_SET_ELEM_EXPIRATION in order to send the configured value. Signed-off-by: nevola <laura.garcia@zevenet.com> --- src/netlink.c | 3 +++ src/parser_bison.y | 5 +++++ src/scanner.l | 1 + 3 files changed, 9 insertions(+)