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

i2p: bob: add option to disable bob CONFIG+=no_rs_bob

Browse Source
This commit is contained in:
sehraf 2020-05-25 21:51:06 +02:00
parent 9a5504bb47
commit a5a2b49d99
No known key found for this signature in database
GPG Key ID: DF09F6EAE356B2C6
4 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretroshare/src/rsserver/p3face.h
View File

@ -161,7 +161,9 @@ public:
p3ChatService *chatSrv; p3ChatService *chatSrv;
p3StatusService *mStatusSrv; p3StatusService *mStatusSrv;
p3GxsTunnelService *mGxsTunnels; p3GxsTunnelService *mGxsTunnels;
#ifdef RS_USE_I2P_BOB
p3I2pBob *mI2pBob; p3I2pBob *mI2pBob;
#endif
// This list contains all threaded services. It will be used to shut them down properly. // This list contains all threaded services. It will be used to shut them down properly.

6
libretroshare/src/rsserver/rsinit.cc
View File

@ -923,8 +923,10 @@ int RsServer::StartupRetroShare()
mNetMgr->setManagers(mPeerMgr, mLinkMgr); mNetMgr->setManagers(mPeerMgr, mLinkMgr);
rsAutoProxyMonitor *autoProxy = rsAutoProxyMonitor::instance(); rsAutoProxyMonitor *autoProxy = rsAutoProxyMonitor::instance();
#ifdef RS_USE_I2P_BOB
mI2pBob = new p3I2pBob(mPeerMgr); mI2pBob = new p3I2pBob(mPeerMgr);
autoProxy->addProxy(autoProxyType::I2PBOB, mI2pBob); autoProxy->addProxy(autoProxyType::I2PBOB, mI2pBob);
#endif
//load all the SSL certs as friends //load all the SSL certs as friends
// std::list<std::string> sslIds; // std::list<std::string> sslIds;
@ -1649,7 +1651,9 @@ int RsServer::StartupRetroShare()
mConfigMgr->addConfiguration("wire.cfg", wire_ns); mConfigMgr->addConfiguration("wire.cfg", wire_ns);
#endif #endif
#endif //RS_ENABLE_GXS #endif //RS_ENABLE_GXS
#ifdef RS_USE_I2P_BOB
mConfigMgr->addConfiguration("I2PBOB.cfg", mI2pBob); mConfigMgr->addConfiguration("I2PBOB.cfg", mI2pBob);
#endif
mPluginsManager->addConfigurations(mConfigMgr) ; mPluginsManager->addConfigurations(mConfigMgr) ;
@ -1795,7 +1799,9 @@ int RsServer::StartupRetroShare()
/**************************************************************************/ /**************************************************************************/
// auto proxy threads // auto proxy threads
#ifdef RS_USE_I2P_BOB
startServiceThread(mI2pBob, "I2P-BOB"); startServiceThread(mI2pBob, "I2P-BOB");
#endif
#ifdef RS_ENABLE_GXS #ifdef RS_ENABLE_GXS
// Must Set the GXS pointers before starting threads. // Must Set the GXS pointers before starting threads.

4
retroshare-gui/src/gui/settings/ServerPage.cpp
View File

@ -83,6 +83,10 @@ ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags)
manager = NULL ; manager = NULL ;
mOngoingConnectivityCheck = -1; mOngoingConnectivityCheck = -1;
#ifndef RS_USE_I2P_BOB
ui.hiddenServiceTab->removeTab(TAB_HIDDEN_SERVICE_I2P_BOB); // warning: the order of operation here is very important.
#endif
if(RsAccounts::isHiddenNode()) if(RsAccounts::isHiddenNode())
{ {
if(RsAccounts::isTorAuto()) if(RsAccounts::isTorAuto())

9
retroshare.pri
View File

@ -140,6 +140,11 @@ rs_macos10.15:CONFIG -= rs_macos10.11
CONFIG *= no_rs_jsonapi CONFIG *= no_rs_jsonapi
rs_jsonapi:CONFIG -= no_rs_jsonapi rs_jsonapi:CONFIG -= no_rs_jsonapi
# Disable i2p BOB support for automatically setting up an i2p tunnel for RS
# "CONFIG+=no_rs_bob"
CONFIG *= rs_bob
no_rs_bob:CONFIG -= rs_bob
# To enable channel indexing append the following assignation to qmake command # To enable channel indexing append the following assignation to qmake command
# line "CONFIG+=rs_deep_channel_index" # line "CONFIG+=rs_deep_channel_index"
CONFIG *= no_rs_deep_channel_index CONFIG *= no_rs_deep_channel_index
@ -550,6 +555,10 @@ rs_webui {
DEFINES *= RS_WEBUI DEFINES *= RS_WEBUI
} }
rs_bob {
DEFINES *= RS_USE_I2P_BOB
}
rs_deep_channels_index:DEFINES *= RS_DEEP_CHANNEL_INDEX rs_deep_channels_index:DEFINES *= RS_DEEP_CHANNEL_INDEX
rs_deep_files_index:DEFINES *= RS_DEEP_FILES_INDEX rs_deep_files_index:DEFINES *= RS_DEEP_FILES_INDEX