Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1381 from G10h4ck/conservative_ext_port

Browse Source 
Avoid external port being reset without necessity
This commit is contained in:
G10h4ck 2018-10-27 19:46:43 +02:00 committed by GitHub
commit b603b9b4c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libretroshare/src/pqi/p3netmgr.cc
View File

@ -689,6 +689,7 @@ void p3NetMgrIMPL::netExtCheck()
{ {
RS_STACK_MUTEX(mNetMtx); RS_STACK_MUTEX(mNetMtx);
bool isStable = false; bool isStable = false;
sockaddr_storage tmpip; sockaddr_storage tmpip;
@ -782,8 +783,7 @@ void p3NetMgrIMPL::netExtCheck()
#if defined(NETMGR_DEBUG_TICK) || defined(NETMGR_DEBUG_RESET) #if defined(NETMGR_DEBUG_TICK) || defined(NETMGR_DEBUG_RESET)
std::cerr << "p3NetMgrIMPL::netExtCheck() Ext supplied by ExtAddrFinder" << std::endl; std::cerr << "p3NetMgrIMPL::netExtCheck() Ext supplied by ExtAddrFinder" << std::endl;
#endif #endif
/* best guess at port */ sockaddr_storage_setport(tmpip, guessNewExtPort());
sockaddr_storage_setport(tmpip, sockaddr_storage_port(mLocalAddr));
#if defined(NETMGR_DEBUG_TICK) || defined(NETMGR_DEBUG_RESET) #if defined(NETMGR_DEBUG_TICK) || defined(NETMGR_DEBUG_RESET)
std::cerr << "p3NetMgrIMPL::netExtCheck() "; std::cerr << "p3NetMgrIMPL::netExtCheck() ";
@ -823,9 +823,7 @@ void p3NetMgrIMPL::netExtCheck()
#if defined(NETMGR_DEBUG_TICK) || defined(NETMGR_DEBUG_RESET) #if defined(NETMGR_DEBUG_TICK) || defined(NETMGR_DEBUG_RESET)
std::cerr << "p3NetMgrIMPL::netExtCheck() Ext supplied by ExtAddrFinder" << std::endl; std::cerr << "p3NetMgrIMPL::netExtCheck() Ext supplied by ExtAddrFinder" << std::endl;
#endif #endif
/* best guess at port */ sockaddr_storage_setport(tmpaddr, guessNewExtPort());
sockaddr_storage_setport( tmpaddr,
sockaddr_storage_port(mLocalAddr) );
#if defined(NETMGR_DEBUG_TICK) || defined(NETMGR_DEBUG_RESET) #if defined(NETMGR_DEBUG_TICK) || defined(NETMGR_DEBUG_RESET)
std::cerr << "p3NetMgrIMPL::netExtCheck() "; std::cerr << "p3NetMgrIMPL::netExtCheck() ";
@ -1121,26 +1119,34 @@ bool p3NetMgrIMPL::checkNetAddress()
addrChanged = true; addrChanged = true;
} }
/* if localaddr = serveraddr, then ensure that the ports #if DEAD_CODE
/* Enabling this piece of code breaks setup where an additional BOFH
* overlooked port like 80 or 443 is manually forwarded to RetroShare to
* avoid restrictive firewals.
* In the case of a real mismatch, it is not really problematic, as our
* peers would get and then attempt to connect also to the right port.
*/
/* if localaddr == serveraddr, then ensure that the ports
* are the same (modify server)... this mismatch can * are the same (modify server)... this mismatch can
* occur when the local port is changed.... * occur when the local port is changed....
*/ */
if (sockaddr_storage_sameip(mLocalAddr, mExtAddr) && sockaddr_storage_port(mLocalAddr) != sockaddr_storage_port(mExtAddr)) if ( sockaddr_storage_sameip(mLocalAddr, mExtAddr)
&& sockaddr_storage_port(mLocalAddr) != sockaddr_storage_port(mExtAddr) )
{ {
#ifdef NETMGR_DEBUG_RESET #ifdef NETMGR_DEBUG_RESET
std::cerr << "p3NetMgrIMPL::checkNetAddress() local and external ports are not the same. Setting external port to " << sockaddr_storage_port(mLocalAddr) << std::endl; std::cerr << __PRETTY_FUNCTION__ << " local and external ports are"
<< " not the same. Setting external port to "
<< sockaddr_storage_port(mLocalAddr) << std::endl;
#endif #endif
sockaddr_storage_setport(mExtAddr, sockaddr_storage_port(mLocalAddr)); sockaddr_storage_setport(mExtAddr, sockaddr_storage_port(mLocalAddr));
addrChanged = true; addrChanged = true;
} }
#endif // DEAD_CODE
// ensure that address family is set, otherwise windows Barfs.
//mLocalAddr.sin_family = AF_INET;
//mExtAddr.sin_family = AF_INET;
#ifdef NETMGR_DEBUG_TICK #ifdef NETMGR_DEBUG_TICK
std::cerr << "p3NetMgrIMPL::checkNetAddress() Final Local Address: " << sockaddr_storage_tostring(mLocalAddr); std::cerr << __PRETTY_FUNCTION__ << " Final Local Address: "
std::cerr << std::endl; << sockaddr_storage_tostring(mLocalAddr) << std::endl;
#endif #endif
} }
@ -1997,8 +2003,7 @@ void p3NetMgrIMPL::updateNetStateBox_startup()
bool extFinderOk = mExtAddrFinder->hasValidIP(tmpip); bool extFinderOk = mExtAddrFinder->hasValidIP(tmpip);
if (extFinderOk) if (extFinderOk)
{ {
/* best guess at port */ sockaddr_storage_setport(tmpip, guessNewExtPort());
sockaddr_storage_setport(tmpip, sockaddr_storage_port(mNetFlags.mLocalAddr));
#ifdef NETMGR_DEBUG_STATEBOX #ifdef NETMGR_DEBUG_STATEBOX
std::cerr << "p3NetMgrIMPL::updateNetStateBox_startup() "; std::cerr << "p3NetMgrIMPL::updateNetStateBox_startup() ";

16
libretroshare/src/pqi/p3netmgr.h
View File

@ -301,7 +301,21 @@ void netUnreachableCheck();
void updateNetStateBox_temporal(); void updateNetStateBox_temporal();
void updateNetStateBox_startup(); void updateNetStateBox_startup();
void updateNetStateBox_reset(); void updateNetStateBox_reset();
void updateNatSetting(); void updateNatSetting();
/** Conservatively guess new external port, previous approach (aka always
* reset it to local port) break setups where external manually
* forwarded port is different then local port. A common case is having
* SSLH listening on port 80 on the router with public IP forwanding
* plain HTTP connections to a web server and --anyprot connections to
* retroshare to make censor/BOFH/bad firewall life a little more
* difficult */
uint16_t guessNewExtPort()
{
uint16_t newExtPort = sockaddr_storage_port(mExtAddr);
if(!newExtPort) newExtPort = sockaddr_storage_port(mLocalAddr);
return newExtPort;
}
private: private:
// These should have there own Mutex Protection, // These should have there own Mutex Protection,