mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-11 18:45:17 -04:00
added double check in ext IP hack to avoid re-calling UpdateOwnAdress()
This commit is contained in:
parent
d87de5121a
commit
6c83b5cd27
1 changed files with 2 additions and 2 deletions
|
@ -469,13 +469,13 @@ void p3NetMgrIMPL::netStatusTick()
|
||||||
if(netStatus <= RS_NET_UPNP_SETUP && mUseExtAddrFinder)
|
if(netStatus <= RS_NET_UPNP_SETUP && mUseExtAddrFinder)
|
||||||
{
|
{
|
||||||
sockaddr_storage tmpip;
|
sockaddr_storage tmpip;
|
||||||
|
sockaddr_storage_setport(tmpip, guessNewExtPort());
|
||||||
|
|
||||||
if(mExtAddrFinder->hasValidIP(tmpip) && sockaddr_storage_ipv6_to_ipv4(tmpip))
|
if(mExtAddrFinder->hasValidIP(tmpip) && sockaddr_storage_ipv6_to_ipv4(tmpip) && !sockaddr_storage_same(tmpip,mExtAddr))
|
||||||
{
|
{
|
||||||
#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
|
||||||
sockaddr_storage_setport(tmpip, guessNewExtPort());
|
|
||||||
|
|
||||||
#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() ";
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue