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

Merge branch '529-port-triggering-openbsd' 

fixes #529
This commit is contained in:
Thomas Bernard 2022-06-02 01:19:53 +02:00
parent b734f94bdf 2ede47be46
commit 1cdf9ba744
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
miniupnpd/pf/obsdrdr.c
View File

@ -33,11 +33,12 @@
* - USE_IFNAME_IN_RULES * - USE_IFNAME_IN_RULES
* If set the interface name is set in the rule. * If set the interface name is set in the rule.
* - PFRULE_INOUT_COUNTS * - PFRULE_INOUT_COUNTS
* Must be set with OpenBSD version 3.8 and up. * Must be set with OpenBSD version 3.8 and up, FreeBSD 7.0+, DragonFly 2.8+
* and OS X with pf.
* - PFRULE_HAS_RTABLEID * - PFRULE_HAS_RTABLEID
* Must be set with OpenBSD version 4.0 and up. * Must be set with OpenBSD version 4.0 and up.
* - PF_NEWSSTYLE * - PF_NEWSTYLE
* Must be set with OpenBSD version 4.7 and up. * Must be set with OpenBSD version 4.7 and up. FreeBSD/pfSense is old style.
*/ */
#include <sys/types.h> #include <sys/types.h>
@ -350,7 +351,12 @@ int add_nat_rule(const char * ifname,
pcr.rule.src.addr.type = PF_ADDR_ADDRMASK; pcr.rule.src.addr.type = PF_ADDR_ADDRMASK;
pcr.rule.dst.addr.type = PF_ADDR_ADDRMASK; pcr.rule.dst.addr.type = PF_ADDR_ADDRMASK;
#ifndef PF_NEWSTYLE
pcr.rule.action = PF_NAT; pcr.rule.action = PF_NAT;
#else
pcr.rule.action = PF_PASS; /* or PF_MATCH as we dont expect outbound packets to be blocked */
pcr.rule.direction = PF_OUT;
#endif
pcr.rule.af = AF_INET; pcr.rule.af = AF_INET;
#ifdef USE_IFNAME_IN_RULES #ifdef USE_IFNAME_IN_RULES
if(ifname) if(ifname)
@ -465,7 +471,12 @@ delete_nat_rule(const char * ifname, unsigned short iport, int proto, in_addr_t
} }
memset(&pr, 0, sizeof(pr)); memset(&pr, 0, sizeof(pr));
strlcpy(pr.anchor, anchor_name, MAXPATHLEN); strlcpy(pr.anchor, anchor_name, MAXPATHLEN);
#ifndef PF_NEWSTYLE
pr.rule.action = PF_NAT; pr.rule.action = PF_NAT;
#else
pr.rule.action = PF_PASS; /* or PF_MATCH as we dont expect outbound packets to be blocked */
pr.rule.direction = PF_OUT;
#endif
if(ioctl(dev, DIOCGETRULES, &pr) < 0) if(ioctl(dev, DIOCGETRULES, &pr) < 0)
{ {
syslog(LOG_ERR, "ioctl(dev, DIOCGETRULES, ...): %m"); syslog(LOG_ERR, "ioctl(dev, DIOCGETRULES, ...): %m");