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

suspended unfinished code to determine TOR status

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8273 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2015-05-18 19:12:15 +00:00
parent e7c96af8ab
commit 7d324569ca
1 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -231,8 +231,10 @@ 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);
updateTorOutProxyIndicator(); updateTorOutProxyIndicator();
updateTorInProxyIndicator();
if(mIsHiddenNode)
updateTorInProxyIndicator();
} }
//void ServerPage::toggleTurtleRouting(bool b) //void ServerPage::toggleTurtleRouting(bool b)
@ -303,7 +305,9 @@ 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(); updateTorOutProxyIndicator();
if(mIsHiddenNode)
updateTorInProxyIndicator(); updateTorInProxyIndicator();
} }
@ -546,7 +550,9 @@ 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(); updateTorOutProxyIndicator();
if(mIsHiddenNode)
updateTorInProxyIndicator(); updateTorInProxyIndicator();
QString expected = "HiddenServiceDir </your/path/to/hidden/directory/service>\n"; QString expected = "HiddenServiceDir </your/path/to/hidden/directory/service>\n";
@ -613,7 +619,8 @@ void ServerPage::updateStatusHiddenNode()
#endif #endif
updateTorOutProxyIndicator(); updateTorOutProxyIndicator();
if(mIsHiddenNode)
updateTorInProxyIndicator(); updateTorInProxyIndicator();
} }
@ -711,20 +718,27 @@ void ServerPage::updateLocInProxyIndicator()
} }
void ServerPage::updateTorInProxyIndicator() void ServerPage::updateTorInProxyIndicator()
{ {
// need to find a proper way to do this
#ifdef SUSPENDED
if(!mIsHiddenNode)
return ;
QTcpSocket socket ; QTcpSocket socket ;
QNetworkProxy proxy ; QNetworkProxy proxy ;
proxy.setType(QNetworkProxy::Socks5Proxy); proxy.setType(QNetworkProxy::DefaultProxy);
proxy.setHostName(ui.torpage_proxyAddress->text()); proxy.setHostName(ui.torpage_proxyAddress->text());
proxy.setPort(ui.torpage_proxyPort->text().toInt()); proxy.setPort(ui.torpage_proxyPort->text().toInt());
proxy.setCapabilities(QNetworkProxy::HostNameLookupCapability | proxy.capabilities()) ;
std::cerr << "Setting proxy hostname+port to " << ui.torpage_proxyAddress->text().toStdString() << ":" << ui.torpage_proxyPort->text().toInt() << std::endl; std::cerr << "Setting proxy hostname+port to " << std::dec << ui.torpage_proxyAddress->text().toStdString() << ":" << ui.torpage_proxyPort->text().toInt() << std::endl;
socket.setProxy(proxy) ; socket.setProxy(proxy) ;
std::cerr << "Connecting to " << ui.torpage_onionAddress->text().toStdString() << ":" << ui.torpage_onionPort->text().toInt() << std::endl; std::cerr << "Connecting to " << ui.torpage_onionAddress->text().toStdString() << ":" << ui.torpage_onionPort->text().toInt() << std::endl;
socket.connectToHost(ui.torpage_onionAddress->text(),ui.torpage_onionPort->text().toInt(),QAbstractSocket::ReadOnly); socket.connectToHost(ui.torpage_onionAddress->text(),ui.torpage_onionPort->text().toInt());
//socket.connectToHost("www.showip.com",80);
if(socket.waitForConnected(5000)) if(socket.waitForConnected(5000))
{ {
@ -739,6 +753,7 @@ void ServerPage::updateTorInProxyIndicator()
std::cerr << "Error: " << socket.errorString().toStdString() << std::endl; std::cerr << "Error: " << socket.errorString().toStdString() << std::endl;
ui.iconlabel_tor_incoming->setPixmap(QPixmap(ICON_STATUS_UNKNOWN)) ; ui.iconlabel_tor_incoming->setPixmap(QPixmap(ICON_STATUS_UNKNOWN)) ;
ui.iconlabel_tor_incoming->setToolTip(tr("TOR proxy is not enabled or broken.\nAre you running a TOR hidden service?\nCheck your ports!")) ; ui.iconlabel_tor_incoming->setToolTip(tr("TOR proxy is not enabled or broken.\nAre you running a TOR hidden service?\nCheck your ports!")) ;
} }
#endif
} }