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

remove ifname arg from addmasqueraderule() 

also improve comment and remove useless log :)
This commit is contained in:
Thomas Bernard 2016-01-28 22:16:07 +01:00
parent 40aa39679f
commit 3284d113c7
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
miniupnpd/netfilter/iptcrdr.c
View File

@ -76,7 +76,7 @@ static int
addmasqueraderule(int proto, addmasqueraderule(int proto,
unsigned short eport, unsigned short eport,
const char * iaddr, unsigned short iport, const char * iaddr, unsigned short iport,
const char * rhost, const char * extif); const char * rhost/*, const char * extif*/);
static int static int
addpeernatrule(int proto, addpeernatrule(int proto,
@ -230,8 +230,8 @@ add_redirect_rule2(const char * ifname,
r = addnatrule(proto, eport, iaddr, iport, rhost); r = addnatrule(proto, eport, iaddr, iport, rhost);
if(r >= 0) { if(r >= 0) {
add_redirect_desc(eport, proto, desc, timestamp); add_redirect_desc(eport, proto, desc, timestamp);
r = addmasqueraderule(proto, eport, iaddr, iport, rhost, ifname); r = addmasqueraderule(proto, eport, iaddr, iport, rhost/*, ifname*/);
if(r <= 0) { if(r < 0) {
syslog(LOG_NOTICE, "add_redirect_rule2(): addmasqueraderule returned %d", r); syslog(LOG_NOTICE, "add_redirect_rule2(): addmasqueraderule returned %d", r);
} }
} }
@ -1173,14 +1173,19 @@ addnatrule(int proto, unsigned short eport,
/* for "Port Triggering" /* for "Port Triggering"
* Section 2.5.16 figure 2.2 in UPnP-gw-WANIPConnection-v2-Service.pdf * Section 2.5.16 figure 2.2 in UPnP-gw-WANIPConnection-v2-Service.pdf
* iptables -t nat -A MINIUPNPD-POSTROUTING -o <extif> -s <iaddr> *
* When a control point creates a port forwarding rule with AddPortMapping()
* action for inbound traffic , this rule MUST also be applied when NAT port
* triggering occurs for outbound traffic.
*
* iptables -t nat -A MINIUPNPD-POSTROUTING {-o <extif>} -s <iaddr>
* -p <proto> [-d <rhost>] --sport <iport> -j MASQUERADE --to-ports <eport> * -p <proto> [-d <rhost>] --sport <iport> -j MASQUERADE --to-ports <eport>
*/ */
static int static int
addmasqueraderule(int proto, addmasqueraderule(int proto,
unsigned short eport, unsigned short eport,
const char * iaddr, unsigned short iport, const char * iaddr, unsigned short iport,
const char * rhost, const char * extif) const char * rhost/*, const char * extif*/)
{ {
int r = 0; int r = 0;
struct ipt_entry * e; struct ipt_entry * e;
@ -1222,10 +1227,14 @@ addmasqueraderule(int proto,
e->next_offset = sizeof(struct ipt_entry) e->next_offset = sizeof(struct ipt_entry)
+ match->u.match_size + match->u.match_size
+ target->u.target_size; + target->u.target_size;
#if 0
/* do not add outiface (-o) to rule, as the MINIUPNPD-POSTROUTING chain
* should already have matched it */
if(extif != NULL) { if(extif != NULL) {
strncpy(e->ip.outiface, extif, sizeof(e->ip.outiface)); strncpy(e->ip.outiface, extif, sizeof(e->ip.outiface));
memset(e->ip.outiface_mask, 0xff, strlen(e->ip.outiface) + 1);/* Include nul-terminator in match */ memset(e->ip.outiface_mask, 0xff, strlen(e->ip.outiface) + 1);/* Include nul-terminator in match */
} }
#endif
/* internal host */ /* internal host */
if(iaddr && (iaddr[0] != '\0') && (0 != strcmp(iaddr, "*"))) if(iaddr && (iaddr[0] != '\0') && (0 != strcmp(iaddr, "*")))
{ {

2
miniupnpd/netfilter/testiptcrdr.c
View File

@ -40,7 +40,7 @@ main(int argc, char ** argv)
eport, iaddr, iport, proto); eport, iaddr, iport, proto);
if(addnatrule(proto, eport, iaddr, iport, NULL) < 0) if(addnatrule(proto, eport, iaddr, iport, NULL) < 0)
return -1; return -1;
r = addmasqueraderule(proto, eport, iaddr, iport, NULL, "ppp0"); r = addmasqueraderule(proto, eport, iaddr, iport, NULL);
syslog(LOG_DEBUG, "addmasqueraderule() returned %d", r); syslog(LOG_DEBUG, "addmasqueraderule() returned %d", r);
if(add_filter_rule(proto, NULL, iaddr, iport) < 0) if(add_filter_rule(proto, NULL, iaddr, iport) < 0)
return -1; return -1;