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

Skip to parse rules not in miniupnpd chain.

This commit is contained in:
Tomofumi Hayashi 2015-03-16 19:39:06 +09:00
parent af780b8255
commit 841b2fb1f3
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
miniupnpd/netfilter_nft/nftnlrdr_misc.c
View File

@ -480,6 +480,7 @@ table_cb(const struct nlmsghdr *nlh, void *data)
struct nft_rule_expr *expr; struct nft_rule_expr *expr;
struct nft_rule_expr_iter *itr; struct nft_rule_expr_iter *itr;
rule_t *r; rule_t *r;
char *chain;
UNUSED(data); UNUSED(data);
r = malloc(sizeof(rule_t)); r = malloc(sizeof(rule_t));
@ -496,10 +497,16 @@ table_cb(const struct nlmsghdr *nlh, void *data)
goto err_free; goto err_free;
} }
chain = (char *)nft_rule_attr_get_data(t, NFT_RULE_ATTR_CHAIN, &len);
if (strcmp(chain, miniupnpd_nft_nat_chain) != 0 &&
strcmp(chain, miniupnpd_nft_peer_chain) != 0 &&
strcmp(chain, miniupnpd_nft_forward_chain) != 0) {
goto rule_skip;
}
r->table = strdup( r->table = strdup(
(char *)nft_rule_attr_get_data(t, NFT_RULE_ATTR_TABLE, &len)); (char *)nft_rule_attr_get_data(t, NFT_RULE_ATTR_TABLE, &len));
r->chain = strdup( r->chain = strdup(chain);
(char *)nft_rule_attr_get_data(t, NFT_RULE_ATTR_CHAIN, &len));
r->family = *(uint32_t*)nft_rule_attr_get_data(t, NFT_RULE_ATTR_FAMILY, r->family = *(uint32_t*)nft_rule_attr_get_data(t, NFT_RULE_ATTR_FAMILY,
&len); &len);
r->desc = (char *)nft_rule_attr_get_data(t, NFT_RULE_ATTR_USERDATA, r->desc = (char *)nft_rule_attr_get_data(t, NFT_RULE_ATTR_USERDATA,
@ -521,9 +528,15 @@ table_cb(const struct nlmsghdr *nlh, void *data)
while ((expr = nft_rule_expr_iter_next(itr)) != NULL) { while ((expr = nft_rule_expr_iter_next(itr)) != NULL) {
rule_expr_cb(expr, r); rule_expr_cb(expr, r);
} }
if (r->type == RULE_NONE) {
free(r);
} else {
LIST_INSERT_HEAD(&head, r, entry); LIST_INSERT_HEAD(&head, r, entry);
rule_list_length++; rule_list_length++;
}
rule_skip:
err_free: err_free:
nft_rule_free(t); nft_rule_free(t);
err: err:
@ -594,9 +607,15 @@ reflesh_nft_cache(uint32_t family)
if (p1 != NULL) { if (p1 != NULL) {
while(p1 != NULL) { while(p1 != NULL) {
p2 = (rule_t *)LIST_NEXT(p1, entry); p2 = (rule_t *)LIST_NEXT(p1, entry);
if (p1->desc != NULL) {
free(p1->desc); free(p1->desc);
}
if (p1->table != NULL) {
free(p1->table); free(p1->table);
}
if (p1->chain != NULL) {
free(p1->chain); free(p1->chain);
}
free(p1); free(p1);
p1 = p2; p1 = p2;
} }