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

proper error handlign when Tor is not available

Browse Source
This commit is contained in:
csoler 2018-02-08 15:26:21 +01:00
parent 8f7582588a
commit faf45174c7
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
retroshare-gui/src/TorControl/TorControlWindow.cpp
View File

@ -24,6 +24,7 @@ TorControlDialog::TorControlDialog(Tor::TorManager *tm,QWidget *parent)
QObject::connect(tm->control(),SIGNAL(disconnected()),this,SLOT(statusChanged())); QObject::connect(tm->control(),SIGNAL(disconnected()),this,SLOT(statusChanged()));
QObject::connect(tm->control(),SIGNAL(bootstrapStatusChanged()),this,SLOT(statusChanged())); QObject::connect(tm->control(),SIGNAL(bootstrapStatusChanged()),this,SLOT(statusChanged()));
QObject::connect(tm->control(),SIGNAL(connectivityChanged()),this,SLOT(statusChanged())); QObject::connect(tm->control(),SIGNAL(connectivityChanged()),this,SLOT(statusChanged()));
QObject::connect(tm ,SIGNAL(errorChanged()),this,SLOT(statusChanged()));
//QTimer::singleShot(2000,this,SLOT(checkForHiddenService())) ; //QTimer::singleShot(2000,this,SLOT(checkForHiddenService())) ;
@ -58,6 +59,9 @@ void TorControlDialog::statusChanged()
QString tor_control_status_str,torstatus_str ; QString tor_control_status_str,torstatus_str ;
if(mTorManager->hasError())
mErrorMsg = mTorManager->errorMessage() ;
switch(tor_control_status) switch(tor_control_status)
{ {
default: default:
@ -149,8 +153,14 @@ void TorControlDialog::showLog()
std::cerr << "Connexion Proxy: " << mTorManager->control()->socksAddress().toString().toStdString() << ":" << mTorManager->control()->socksPort() << std::endl; std::cerr << "Connexion Proxy: " << mTorManager->control()->socksAddress().toString().toStdString() << ":" << mTorManager->control()->socksPort() << std::endl;
} }
TorControlDialog::TorStatus TorControlDialog::checkForTor() TorControlDialog::TorStatus TorControlDialog::checkForTor(QString& error_msg)
{ {
if(!mErrorMsg.isNull())
{
error_msg = mErrorMsg ;
return TorControlDialog::TOR_STATUS_FAIL ;
}
switch(mTorManager->control()->torStatus()) switch(mTorManager->control()->torStatus())
{ {
case Tor::TorControl::TorReady: rstime::rs_usleep(1*1000*1000);return TOR_STATUS_OK ; case Tor::TorControl::TorReady: rstime::rs_usleep(1*1000*1000);return TOR_STATUS_OK ;

3
retroshare-gui/src/TorControl/TorControlWindow.h
View File

@ -29,7 +29,7 @@ public:
// Should be called multiple times in a loop until it returns something else than *_UNKNOWN // Should be called multiple times in a loop until it returns something else than *_UNKNOWN
TorStatus checkForTor() ; TorStatus checkForTor(QString& error_msg) ;
HiddenServiceStatus checkForHiddenService() ; HiddenServiceStatus checkForHiddenService() ;
protected slots: protected slots:
@ -38,6 +38,7 @@ protected slots:
void onIncomingConnection(); void onIncomingConnection();
private: private:
QString mErrorMsg ;
HiddenServiceStatus mHiddenServiceStatus ; HiddenServiceStatus mHiddenServiceStatus ;
Tor::TorManager *mTorManager ; Tor::TorManager *mTorManager ;

9
retroshare-gui/src/main.cpp
View File

@ -367,12 +367,19 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
{ {
TorControlDialog tcd(torManager) ; TorControlDialog tcd(torManager) ;
QString error_msg ;
tcd.show(); tcd.show();
while(tcd.checkForTor() != TorControlDialog::TOR_STATUS_OK || tcd.checkForHiddenService() != TorControlDialog::HIDDEN_SERVICE_STATUS_OK) // runs until some status is reached: either tor works, or it fails. while(tcd.checkForTor(error_msg) != TorControlDialog::TOR_STATUS_OK || tcd.checkForHiddenService() != TorControlDialog::HIDDEN_SERVICE_STATUS_OK) // runs until some status is reached: either tor works, or it fails.
{ {
QCoreApplication::processEvents(); QCoreApplication::processEvents();
rstime::rs_usleep(0.2*1000*1000) ; rstime::rs_usleep(0.2*1000*1000) ;
if(!error_msg.isNull())
{
QMessageBox::critical(NULL,QObject::tr("Cannot start Tor"),QObject::tr("Sorry but Tor cannot be started on your system!\n\nThe error reported is:\"")+error_msg+"\"") ;
return 1;
}
} }
tcd.hide(); tcd.hide();