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

Merge pull request #2017 from hunbernd/fix/torstartup

Browse Source 
Fix hidden node crashing at the startup
This commit is contained in:
csoler 2020-06-21 22:42:38 +02:00 committed by GitHub
commit 947b2a3f51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libretroshare/src/pqi/p3netmgr.cc
View File

@ -1803,8 +1803,9 @@ void p3NetMgrIMPL::updateNatSetting()
#endif
#ifdef RS_USE_DHT_STUNNER
switch(natType)
{
if (mProxyStunner) {
switch(natType)
{
case RSNET_NATTYPE_RESTRICTED_CONE:
{
if ((natHole == RSNET_NATHOLE_NONE) || (natHole == RSNET_NATHOLE_UNKNOWN))
@ -1826,6 +1827,7 @@ void p3NetMgrIMPL::updateNatSetting()
mProxyStunner->setRefreshPeriod(NET_STUNNER_PERIOD_SLOW);
break;
}
}
#endif // RS_USE_DHT_STUNNER

4
libretroshare/src/pqi/p3netmgr.h
View File

@ -291,8 +291,8 @@ private:
//p3BitDht *mBitDht;
#ifdef RS_USE_DHT_STUNNER
pqiAddrAssist *mDhtStunner;
pqiAddrAssist *mProxyStunner;
pqiAddrAssist *mDhtStunner = nullptr;
pqiAddrAssist *mProxyStunner = nullptr;
#endif // RS_USE_DHT_STUNNER
RsMutex mNetMtx; /* protects below */