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

fixes in update_ext_ip_addr_from_stun() 

Signed-off-by: Thomas Bernard <miniupnp@free.fr>
This commit is contained in:
Thomas Bernard 2018-07-06 13:29:33 +02:00
parent 8bc6d6f556
commit 15b6f3e9c2
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
miniupnpd/miniupnpd.c
View File

@ -1052,8 +1052,6 @@ int update_ext_ip_addr_from_stun(int init)
return 1; return 1;
} }
syslog(LOG_INFO, "STUN: ... done");
if ((init || disable_port_forwarding) && !restrictive_nat) { if ((init || disable_port_forwarding) && !restrictive_nat) {
if (addr_is_reserved(&if_addr)) if (addr_is_reserved(&if_addr))
syslog(LOG_INFO, "STUN: ext interface %s with IP address %s is now behind unrestricted NAT 1:1 with public IP address %s: Port forwarding is now enabled", ext_if_name, if_addr_str, ext_addr_str); syslog(LOG_INFO, "STUN: ext interface %s with IP address %s is now behind unrestricted NAT 1:1 with public IP address %s: Port forwarding is now enabled", ext_if_name, if_addr_str, ext_addr_str);
@ -1061,8 +1059,11 @@ int update_ext_ip_addr_from_stun(int init)
syslog(LOG_INFO, "STUN: ext interface %s has now public IP address %s: Port forwarding is now enabled", ext_if_name, if_addr_str); syslog(LOG_INFO, "STUN: ext interface %s has now public IP address %s: Port forwarding is now enabled", ext_if_name, if_addr_str);
} else if ((init || !disable_port_forwarding) && restrictive_nat) { } else if ((init || !disable_port_forwarding) && restrictive_nat) {
syslog(LOG_INFO, "STUN: ext interface %s with IP address %s is now behind restrictive NAT with public IP address %s: Port forwarding is now impossible", ext_if_name, if_addr_str, ext_addr_str); syslog(LOG_INFO, "STUN: ext interface %s with IP address %s is now behind restrictive NAT with public IP address %s: Port forwarding is now impossible", ext_if_name, if_addr_str, ext_addr_str);
} else {
syslog(LOG_INFO, "STUN: ... done");
} }
use_ext_ip_addr = ext_addr_str;
disable_port_forwarding = restrictive_nat; disable_port_forwarding = restrictive_nat;
return 0; return 0;
} }
@ -2007,22 +2008,18 @@ main(int argc, char * * argv)
if(GETFLAG(PERFORMSTUNMASK)) if(GETFLAG(PERFORMSTUNMASK))
{ {
int ret = update_ext_ip_addr_from_stun(1); if (update_ext_ip_addr_from_stun(1) != 0) {
if (ret != 0) {
syslog(LOG_ERR, "Performing STUN failed. EXITING"); syslog(LOG_ERR, "Performing STUN failed. EXITING");
return 1; return 1;
} }
use_ext_ip_addr = ext_addr_str;
} }
else if (!use_ext_ip_addr) else if (!use_ext_ip_addr)
{ {
char if_addr[INET_ADDRSTRLEN]; char if_addr[INET_ADDRSTRLEN];
struct in_addr addr; struct in_addr addr;
if (getifaddr(ext_if_name, if_addr, INET_ADDRSTRLEN, &addr, NULL) < 0) { if (getifaddr(ext_if_name, if_addr, INET_ADDRSTRLEN, &addr, NULL) < 0) {
syslog(LOG_ERR, "Cannot get IP address for ext interface %s. EXITING", ext_if_name); syslog(LOG_WARNING, "Cannot get IP address for ext interface %s. Network is down", ext_if_name);
return 1; } else if (addr_is_reserved(&addr)) {
}
if (addr_is_reserved(&addr)) {
syslog(LOG_INFO, "Reserved / private IP address %s on ext interface %s: Port forwarding is impossible", if_addr, ext_if_name); syslog(LOG_INFO, "Reserved / private IP address %s on ext interface %s: Port forwarding is impossible", if_addr, ext_if_name);
syslog(LOG_INFO, "You are probably behind NAT, enable option ext_perform_stun=yes to detect public IP address"); syslog(LOG_INFO, "You are probably behind NAT, enable option ext_perform_stun=yes to detect public IP address");
disable_port_forwarding = 1; disable_port_forwarding = 1;