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

added Qt socket test to update TOR led. This is a very basic test that does not prove the presence of TOR on the socket.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7570 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-09-28 19:24:03 +00:00
parent 3d38367d75
commit 2b6d6db201
1 changed files with 48 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -30,8 +30,12 @@
#include <retroshare/rspeers.h> #include <retroshare/rspeers.h>
#include <retroshare/rsturtle.h> #include <retroshare/rsturtle.h>
#include <QTcpSocket>
#include <QTimer> #include <QTimer>
#define ICON_STATUS_UNKNOWN ":/images/ledoff1.png"
#define ICON_STATUS_OK ":/images/ledon1.png"
ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags) ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags)
: ConfigPage(parent, flags), mIsHiddenNode(false) : ConfigPage(parent, flags), mIsHiddenNode(false)
{ {
@ -218,10 +222,22 @@ void ServerPage::load()
/* TOR PAGE SETTINGS - only Proxy (outgoing) */ /* TOR PAGE SETTINGS - only Proxy (outgoing) */
std::string proxyaddr; std::string proxyaddr;
uint16_t proxyport; uint16_t proxyport;
rsPeers->getProxyServer(proxyaddr, proxyport); uint32_t status ;
rsPeers->getProxyServer(proxyaddr, proxyport, status);
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)
{
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)
@ -287,8 +303,27 @@ void ServerPage::updateStatus()
if (net_status.netExtAddressOk) if (net_status.netExtAddressOk)
ui.iconlabel_ext->setPixmap(QPixmap(":/images/ledon1.png")); ui.iconlabel_ext->setPixmap(QPixmap(":/images/ledon1.png"));
else else
ui.iconlabel_ext->setPixmap(QPixmap(":/images/ledoff1.png")); ui.iconlabel_ext->setPixmap(QPixmap(":/images/ledoff1.png"));
// check for TOR
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()
@ -399,8 +434,9 @@ void ServerPage::saveAddresses()
// HANDLE PROXY SERVER. // HANDLE PROXY SERVER.
std::string orig_proxyaddr; std::string orig_proxyaddr;
uint16_t orig_proxyport; uint16_t orig_proxyport;
rsPeers->getProxyServer(orig_proxyaddr, orig_proxyport); uint32_t status ;
rsPeers->getProxyServer(orig_proxyaddr, orig_proxyport,status);
std::string new_proxyaddr = ui.torpage_proxyAddress -> text().toStdString(); std::string new_proxyaddr = ui.torpage_proxyAddress -> text().toStdString();
uint16_t new_proxyport = ui.torpage_proxyPort -> value(); uint16_t new_proxyport = ui.torpage_proxyPort -> value();
@ -520,8 +556,9 @@ void ServerPage::loadHiddenNode()
ui.torpage_onionPort -> setValue(detail.hiddenNodePort); ui.torpage_onionPort -> setValue(detail.hiddenNodePort);
std::string proxyaddr; std::string proxyaddr;
uint16_t proxyport; uint16_t proxyport;
rsPeers->getProxyServer(proxyaddr, proxyport); uint32_t proxy_state_flags;
rsPeers->getProxyServer(proxyaddr, proxyport, proxy_state_flags);
ui.torpage_proxyAddress -> setText(QString::fromStdString(proxyaddr)); ui.torpage_proxyAddress -> setText(QString::fromStdString(proxyaddr));
ui.torpage_proxyPort -> setValue(proxyport); ui.torpage_proxyPort -> setValue(proxyport);
@ -632,8 +669,9 @@ void ServerPage::saveAddressesHiddenNode()
// HANDLE PROXY SERVER. // HANDLE PROXY SERVER.
std::string orig_proxyaddr; std::string orig_proxyaddr;
uint16_t orig_proxyport; uint16_t orig_proxyport;
rsPeers->getProxyServer(orig_proxyaddr, orig_proxyport); uint32_t state_flags ;
rsPeers->getProxyServer(orig_proxyaddr, orig_proxyport,state_flags);
std::string new_proxyaddr = ui.torpage_proxyAddress -> text().toStdString(); std::string new_proxyaddr = ui.torpage_proxyAddress -> text().toStdString();
uint16_t new_proxyport = ui.torpage_proxyPort -> value(); uint16_t new_proxyport = ui.torpage_proxyPort -> value();