Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-27 08:29:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

less call to extFinderAddr

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1820 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2009-11-12 22:19:25 +00:00
parent 8128f0b2ea
commit 8168be6828
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libretroshare/src/pqi/p3connmgr.cc
View File

@ -523,11 +523,6 @@ void p3ConnectMgr::netTick()
connMtx.unlock(); /* UNLOCK MUTEX */ connMtx.unlock(); /* UNLOCK MUTEX */
//tick the extra adress finder
if ((netStatus > RS_NET_UNKNOWN) && use_extr_addr_finder && !netFlagExtraAddressCheckOk) {
netExtraAddressCheck();
}
switch(netStatus) switch(netStatus)
{ {
case RS_NET_NEED_RESET: case RS_NET_NEED_RESET:
@ -565,6 +560,9 @@ void p3ConnectMgr::netTick()
//std::cerr << "p3ConnectMgr::netTick() STATUS: DONE" << std::endl; //std::cerr << "p3ConnectMgr::netTick() STATUS: DONE" << std::endl;
#endif #endif
stunCheck(); /* Keep on stunning */ stunCheck(); /* Keep on stunning */
if (!netFlagStunOk) {
netExtraAddressCheck();
}
break; break;
@ -709,7 +707,6 @@ void p3ConnectMgr::networkConsistencyCheck()
bool doNetReset = false; bool doNetReset = false;
//if one of the flag is degrated from true to false during last tick, let's do a reset //if one of the flag is degrated from true to false during last tick, let's do a reset
//storing old flags
#ifdef CONN_DEBUG #ifdef CONN_DEBUG
std::cerr << "p3ConnectMgr::networkConsistencyCheck() net flags : " << std::endl; std::cerr << "p3ConnectMgr::networkConsistencyCheck() net flags : " << std::endl;
std::cerr << " oldnetFlagLocalOk : " << oldnetFlagLocalOk << ". netFlagLocalOk : " << netFlagLocalOk << "." << std::endl; std::cerr << " oldnetFlagLocalOk : " << oldnetFlagLocalOk << ". netFlagLocalOk : " << netFlagLocalOk << "." << std::endl;
@ -729,7 +726,7 @@ void p3ConnectMgr::networkConsistencyCheck()
#endif #endif
//don't do a normal shutdown for upnp as it might hang up. //don't do a normal shutdown for upnp as it might hang up.
//With a 0 port it will just dereference and not attemps to communicate for shutting upnp session. //With a 0 port it will just dereference and not attemps to communicate for shutting down upnp session.
netAssistFirewallPorts(0, 0); netAssistFirewallPorts(0, 0);
doNetReset = true; doNetReset = true;
@ -752,14 +749,14 @@ void p3ConnectMgr::networkConsistencyCheck()
ownState.currentserveraddr = extAddr; ownState.currentserveraddr = extAddr;
} else { } else {
//call the extrafinder address //call the extrafinder address
if (getExtFinderExtAddress(extAddr)) { if (getUpnpExtAddress(extAddr)) {
#ifdef CONN_DEBUG #ifdef CONN_DEBUG
std::cerr << "p3ConnectMgr::networkConsistencyCheck() using External address finder for ownState.serveraddr." << std::endl; std::cerr << "p3ConnectMgr::networkConsistencyCheck() using getUpnpExtAddress for ownState.serveraddr." << std::endl;
#endif #endif
ownState.currentserveraddr = extAddr; ownState.currentserveraddr = extAddr;
} else if (getUpnpExtAddress(extAddr)) { } else if (getExtFinderExtAddress(extAddr)) {
#ifdef CONN_DEBUG #ifdef CONN_DEBUG
std::cerr << "p3ConnectMgr::networkConsistencyCheck() using UPNP for ownState.serveraddr." << std::endl; std::cerr << "p3ConnectMgr::networkConsistencyCheck() using getExtFinderExtAddress for ownState.serveraddr." << std::endl;
#endif #endif
ownState.currentserveraddr = extAddr; ownState.currentserveraddr = extAddr;
} else { } else {
@ -799,7 +796,7 @@ void p3ConnectMgr::networkConsistencyCheck()
void p3ConnectMgr::netExtraAddressCheck() void p3ConnectMgr::netExtraAddressCheck()
{ struct sockaddr_in tmpip; { struct sockaddr_in tmpip;
if (use_extr_addr_finder && mExtAddrFinder->hasValidIP(&tmpip)) { if (getExtFinderExtAddress(tmpip)) {
#ifdef CONN_DEBUG #ifdef CONN_DEBUG
std::cerr << "p3ConnectMgr::netExtraAddressCheck() return true" << std::endl; std::cerr << "p3ConnectMgr::netExtraAddressCheck() return true" << std::endl;
#endif #endif