status-im
/
miniupnp
mirror of https://github.com/status-im/miniupnp.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

nftnlrdr_misc.c: replace nftnl_rule_get_data() usage with specific nftnl_rule_get_*() functions 

nftnl_rule_get_u32()
nftnl_rule_get_u64()
nftnl_rule_get_str()

closes #641
should fix #582
This commit is contained in:
Thomas Bernard 2023-01-14 19:18:37 +01:00
parent 67ea8c8bc3
commit 904dda47ed
No known key found for this signature in database
GPG Key ID: DB511043A31ACAAF
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
miniupnpd/netfilter_nft/nftnlrdr_misc.c
View File

@ -545,18 +545,16 @@ table_cb(const struct nlmsghdr *nlh, void *data)
result = MNL_CB_ERROR; result = MNL_CB_ERROR;
} else { } else {
const char *chain; const char *chain;
uint32_t len;
memset(r, 0, sizeof(rule_t)); memset(r, 0, sizeof(rule_t));
chain = (const char *) nftnl_rule_get_data(rule, NFTNL_RULE_CHAIN, &len); chain = nftnl_rule_get_str(rule, NFTNL_RULE_CHAIN);
if (strcmp(chain, nft_prerouting_chain) == 0 || if (strcmp(chain, nft_prerouting_chain) == 0 ||
strcmp(chain, nft_postrouting_chain) == 0 || strcmp(chain, nft_postrouting_chain) == 0 ||
strcmp(chain, nft_forward_chain) == 0) { strcmp(chain, nft_forward_chain) == 0) {
r->table = strdup((const char *) nftnl_rule_get_data(rule, NFTNL_RULE_TABLE, &len)); r->table = strdup(nftnl_rule_get_str(rule, NFTNL_RULE_TABLE));
r->chain = strdup(chain); r->chain = strdup(chain);
r->family = *(uint32_t *) nftnl_rule_get_data(rule, NFTNL_RULE_FAMILY, r->family = nftnl_rule_get_u32(rule, NFTNL_RULE_FAMILY);
&len);
if (nftnl_rule_is_set(rule, NFTNL_RULE_USERDATA)) { if (nftnl_rule_is_set(rule, NFTNL_RULE_USERDATA)) {
const char *descr; const char *descr;
descr = (const char *) nftnl_rule_get_data(rule, NFTNL_RULE_USERDATA, descr = (const char *) nftnl_rule_get_data(rule, NFTNL_RULE_USERDATA,
@ -572,9 +570,7 @@ table_cb(const struct nlmsghdr *nlh, void *data)
} }
} }
r->handle = *(uint32_t *) nftnl_rule_get_data(rule, r->handle = nftnl_rule_get_u64(rule, NFTNL_RULE_HANDLE);
NFTNL_RULE_HANDLE,
&len);
r->type = CB_DATA(type); r->type = CB_DATA(type);
itr = nftnl_expr_iter_create(rule); itr = nftnl_expr_iter_create(rule);