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

netfilter_nft/nftpinhole.c: fix after function renames 

nft_send_request() => nft_send_rule()
reflesh_nft_cache_filter() => refresh_nft_cache_filter()
This commit is contained in:
Thomas Bernard 2019-10-06 22:30:36 +02:00
parent e6b1dab5e9
commit f200b1b7e8
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
miniupnpd/netfilter_nft/nftpinhole.c
View File

@ -101,7 +101,7 @@ int add_pinhole(const char * ifname,
rhost_addr_p, &ihost_addr, rhost_addr_p, &ihost_addr,
0, int_port, rem_port, comment, 0); 0, int_port, rem_port, comment, 0);
res = nft_send_request(r, NFT_MSG_NEWRULE, RULE_CHAIN_FILTER); res = nft_send_rule(r, NFT_MSG_NEWRULE, RULE_CHAIN_FILTER);
if (res < 0) if (res < 0)
return -1; return -1;
@ -135,7 +135,7 @@ find_pinhole(const char * ifname,
inet_pton(AF_INET6, int_client, &daddr); inet_pton(AF_INET6, int_client, &daddr);
d_printf(("find_pinhole()\n")); d_printf(("find_pinhole()\n"));
reflesh_nft_cache_filter(); refresh_nft_cache_filter();
LIST_FOREACH(p, &head_filter, entry) { LIST_FOREACH(p, &head_filter, entry) {
@ -186,7 +186,7 @@ delete_pinhole(unsigned short uid)
"pinhole-%hu", uid); "pinhole-%hu", uid);
d_printf(("delete_pinhole()\n")); d_printf(("delete_pinhole()\n"));
reflesh_nft_cache_filter(); refresh_nft_cache_filter();
LIST_FOREACH(p, &head_filter, entry) { LIST_FOREACH(p, &head_filter, entry) {
// Only forward entries // Only forward entries
@ -200,7 +200,7 @@ delete_pinhole(unsigned short uid)
strtok(tmp_label, " "); strtok(tmp_label, " ");
if (0 == strcmp(tmp_label, label_start)) { if (0 == strcmp(tmp_label, label_start)) {
r = rule_del_handle(p); r = rule_del_handle(p);
nft_send_request(r, NFT_MSG_DELRULE, RULE_CHAIN_FILTER); nft_send_rule(r, NFT_MSG_DELRULE, RULE_CHAIN_FILTER);
return 0; return 0;
} }
} }
@ -232,7 +232,7 @@ update_pinhole(unsigned short uid, unsigned int timestamp)
snprintf(label_start, sizeof(label_start), snprintf(label_start, sizeof(label_start),
"pinhole-%hu", uid); "pinhole-%hu", uid);
reflesh_nft_cache_filter(); refresh_nft_cache_filter();
proto = -1; proto = -1;
memset(&rhost_addr, 0, sizeof(struct in6_addr)); memset(&rhost_addr, 0, sizeof(struct in6_addr));
@ -290,7 +290,7 @@ update_pinhole(unsigned short uid, unsigned int timestamp)
// Delete rule // Delete rule
r = rule_del_handle(p); r = rule_del_handle(p);
res = nft_send_request(r, NFT_MSG_DELRULE, RULE_CHAIN_FILTER); res = nft_send_rule(r, NFT_MSG_DELRULE, RULE_CHAIN_FILTER);
if (res < 0) if (res < 0)
return -1; return -1;
@ -306,7 +306,7 @@ update_pinhole(unsigned short uid, unsigned int timestamp)
rhost_addr_p, &ihost_addr, rhost_addr_p, &ihost_addr,
0, iport, rport, comment, 0); 0, iport, rport, comment, 0);
res = nft_send_request(r, NFT_MSG_NEWRULE, RULE_CHAIN_FILTER); res = nft_send_rule(r, NFT_MSG_NEWRULE, RULE_CHAIN_FILTER);
if (res < 0) if (res < 0)
return -1; return -1;
@ -333,7 +333,7 @@ get_pinhole_info(unsigned short uid,
"pinhole-%hu", uid); "pinhole-%hu", uid);
d_printf(("get_pinhole_info()\n")); d_printf(("get_pinhole_info()\n"));
reflesh_nft_cache_filter(); refresh_nft_cache_filter();
LIST_FOREACH(p, &head_filter, entry) { LIST_FOREACH(p, &head_filter, entry) {
// Only forward entries // Only forward entries
@ -418,7 +418,7 @@ clean_pinhole_list(unsigned int * next_timestamp)
current_time = upnp_time(); current_time = upnp_time();
d_printf(("clean_pinhole_list()\n")); d_printf(("clean_pinhole_list()\n"));
reflesh_nft_cache_filter(); refresh_nft_cache_filter();
LIST_FOREACH(p, &head_filter, entry) { LIST_FOREACH(p, &head_filter, entry) {
// Only forward entries // Only forward entries
@ -436,7 +436,7 @@ clean_pinhole_list(unsigned int * next_timestamp)
if (ts <= (unsigned int)current_time) { if (ts <= (unsigned int)current_time) {
syslog(LOG_INFO, "removing expired pinhole '%s'", p->desc); syslog(LOG_INFO, "removing expired pinhole '%s'", p->desc);
r = rule_del_handle(p); r = rule_del_handle(p);
nft_send_request(r, NFT_MSG_DELRULE, RULE_CHAIN_FILTER); nft_send_rule(r, NFT_MSG_DELRULE, RULE_CHAIN_FILTER);
n++; n++;
} else { } else {
if (uid > max_uid) if (uid > max_uid)