netlink: statify __netlink_gen_data()
Pablo Neira Ayuso
maintainerPATCH 1/3 netlink: statify __netlink_gen_data()
--- src/netlink.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
src/netlink.c +4 -4
@@ -97,8 +97,8 @@ struct nftnl_expr *alloc_nft_expr(const char *name)return nle; } -void __netlink_gen_data (const struct expr *expr, -struct nft_data_linearize *data,bool expand); +static void __netlink_gen_data (const struct expr *expr, +struct nft_data_linearize *data,bool expand);struct nftnl_set_elem *alloc_nftnl_setelem (const struct expr *set,const struct expr *expr)
@@ -430,8 +430,8 @@ static void netlink_gen_prefix(const struct expr *expr, nld->len = len; } -void __netlink_gen_data (const struct expr *expr, -struct nft_data_linearize *data,bool expand) +static void __netlink_gen_data (const struct expr *expr, +struct nft_data_linearize *data,bool expand) {switch (expr->etype) {case EXPR_VALUE :
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH v2 3/3 netlink: unfold function to generate concatenations for keys and data
Add a specific function to generate concatenation with and without intervals in maps. This restores the original function added by 8ac2f3b2fca3 ("src: Add support for concatenated set ranges") which is used by 66746e7dedeb ("src: support for nat with interval concatenation") to generate the data concatenations in maps.
Only the set element key requires the byteswap introduced by 1017d323cafa ("src: support for selectors with different byteorder with interval concatenations"). Therefore, better not to reuse the same function for key and data as the future might bring support for more kind of concatenations in data maps.
---
v2: Rebased on top on current series, split functions for the non-expand
case for set element data bytecode generation.
src/netlink.c | 63 +++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 53 insertions(+), 10 deletions(-)
src/netlink.c +53 -10
@@ -254,8 +254,8 @@ static int netlink_export_pad(unsigned char *data, const mpz_t v,return netlink_padded_len (i->len) /BITS_PER_BYTE ; } -static int netlink_gen_concat_data_expr (uint32_t flags,const struct expr *i, -unsigned char *data) +static int __netlink_gen_concat_key (uint32_t flags,const struct expr *i, +unsigned char *data) {struct expr *expr;
@@ -307,8 +307,8 @@ static int netlink_gen_concat_data_expr(uint32_t flags, const struct expr *i,return netlink_export_pad (data, i->value, i); } -static void __netlink_gen_concat (const struct expr *expr, -struct nft_data_linearize *nld) +static void netlink_gen_concat_key (const struct expr *expr, +struct nft_data_linearize *nld) {unsigned int len = expr->len /BITS_PER_BYTE , offset =0 ;unsigned char data[len];
@@ -317,12 +317,40 @@ static void __netlink_gen_concat(const struct expr *expr,memset (data,0 , len);list_for_each_entry (i, &expr->expressions, list) - offset +=netlink_gen_concat_data_expr (expr->flags, i, data + offset); + offset +=__netlink_gen_concat_key (expr->flags, i, data + offset);memcpy (nld->value, data, len); nld->len = len; } +static int __netlink_gen_concat_data (int end,const struct expr *i, +unsigned char *data) +{ +switch (i->etype) { +case EXPR_RANGE : + i = end ? i->right : i->left; +break ; +case EXPR_PREFIX : +if (end) { +int count; +mpz_t v; + +mpz_init_bitmask (v, i->len - i->prefix_len); +mpz_add (v, i->prefix->value, v); + count =netlink_export_pad (data, v, i); +mpz_clear (v); +return count; + } +return netlink_export_pad (data, i->prefix->value, i); +case EXPR_VALUE : +break ; +default : +BUG ("invalid expression type '%s' in set" ,expr_ops (i)->name); + } + +return netlink_export_pad (data, i->value, i); +} +static void __netlink_gen_concat_expand (const struct expr *expr,struct nft_data_linearize *nld) {
@@ -333,18 +361,33 @@ static void __netlink_gen_concat_expand(const struct expr *expr,memset (data,0 , len);list_for_each_entry (i, &expr->expressions, list) - offset +=netlink_gen_concat_data_expr (0 , i, data + offset); + offset +=__netlink_gen_concat_data (false, i, data + offset); + +list_for_each_entry (i, &expr->expressions, list) + offset +=__netlink_gen_concat_data (true, i, data + offset); + +memcpy (nld->value, data, len); + nld->len = len; +} + +static void __netlink_gen_concat (const struct expr *expr, +struct nft_data_linearize *nld) +{ +unsigned int len = expr->len /BITS_PER_BYTE , offset =0 ; +unsigned char data[len]; +const struct expr *i; + +memset (data,0 , len);list_for_each_entry (i, &expr->expressions, list) - offset +=netlink_gen_concat_data_expr (EXPR_F_INTERVAL_END , i, data + offset); + offset +=__netlink_gen_concat_data (expr->flags, i, data + offset);memcpy (nld->value, data, len); nld->len = len; }static void netlink_gen_concat_data (const struct expr *expr, -struct nft_data_linearize *nld, -bool expand) +struct nft_data_linearize *nld,bool expand) {if (expand)__netlink_gen_concat_expand (expr, nld);
@@ -438,7 +481,7 @@ static void netlink_gen_key(const struct expr *expr,case EXPR_VALUE :return netlink_gen_constant_data (expr, data);case EXPR_CONCAT : -return netlink_gen_concat_data (expr, data, false); +return netlink_gen_concat_key (expr, data);case EXPR_RANGE :return netlink_gen_range (expr, data);case EXPR_PREFIX :
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 2/3 netlink: add function to generate set element key data
In reply to Pablo Neira AyusoAdd netlink_gen_key(), it is just like __netlink_gen_data() with no EXPR_VERDICT case, which should not ever happen for set element keys.
--- src/netlink.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-)
src/netlink.c +22 -4
@@ -96,7 +96,8 @@ struct nftnl_expr *alloc_nft_expr(const char *name)return nle; } - +static void netlink_gen_key (const struct expr *expr, +struct nft_data_linearize *data);static void __netlink_gen_data (const struct expr *expr,struct nft_data_linearize *data,bool expand);
@@ -136,19 +137,19 @@ struct nftnl_set_elem *alloc_nftnl_setelem(const struct expr *set,if (set->set_flags &NFT_SET_INTERVAL && key->etype ==EXPR_CONCAT && key->field_count >1 ) { key->flags |=EXPR_F_INTERVAL ; -__netlink_gen_data (key, &nld, false); +netlink_gen_key (key, &nld); key->flags &= ~EXPR_F_INTERVAL ;nftnl_set_elem_set (nlse,NFTNL_SET_ELEM_KEY , &nld.value, nld.len); key->flags |=EXPR_F_INTERVAL_END ; -__netlink_gen_data (key, &nld, false); +netlink_gen_key (key, &nld); key->flags &= ~EXPR_F_INTERVAL_END ;nftnl_set_elem_set (nlse,NFTNL_SET_ELEM_KEY_END , &nld.value, nld.len); }else { -__netlink_gen_data (key, &nld, false); +netlink_gen_key (key, &nld);nftnl_set_elem_set (nlse,NFTNL_SET_ELEM_KEY , &nld.value, nld.len); }break ;
@@ -430,6 +431,23 @@ static void netlink_gen_prefix(const struct expr *expr, nld->len = len; } +static void netlink_gen_key (const struct expr *expr, +struct nft_data_linearize *data) +{ +switch (expr->etype) { +case EXPR_VALUE : +return netlink_gen_constant_data (expr, data); +case EXPR_CONCAT : +return netlink_gen_concat_data (expr, data, false); +case EXPR_RANGE : +return netlink_gen_range (expr, data); +case EXPR_PREFIX : +return netlink_gen_prefix (expr, data); +default : +BUG ("invalid data expression type %s\n" ,expr_name (expr)); + } +} +static void __netlink_gen_data (const struct expr *expr,struct nft_data_linearize *data,bool expand) {
Signature · 1 line
2.30.2