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

partly fixed TOR status page (patch from Sehraf)

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8109 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2015-04-02 19:23:01 +00:00
parent 65da6090fe
commit e9c6b3da73
2 changed files with 27 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

54
retroshare-gui/src/gui/settings/ServerPage.cpp
View file

@ -234,16 +234,7 @@ void ServerPage::load()
ui.torpage_proxyAddress -> setText(QString::fromStdString(proxyaddr)); ui.torpage_proxyAddress -> setText(QString::fromStdString(proxyaddr));
ui.torpage_proxyPort -> setValue(proxyport); ui.torpage_proxyPort -> setValue(proxyport);
if(status & RS_NET_PROXY_STATUS_OK) updateTorOutProxyIndicator();
{
ui.iconlabel_tor_outgoing->setPixmap(QPixmap(ICON_STATUS_OK)) ;
ui.iconlabel_tor_outgoing->setToolTip(tr("TOR proxy is working correctly")) ;
}
else
{
ui.iconlabel_tor_outgoing->setPixmap(QPixmap(ICON_STATUS_UNKNOWN)) ;
ui.iconlabel_tor_outgoing->setToolTip(tr("TOR status unknown")) ;
}
} }
void ServerPage::toggleTurtleRouting(bool b) void ServerPage::toggleTurtleRouting(bool b)
@ -314,24 +305,7 @@ void ServerPage::updateStatus()
ui.iconlabel_ext->setPixmap(QPixmap(":/images/ledoff1.png")); ui.iconlabel_ext->setPixmap(QPixmap(":/images/ledoff1.png"));
// check for TOR // check for TOR
updateTorOutProxyIndicator();
QTcpSocket socket ;
socket.connectToHost(ui.torpage_proxyAddress->text(),ui.torpage_proxyPort->text().toInt());
if(socket.waitForConnected(500))
{
std::cerr << "connected !" << std::endl;
socket.disconnectFromHost();
ui.iconlabel_tor_outgoing->setPixmap(QPixmap(ICON_STATUS_OK)) ;
ui.iconlabel_tor_outgoing->setToolTip(tr("Proxy seems to work.")) ;
}
else
{
ui.iconlabel_tor_outgoing->setPixmap(QPixmap(ICON_STATUS_UNKNOWN)) ;
ui.iconlabel_tor_outgoing->setToolTip(tr("TOR proxy is not enabled")) ;
}
} }
void ServerPage::toggleUPnP() void ServerPage::toggleUPnP()
@ -572,6 +546,8 @@ void ServerPage::loadHiddenNode()
ui.torpage_proxyAddress -> setText(QString::fromStdString(proxyaddr)); ui.torpage_proxyAddress -> setText(QString::fromStdString(proxyaddr));
ui.torpage_proxyPort -> setValue(proxyport); ui.torpage_proxyPort -> setValue(proxyport);
updateTorOutProxyIndicator();
QString expected = "HiddenServiceDir </your/path/to/hidden/directory/service>\n"; QString expected = "HiddenServiceDir </your/path/to/hidden/directory/service>\n";
expected += "HiddenServicePort "; expected += "HiddenServicePort ";
expected += QString::number(detail.hiddenNodePort); expected += QString::number(detail.hiddenNodePort);
@ -636,6 +612,7 @@ void ServerPage::updateStatusHiddenNode()
#endif #endif
updateTorOutProxyIndicator();
} }
void ServerPage::saveAddressesHiddenNode() void ServerPage::saveAddressesHiddenNode()
@ -697,3 +674,24 @@ void ServerPage::saveAddressesHiddenNode()
load(); load();
} }
void ServerPage::updateTorOutProxyIndicator()
{
QTcpSocket socket ;
socket.connectToHost(ui.torpage_proxyAddress->text(),ui.torpage_proxyPort->text().toInt());
if(socket.waitForConnected(500))
{
std::cerr << "connected !" << std::endl;
socket.disconnectFromHost();
ui.iconlabel_tor_outgoing->setPixmap(QPixmap(ICON_STATUS_OK)) ;
ui.iconlabel_tor_outgoing->setToolTip(tr("Proxy seems to work.")) ;
}
else
{
ui.iconlabel_tor_outgoing->setPixmap(QPixmap(ICON_STATUS_UNKNOWN)) ;
ui.iconlabel_tor_outgoing->setToolTip(tr("TOR proxy is not enabled")) ;
}
}

1
retroshare-gui/src/gui/settings/ServerPage.h
View file

@ -61,6 +61,7 @@ private:
void loadHiddenNode(); void loadHiddenNode();
void updateStatusHiddenNode(); void updateStatusHiddenNode();
void saveAddressesHiddenNode(); void saveAddressesHiddenNode();
void updateTorOutProxyIndicator();
Ui::ServerPage ui; Ui::ServerPage ui;