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

added retrotor option in global .pri, and TorControl code

Browse source
This commit is contained in:
csoler 2017-12-21 10:43:28 +01:00
parent c0951b301e
commit 5ca2d5e27b
39 changed files with 5617 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

26
retroshare-gui/src/main.cpp
View file

@ -46,6 +46,10 @@
#include "lang/languagesupport.h"
#include "util/RsGxsUpdateBroadcast.h"
#ifdef RETROTOR
#include "TorControl/TorManager.h"
#endif
#include "retroshare/rsidentity.h"
#ifdef SIGFPE_DEBUG
@ -274,8 +278,26 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
RshareSettings::Create ();
/* Setup The GUI Stuff */
Rshare rshare(args, argc, argv,
QString::fromUtf8(RsAccounts::ConfigDirectory().c_str()));
Rshare rshare(args, argc, argv, QString::fromUtf8(RsAccounts::ConfigDirectory().c_str()));
#ifdef RETROTOR
// Start the Tor engine, and make sure it provides a viable hidden service
/* Tor control manager */
Tor::TorManager *torManager = Tor::TorManager::instance();
torManager->setDataDirectory(Rshare::dataDirectory() + QString("/tor/"));
//torManager->setDataDirectory(QString("./tor"));//settings->filePath()).path() + QString("/tor/"));
Tor::TorControl *torControl = torManager->control();
torManager->start();
while(torManager->configurationNeeded())
{
usleep(1000*1000) ;
// we should display some configuration window here!
}
#endif
/* Start RetroShare */
QSplashScreen splashScreen(QPixmap(":/images/logo/logo_splash.png")/* , Qt::WindowStaysOnTopHint*/);