mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-12-15 10:54:22 -05:00
improved stun check
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1767 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
06c1c0f59f
commit
cf157422f5
@ -1043,18 +1043,23 @@ bool p3ConnectMgr::stunCheck()
|
||||
if (0 < tou_extaddr((struct sockaddr *) &raddr, &rlen, &stable))
|
||||
{
|
||||
RsStackMutex stack(connMtx); /****** STACK LOCK MUTEX *******/
|
||||
mStunAddrStable = (stable != 0);
|
||||
|
||||
if ((mStunExtAddr.sin_addr.s_addr != raddr.sin_addr.s_addr) ||
|
||||
(mStunAddrStable != stable))
|
||||
(mStunAddrStable != true))
|
||||
{
|
||||
#ifdef CONN_DEBUG
|
||||
std::cerr << "Ext Address Changed -> netReset" << std::endl;
|
||||
std::cerr << "mStunExtAddr.sin_addr.s_addr : " << inet_ntoa(mStunExtAddr.sin_addr) << std::endl;
|
||||
std::cerr << "raddr.sin_addr.s_addr : " << inet_ntoa(raddr.sin_addr) << std::endl;
|
||||
std::cerr << "mStunAddrStable : " << mStunAddrStable << std::endl;
|
||||
#endif
|
||||
|
||||
doNetReset = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
netFlagUdpOk = true;
|
||||
|
||||
#ifdef CONN_DEBUG
|
||||
std::cerr << "Ext Address Same: ok!" << std::endl;
|
||||
#endif
|
||||
@ -1070,6 +1075,7 @@ bool p3ConnectMgr::stunCheck()
|
||||
if (upnpExtAdress) {
|
||||
//don't do a reset
|
||||
mStunExtAddr = extAddr;
|
||||
netFlagUdpOk = false;
|
||||
#ifdef CONN_DEBUG
|
||||
std::cerr << "Found upnp Ext Address. don't do a reset." << std::endl;
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user