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

improve parse_rule_cmp() 

see #459
This commit is contained in:
Thomas Bernard 2020-06-01 20:14:20 +02:00
parent c09f485482
commit 1e37a9f7b5
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
miniupnpd/netfilter_nft/nftnlrdr_misc.c
View File

@ -346,12 +346,9 @@ parse_rule_payload(struct nftnl_expr *e, rule_t *r)
static void
parse_rule_cmp(struct nftnl_expr *e, rule_t *r)
{
uint32_t data_len;
void *data_val;
uint32_t data_len = 0;
const void *data_val;
uint32_t op, sreg;
uint16_t *ports;
in_addr_t *addrp;
struct in6_addr *addrp6;
op = nftnl_expr_get_u32(e, NFTNL_EXPR_CMP_OP);
@ -367,52 +364,52 @@ parse_rule_cmp(struct nftnl_expr *e, rule_t *r)
return;
}
data_val = (void *)nftnl_expr_get(e, NFTNL_EXPR_CMP_DATA, &data_len);
data_val = nftnl_expr_get(e, NFTNL_EXPR_CMP_DATA, &data_len);
switch (r->reg1_type) {
case RULE_REG_IIF:
if (data_len == sizeof(uint32_t)) {
r->ingress_ifidx = *(uint32_t *)data_val;
r->ingress_ifidx = *(const uint32_t *)data_val;
}
break;
case RULE_REG_IP_SRC_ADDR:
if (data_len == sizeof(in_addr_t)) {
r->rhost = *(in_addr_t *)data_val;
r->rhost = *(const in_addr_t *)data_val;
}
break;
case RULE_REG_IP6_SRC_ADDR:
if (data_len == sizeof(struct in6_addr)) {
r->rhost6 = *(struct in6_addr *)data_val;
r->rhost6 = *(const struct in6_addr *)data_val;
}
break;
case RULE_REG_IP_DEST_ADDR:
if (data_len == sizeof(in_addr_t)) {
if (r->type == RULE_FILTER) {
r->iaddr = *(in_addr_t *)data_val;
r->iaddr = *(const in_addr_t *)data_val;
} else {
r->rhost = *(in_addr_t *)data_val;
r->rhost = *(const in_addr_t *)data_val;
}
}
break;
case RULE_REG_IP6_DEST_ADDR:
if (data_len == sizeof(struct in6_addr)) {
if (r->type == RULE_FILTER) {
r->iaddr6 = *(struct in6_addr *)data_val;
r->iaddr6 = *(const struct in6_addr *)data_val;
} else {
r->rhost6 = *(struct in6_addr *)data_val;
r->rhost6 = *(const struct in6_addr *)data_val;
}
}
break;
case RULE_REG_IP_SD_ADDR:
if (data_len == sizeof(in_addr_t) * 2) {
addrp = (in_addr_t *)data_val;
const in_addr_t *addrp = (const in_addr_t *)data_val;
r->iaddr = addrp[0];
r->rhost = addrp[1];
}
break;
case RULE_REG_IP6_SD_ADDR:
if (data_len == sizeof(struct in6_addr) * 2) {
addrp6 = (struct in6_addr *)data_val;
const struct in6_addr *addrp6 = (const struct in6_addr *)data_val;
r->iaddr6 = addrp6[0];
r->rhost6 = addrp6[1];
}
@ -420,17 +417,17 @@ parse_rule_cmp(struct nftnl_expr *e, rule_t *r)
case RULE_REG_IP_PROTO:
case RULE_REG_IP6_PROTO:
if (data_len == sizeof(uint8_t)) {
r->proto = *(uint8_t *)data_val;
r->proto = *(const uint8_t *)data_val;
}
break;
case RULE_REG_TCP_DPORT:
if (data_len == sizeof(uint16_t)) {
r->eport = ntohs(*(uint16_t *)data_val);
r->eport = ntohs(*(const uint16_t *)data_val);
}
break;
case RULE_REG_TCP_SD_PORT:
if (data_len == sizeof(uint16_t) * 2) {
ports = (uint16_t *)data_val;
const uint16_t * ports = (const uint16_t *)data_val;
r->eport = ntohs(ports[0]);
r->rport = ntohs(ports[1]);
}