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

fixed running with TorControl in new mode

Browse source
This commit is contained in:
csoler 2018-07-25 15:31:18 +02:00
parent d1a375cbd0
commit 62b9a74324
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
3 changed files with 472 additions and 471 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libretroshare/src/rsserver/rsinit.cc
View file

@ -1574,10 +1574,6 @@ int RsServer::StartupRetroShare()
else
rsBanList = NULL ;
#ifdef RS_USE_BITDHT
mBitDht->setupPeerSharer(mBanList);
#endif
p3BandwidthControl *mBwCtrl = new p3BandwidthControl(pqih);
pqih -> addService(mBwCtrl, true);
@ -1593,6 +1589,8 @@ int RsServer::StartupRetroShare()
if(!RsAccounts::isHiddenNode())
{
#ifdef RS_USE_BITDHT
mBitDht->setupPeerSharer(mBanList);
mNetMgr->addNetAssistConnect(1, mBitDht);
mNetMgr->addNetListener(mDhtStack);
mNetMgr->addNetListener(mProxyStack);
@ -1649,7 +1647,7 @@ int RsServer::StartupRetroShare()
mConfigMgr->addConfiguration("p3Status.cfg" , mStatusSrv);
mConfigMgr->addConfiguration("turtle.cfg" , tr);
if(!RsAccounts::isHiddenNode())
if(mBanList != NULL)
mConfigMgr->addConfiguration("banlist.cfg" , mBanList);
mConfigMgr->addConfiguration("servicecontrol.cfg", serviceCtrl);
@ -1659,7 +1657,8 @@ int RsServer::StartupRetroShare()
#endif
#ifdef RS_USE_BITDHT
mConfigMgr->addConfiguration("bitdht.cfg" , mBitDht);
if(mBitDht != NULL)
mConfigMgr->addConfiguration("bitdht.cfg" , mBitDht);
#endif
#ifdef RS_ENABLE_GXS
@ -1886,7 +1885,8 @@ int RsServer::StartupRetroShare()
//mDhtMgr->start();
#ifdef RS_USE_BITDHT
mBitDht->start();
if(mBitDht != NULL)
mBitDht->start();
#endif
/**************************************************************************/