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

add default case to gui instead of falling back to tor labeling

Browse source
This commit is contained in:
sehraf 2015-09-16 11:48:32 +02:00
parent d3d184f2eb
commit 6202e83c32
3 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare/src/pqi/p3peermgr.cc
View file

@ -75,7 +75,7 @@ const uint32_t PEER_IP_CONNECT_STATE_MAX_LIST_SIZE = 4;
static const std::string kConfigDefaultProxyServerIpAddr = "127.0.0.1"; static const std::string kConfigDefaultProxyServerIpAddr = "127.0.0.1";
static const uint16_t kConfigDefaultProxyServerPortTor = 9050; // standard port. static const uint16_t kConfigDefaultProxyServerPortTor = 9050; // standard port.
static const uint16_t kConfigDefaultProxyServerPortI2P = 9051; // there is no standard port though static const uint16_t kConfigDefaultProxyServerPortI2P = 10; // there is no standard port though
static const std::string kConfigKeyExtIpFinder = "USE_EXTR_IP_FINDER"; static const std::string kConfigKeyExtIpFinder = "USE_EXTR_IP_FINDER";
static const std::string kConfigKeyProxyServerIpAddrTor = "PROXY_SERVER_IPADDR"; static const std::string kConfigKeyProxyServerIpAddrTor = "PROXY_SERVER_IPADDR";

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

@ -980,7 +980,6 @@ void ServerPage::loadHiddenNode()
expected += QString::number(detail.localPort); expected += QString::number(detail.localPort);
break; break;
case RS_HIDDEN_TYPE_TOR: case RS_HIDDEN_TYPE_TOR:
default:
ui.l_serviceAddress->setText(tr("Onion Address")); ui.l_serviceAddress->setText(tr("Onion Address"));
ui.l_incomingTestResult->setText(tr("Tor incoming ok")); ui.l_incomingTestResult->setText(tr("Tor incoming ok"));
@ -991,6 +990,13 @@ void ServerPage::loadHiddenNode()
expected += QString::fromStdString(detail.localAddr); expected += QString::fromStdString(detail.localAddr);
expected += ":"; expected += ":";
expected += QString::number(detail.localPort); expected += QString::number(detail.localPort);
break;
default:
ui.l_serviceAddress->setText(tr("Service Address"));
ui.l_incomingTestResult->setText(tr("incoming ok"));
expected += "Please fill in a service address";
break; break;
} }
ui.hiddenpage_configuration->setPlainText(expected); ui.hiddenpage_configuration->setPlainText(expected);
@ -1174,10 +1180,11 @@ void ServerPage::updateInProxyIndicator()
proxy.setPort(ui.hiddenpage_proxyPort_i2p->text().toInt()); proxy.setPort(ui.hiddenpage_proxyPort_i2p->text().toInt());
break; break;
case RS_HIDDEN_TYPE_TOR: case RS_HIDDEN_TYPE_TOR:
default:
proxy.setHostName(ui.hiddenpage_proxyAddress_tor->text()); proxy.setHostName(ui.hiddenpage_proxyAddress_tor->text());
proxy.setPort(ui.hiddenpage_proxyPort_tor->text().toInt()); proxy.setPort(ui.hiddenpage_proxyPort_tor->text().toInt());
break; break;
default:
return;
} }
proxy.setCapabilities(QNetworkProxy::HostNameLookupCapability | proxy.capabilities()) ; proxy.setCapabilities(QNetworkProxy::HostNameLookupCapability | proxy.capabilities()) ;

5
retroshare-gui/src/gui/settings/ServerPage.ui
View file

@ -1011,7 +1011,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
<item> <item>
<widget class="QLabel" name="l_incomingTestResult"> <widget class="QLabel" name="l_incomingTestResult">
<property name="text"> <property name="text">
<string>Tor incoming ok</string> <string>incoming ok</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -1055,8 +1055,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="plainText"> <property name="plainText">
<string>HiddenServiceDir &lt;/your/path/to/hidden/directory/service&gt; <string>Please fill in a service address</string>
HiddenServicePort 9191 127.0.0.1:9191</string>
</property> </property>
</widget> </widget>
</item> </item>