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

Code simplification and suppression of a bug in handling Relay connect attempt (Patch rom G10H4ck)

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7820 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2015-01-05 19:34:43 +00:00
parent 306d6852c2
commit 4704cc122d
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretroshare/src/dht/connectstatebox.cc
View File

@ -783,7 +783,7 @@ uint32_t PeerConnectStateBox::updateCb(uint32_t update)
{ {
case CSB_UPDATE_CONNECTED: case CSB_UPDATE_CONNECTED:
{ {
if ((mState == CSB_DIRECT_ATTEMPT) || (mState == CSB_PROXY_ATTEMPT) || (mState == CSB_PROXY_ATTEMPT)) if ((mState == CSB_DIRECT_ATTEMPT) || (mState == CSB_PROXY_ATTEMPT) || (mState == CSB_RELAY_ATTEMPT))
{ {
mAttemptLength = now - mStateTS; mAttemptLength = now - mStateTS;
} }

14
libretroshare/src/dht/p3bitdht_peernet.cc
View File

@ -718,20 +718,10 @@ int p3BitDht::ConnectCallback(const bdId *srcId, const bdId *proxyId, const bdId
mNetMgr->getNetworkMode(), mNetMgr->getNatHoleMode(), mNetMgr->getNatTypeMode())); mNetMgr->getNetworkMode(), mNetMgr->getNatHoleMode(), mNetMgr->getNatTypeMode()));
} }
if (exclusivePort)
{
#ifdef DEBUG_PEERNET #ifdef DEBUG_PEERNET
std::cerr << "dhtConnectionCallback: we Require Exclusive Proxy Port for connection"; if (exclusivePort) std::cerr << "dhtConnectionCallback: we Require Exclusive Proxy Port for connection" << std::endl;
std::cerr << std::endl; else std::cerr << "dhtConnectionCallback: Dont need Exclusive Proxy Port for connection" << std::endl;
#endif #endif
}
else
{
#ifdef DEBUG_PEERNET
std::cerr << "dhtConnectionCallback: Dont need Exclusive Proxy Port for connection";
std::cerr << std::endl;
#endif
}
connectOk = true; connectOk = true;
} }