From f200b1b7e846d55100456bf55d9215678ba8e193 Mon Sep 17 00:00:00 2001 From: Thomas Bernard Date: Sun, 6 Oct 2019 22:30:36 +0200 Subject: [PATCH] netfilter_nft/nftpinhole.c: fix after function renames nft_send_request() => nft_send_rule() reflesh_nft_cache_filter() => refresh_nft_cache_filter() --- miniupnpd/netfilter_nft/nftpinhole.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/miniupnpd/netfilter_nft/nftpinhole.c b/miniupnpd/netfilter_nft/nftpinhole.c index 1b648be..a7c5431 100644 --- a/miniupnpd/netfilter_nft/nftpinhole.c +++ b/miniupnpd/netfilter_nft/nftpinhole.c @@ -101,7 +101,7 @@ int add_pinhole(const char * ifname, rhost_addr_p, &ihost_addr, 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) return -1; @@ -135,7 +135,7 @@ find_pinhole(const char * ifname, inet_pton(AF_INET6, int_client, &daddr); d_printf(("find_pinhole()\n")); - reflesh_nft_cache_filter(); + refresh_nft_cache_filter(); LIST_FOREACH(p, &head_filter, entry) { @@ -186,7 +186,7 @@ delete_pinhole(unsigned short uid) "pinhole-%hu", uid); d_printf(("delete_pinhole()\n")); - reflesh_nft_cache_filter(); + refresh_nft_cache_filter(); LIST_FOREACH(p, &head_filter, entry) { // Only forward entries @@ -200,7 +200,7 @@ delete_pinhole(unsigned short uid) strtok(tmp_label, " "); if (0 == strcmp(tmp_label, label_start)) { 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; } } @@ -232,7 +232,7 @@ update_pinhole(unsigned short uid, unsigned int timestamp) snprintf(label_start, sizeof(label_start), "pinhole-%hu", uid); - reflesh_nft_cache_filter(); + refresh_nft_cache_filter(); proto = -1; memset(&rhost_addr, 0, sizeof(struct in6_addr)); @@ -290,7 +290,7 @@ update_pinhole(unsigned short uid, unsigned int timestamp) // Delete rule 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) return -1; @@ -306,7 +306,7 @@ update_pinhole(unsigned short uid, unsigned int timestamp) rhost_addr_p, &ihost_addr, 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) return -1; @@ -333,7 +333,7 @@ get_pinhole_info(unsigned short uid, "pinhole-%hu", uid); d_printf(("get_pinhole_info()\n")); - reflesh_nft_cache_filter(); + refresh_nft_cache_filter(); LIST_FOREACH(p, &head_filter, entry) { // Only forward entries @@ -418,7 +418,7 @@ clean_pinhole_list(unsigned int * next_timestamp) current_time = upnp_time(); d_printf(("clean_pinhole_list()\n")); - reflesh_nft_cache_filter(); + refresh_nft_cache_filter(); LIST_FOREACH(p, &head_filter, entry) { // Only forward entries @@ -436,7 +436,7 @@ clean_pinhole_list(unsigned int * next_timestamp) if (ts <= (unsigned int)current_time) { syslog(LOG_INFO, "removing expired pinhole '%s'", p->desc); 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++; } else { if (uid > max_uid)