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

only load hidden nodes in retro-only mode

Browse source
This commit is contained in:
csoler 2017-12-21 21:34:51 +01:00
parent 5b5a2bef81
commit f5ce711ad6
5 changed files with 46 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

1
retroshare-gui/src/TorControl/TorManager.cpp
View file

@ -118,6 +118,7 @@ QString TorManager::dataDirectory() const
void TorManager::setDataDirectory(const QString &path)
{
d->dataDir = QDir::fromNativeSeparators(path);
if (!d->dataDir.isEmpty() && !d->dataDir.endsWith(QLatin1Char('/')))
d->dataDir.append(QLatin1Char('/'));
}

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

@ -289,21 +289,25 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
torManager->setDataDirectory(Rshare::dataDirectory() + QString("/tor/"));
torManager->start();
TorControlDialog tcd(torManager) ;
tcd.show();
// We do not need to show this dialog. If too much of a pain, we may hide it and only show when it reports an error.
while(tcd.checkForTor() == TorControlDialog::TOR_STATUS_UNKNOWN) // runs until some status is reached: either tor works, or it fails.
{
QCoreApplication::processEvents();
usleep(1000) ;
}
TorControlDialog tcd(torManager) ;
tcd.show();
tcd.hide();
while(tcd.checkForTor() == TorControlDialog::TOR_STATUS_UNKNOWN) // runs until some status is reached: either tor works, or it fails.
{
QCoreApplication::processEvents();
usleep(1000) ;
}
if(tcd.checkForTor() != TorControlDialog::TOR_STATUS_OK)
{
QMessageBox::critical(NULL,QObject::tr("Tor not found!"),QObject::tr("Tor wasn't found on your system. Please install it and re-start Retroshare.")) ;
return 1 ;
tcd.hide();
if(tcd.checkForTor() != TorControlDialog::TOR_STATUS_OK)
{
QMessageBox::critical(NULL,QObject::tr("Tor not found!"),QObject::tr("Tor wasn't found on your system. Please install it and re-start Retroshare.")) ;
return 1 ;
}
}
#endif
@ -374,22 +378,25 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
#ifdef RETROTOR
// Now that we know the Tor service running, and we know the SSL id, we can make sure it provides a viable hidden service
/* Tor control manager */
tcd.show();
while(tcd.checkForHiddenService() == TorControlDialog::HIDDEN_SERVICE_STATUS_UNKNOWN) // runs until some status is reached: either tor works, or it fails.
{
QCoreApplication::processEvents();
usleep(1000) ;
}
torManager->setDataDirectory(Rshare::dataDirectory() + QString("/tor/")); // re-set it, because now it's changed to the specific location that is run
tcd.hide();
TorControlDialog tcd(torManager) ;
tcd.show();
if(tcd.checkForHiddenService() != TorControlDialog::HIDDEN_SERVICE_STATUS_OK)
{
QMessageBox::critical(NULL,QObject::tr("Cannot start a hidden tor service!"),QObject::tr("It was not possible to start a hidden service.")) ;
return 1 ;
while(tcd.checkForHiddenService() == TorControlDialog::HIDDEN_SERVICE_STATUS_UNKNOWN) // runs until some status is reached: either tor works, or it fails.
{
QCoreApplication::processEvents();
usleep(1000) ;
}
tcd.hide();
if(tcd.checkForHiddenService() != TorControlDialog::HIDDEN_SERVICE_STATUS_OK)
{
QMessageBox::critical(NULL,QObject::tr("Cannot start a hidden tor service!"),QObject::tr("It was not possible to start a hidden service.")) ;
return 1 ;
}
}
#endif