Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-21 13:45:11 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

add reset net status when shutingdown

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1757 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2009-10-30 00:37:45 +00:00
parent 7fa24f4726
commit 54276344ad
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,7 @@ const uint32_t RS_STUN_FOUND_MIN = 10;
const uint32_t MAX_UPNP_INIT = 100; /* seconds UPnP timeout */ const uint32_t MAX_UPNP_INIT = 100; /* seconds UPnP timeout */
const uint32_t MAX_UDP_INIT = 120; /* seconds Udp timeout */ const uint32_t MAX_UDP_INIT = 120; /* seconds Udp timeout */
const uint32_t MIN_TIME_BETWEEN_NET_RESET = 20; /* seconds Udp timeout */ const uint32_t MIN_TIME_BETWEEN_NET_RESET = 5;
/**** /****
* #define CONN_DEBUG 1 * #define CONN_DEBUG 1
@ -418,6 +418,12 @@ void p3ConnectMgr::tick()
bool p3ConnectMgr::shutdown() /* blocking shutdown call */ bool p3ConnectMgr::shutdown() /* blocking shutdown call */
{ {
{
RsStackMutex stack(connMtx); /****** STACK LOCK MUTEX *******/
mNetStatus = RS_NET_UNKNOWN;
mNetInitTS = time(NULL);
netStatusReset();
}
netAssistFirewallShutdown(); netAssistFirewallShutdown();
netAssistConnectShutdown(); netAssistConnectShutdown();
@ -993,7 +999,6 @@ void p3ConnectMgr::stunInit()
* The status is passed onto the DHT. * The status is passed onto the DHT.
* *
*/ */
bool p3ConnectMgr::stunCheck() bool p3ConnectMgr::stunCheck()
{ {