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

Merge pull request #630 from miniupnp/issue-628 

fixes Issue 628 - bug on big endian
This commit is contained in:
Thomas BERNARD 2022-10-16 07:33:19 +02:00 committed by GitHub
parent 3a2b15af4c 61127ca0be
commit 3f6350da6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
miniupnpd/Changelog.txt
View File

@ -1,5 +1,8 @@
$Id: Changelog.txt,v 1.489 2022/06/01 23:21:11 nanard Exp $
2022/10/10:
NFTables : fix for Big Endian. iport was always read as 0
2022/08/06:
Fixes DeletePCPMap() for "IPv6 pinholes" with netfilter_nftables backend

28
miniupnpd/netfilter_nft/nftnlrdr_misc.c
View File

@ -217,9 +217,21 @@ parse_rule_immediate(struct nftnl_expr *e, rule_t *r)
if (dreg == NFT_REG_VERDICT) {
reg_val = nftnl_expr_get_u32(e, NFTNL_EXPR_IMM_VERDICT);
} else {
reg_val = *(uint32_t *)nftnl_expr_get(e,
NFTNL_EXPR_IMM_DATA,
&reg_len);
const void * p = nftnl_expr_get(e, NFTNL_EXPR_IMM_DATA, &reg_len);
if (p == NULL) {
log_error("nftnl_expr_get() failed for reg:%u", dreg);
return;
} else switch(reg_len) {
case sizeof(uint32_t):
reg_val = *(const uint32_t *)p;
break;
case sizeof(uint16_t):
reg_val = *(const uint16_t *)p;
break;
default:
log_error("nftnl_expr_get() reg_len=%u", reg_len);
return;
}
}
set_reg(r, dreg, RULE_REG_IMM_VAL, reg_val);
@ -804,7 +816,7 @@ expr_set_reg_val_u32(struct nftnl_rule *r, enum nft_registers dreg, uint32_t val
}
static void
expr_set_reg_val_u16(struct nftnl_rule *r, enum nft_registers dreg, uint32_t val)
expr_set_reg_val_u16(struct nftnl_rule *r, enum nft_registers dreg, uint16_t val)
{
struct nftnl_expr *e;
e = nftnl_expr_alloc("immediate");
@ -833,7 +845,7 @@ expr_set_reg_verdict(struct nftnl_rule *r, uint32_t val)
static void
expr_add_nat(struct nftnl_rule *r, uint32_t t, uint32_t family,
in_addr_t addr_min, uint32_t proto_min, uint32_t flags)
in_addr_t addr_min, uint16_t proto_min, uint32_t flags)
{
struct nftnl_expr *e;
UNUSED(flags);
@ -843,7 +855,7 @@ expr_add_nat(struct nftnl_rule *r, uint32_t t, uint32_t family,
log_error("nftnl_expr_alloc(\"%s\") FAILED", "nat");
return;
}
nftnl_expr_set_u32(e, NFTNL_EXPR_NAT_TYPE, t);
nftnl_expr_set_u32(e, NFTNL_EXPR_NAT_FAMILY, family);
@ -947,8 +959,6 @@ rule_set_dnat(uint8_t family, const char * ifname, uint8_t proto,
uint64_t handle_num;
uint32_t if_idx;
UNUSED(handle);
r = nftnl_rule_alloc();
if (r == NULL) {
log_error("nftnl_rule_alloc() FAILED");
@ -1014,7 +1024,6 @@ rule_set_filter(uint8_t family, const char * ifname, uint8_t proto,
unsigned short rport, const char *descr, const char *handle)
{
struct nftnl_rule *r = NULL;
UNUSED(eport);
r = nftnl_rule_alloc();
if (r == NULL) {
@ -1056,7 +1065,6 @@ rule_set_filter6(uint8_t family, const char * ifname, uint8_t proto,
unsigned short rport, const char *descr, const char *handle)
{
struct nftnl_rule *r = NULL;
UNUSED(eport);
r = nftnl_rule_alloc();
if (r == NULL) {