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

miniupnpd/netfilter_nft: properly store timestamps 

should fix #466
This commit is contained in:
Thomas Bernard 2020-06-02 01:00:04 +02:00
parent c0ea7926c0
commit fb63cf3455
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
miniupnpd/netfilter_nft/nftnlrdr.c
View File

@ -247,9 +247,9 @@ add_redirect_rule2(const char * ifname,
const char * iaddr, unsigned short iport, int proto,
const char * desc, unsigned int timestamp)
{
int ret;
struct nftnl_rule *r;
UNUSED(rhost);
UNUSED(timestamp);
d_printf(("add redirect rule2(%s, %s, %u, %s, %u, %d, %s)!\n",
ifname, rhost, eport, iaddr, iport, proto, desc));
@ -258,7 +258,11 @@ add_redirect_rule2(const char * ifname,
0, eport,
inet_addr(iaddr), iport, desc, NULL);
return nft_send_rule(r, NFT_MSG_NEWRULE, RULE_CHAIN_REDIRECT);
ret = nft_send_rule(r, NFT_MSG_NEWRULE, RULE_CHAIN_REDIRECT);
if (ret >= 0) {
add_timestamp_entry(eport, proto, timestamp);
}
return ret;
}
/*
@ -493,13 +497,16 @@ get_peer_rule_by_index(int index,
strncpy(desc, r->desc, desclen);
}
if (packets || bytes) {
if (packets)
*packets = r->packets;
if (bytes)
*bytes = r->bytes;
if (packets) {
*packets = r->packets;
}
if (bytes) {
*bytes = r->bytes;
}
if (timestamp) {
*timestamp = get_timestamp(r->eport, r->proto);
}
/*
* TODO: Implement counter in case of add {nat,filter}
*/
@ -546,7 +553,6 @@ get_redirect_rule_by_index(int index,
struct in_addr addr;
char *addr_str;
rule_t *r;
UNUSED(timestamp);
d_printf(("get_redirect_rule_by_index()\n"));
refresh_nft_cache_redirect();

8
miniupnpd/netfilter_nft/nftnlrdr_misc.c
View File

@ -1279,6 +1279,14 @@ start_batch(char *buf, size_t buf_size)
return result;
}
/**
* return codes :
* 0 : OK
* -1 : netlink not connected
* -2 : mnl_socket_sendto() error
* -3 : mnl_socket_recvfrom() error
* -4 : mnl_cb_run() error
*/
int
send_batch(struct mnl_nlmsg_batch *batch)
{