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

do not delete/re-add pf rule if the desc/label is unchanged

This commit is contained in:
Thomas Bernard 2016-02-15 18:48:23 +01:00
parent 0d6d6afc32
commit 8c5e90db3a
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
miniupnpd/pf/obsdrdr.c
View File

@ -614,10 +614,20 @@ error:
return -1; return -1;
} }
#define priv_delete_redirect_rule(ifname, eport, proto, iport, \
iaddr, rhost, rhostlen) \
priv_delete_redirect_rule_check_desc(ifname, eport, proto, iport, \
iaddr, rhost, rhostlen, 0, NULL)
/* if check_desc is true, only delete the rule if the description differs.
* returns : -1 : error / rule not found
* 0 : rule deleted
* 1 : rule untouched
*/
static int static int
priv_delete_redirect_rule(const char * ifname, unsigned short eport, priv_delete_redirect_rule_check_desc(const char * ifname, unsigned short eport,
int proto, unsigned short * iport, int proto, unsigned short * iport,
in_addr_t * iaddr, char * rhost, int rhostlen) in_addr_t * iaddr, char * rhost, int rhostlen,
int check_desc, const char * desc)
{ {
int i, n; int i, n;
struct pfioc_rule pr; struct pfioc_rule pr;
@ -701,6 +711,12 @@ priv_delete_redirect_rule(const char * ifname, unsigned short eport,
inet_ntop(AF_INET, &pr.rule.src.addr.v.a.addr.v4.s_addr, inet_ntop(AF_INET, &pr.rule.src.addr.v.a.addr.v4.s_addr,
rhost, rhostlen); rhost, rhostlen);
} }
if(check_desc) {
if((desc == NULL && pr.rule.label[0] == '\0') ||
(desc && 0 == strcmp(desc, pr.rule.label))) {
return 1;
}
}
pr.action = PF_CHANGE_GET_TICKET; pr.action = PF_CHANGE_GET_TICKET;
if(ioctl(dev, DIOCCHANGERULE, &pr) < 0) if(ioctl(dev, DIOCCHANGERULE, &pr) < 0)
{ {
@ -1033,9 +1049,17 @@ update_portmapping_desc_timestamp(const char * ifname,
in_addr_t iaddr; in_addr_t iaddr;
char iaddr_str[16]; char iaddr_str[16];
char rhost[32]; char rhost[32];
int r;
if(priv_delete_redirect_rule(ifname, eport, proto, &iport, &iaddr, rhost, sizeof(rhost)) < 0) r = priv_delete_redirect_rule_check_desc(ifname, eport, proto, &iport, &iaddr, rhost, sizeof(rhost), 1, desc);
if(r < 0)
return -1; return -1;
if(r == 1) {
/* only change timestamp */
remove_timestamp_entry(eport, proto);
add_timestamp_entry(eport, proto, timestamp);
return 0;
}
if (priv_delete_filter_rule(ifname, iport, proto, iaddr) < 0) if (priv_delete_filter_rule(ifname, iport, proto, iaddr) < 0)
return -1; return -1;