Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-04 15:15:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix hidden node crashing at the startup, caused by calling uninitialized objects.

Browse source
This commit is contained in:
hunbernd 2020-06-21 21:55:52 +02:00
parent 891d7e7c9a
commit 6863f4cc70
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libretroshare/src/pqi/p3netmgr.cc
View file

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

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

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