ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-01-11 15:33:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

testing

Browse Source
This commit is contained in:
travisladuke 2023-08-11 08:41:13 -07:00 committed by Travis LaDuke
parent b81ad9a84d
commit f2060e0c76
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
osdep/PortMapper.cpp
View File

@ -14,7 +14,7 @@
#ifdef ZT_USE_MINIUPNPC #ifdef ZT_USE_MINIUPNPC
// Uncomment to dump debug messages // Uncomment to dump debug messages
//#define ZT_PORTMAPPER_TRACE 1 #define ZT_PORTMAPPER_TRACE 1
#ifdef __ANDROID__ #ifdef __ANDROID__
#include <android/log.h> #include <android/log.h>
@ -87,23 +87,25 @@ public:
while (run) { while (run) {
// use initnatpmp to check if we can bind a port at all {
natpmp_t _natpmp; // use initnatpmp to check if we can bind a port at all
int result = initnatpmp(&_natpmp,0,0); natpmp_t _natpmp;
if (result !=0 ) { int result = initnatpmp(&_natpmp,0,0);
closenatpmp(&_natpmp); if (result == NATPMP_ERR_CANNOTGETGATEWAY || result == NATPMP_ERR_SOCKETERROR) {
closenatpmp(&_natpmp);
#ifdef ZT_PORTMAPPER_TRACE #ifdef ZT_PORTMAPPER_TRACE
PM_TRACE("PortMapper: init failed %d. You might not have any IP addresses yet. Trying again in %d" ZT_EOL_S, retrytime); PM_TRACE("PortMapper: init failed %d. You might not have an internet connection yet. Trying again in %d" ZT_EOL_S, result, retrytime);
#endif #endif
Thread::sleep(retrytime); Thread::sleep(retrytime);
retrytime = retrytime * 2; retrytime = retrytime * 2;
if (retrytime > ZT_PORTMAPPER_REFRESH_DELAY / 10) { if (retrytime > ZT_PORTMAPPER_REFRESH_DELAY / 10) {
retrytime = ZT_PORTMAPPER_REFRESH_DELAY / 10; retrytime = ZT_PORTMAPPER_REFRESH_DELAY / 10;
}
continue;
} else {
closenatpmp(&_natpmp);
retrytime = 500;
} }
continue;
} else {
closenatpmp(&_natpmp);
retrytime = 500;
} }
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
// NAT-PMP mode (preferred) // NAT-PMP mode (preferred)
@ -313,7 +315,6 @@ public:
#ifdef ZT_PORTMAPPER_TRACE #ifdef ZT_PORTMAPPER_TRACE
PM_TRACE("PortMapper: upnpDiscover failed, returning to NAT-PMP mode: %d" ZT_EOL_S,upnpError); PM_TRACE("PortMapper: upnpDiscover failed, returning to NAT-PMP mode: %d" ZT_EOL_S,upnpError);
#endif #endif
break;
} }
} }
// --------------------------------------------------------------------- // ---------------------------------------------------------------------