mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
add default case to gui instead of falling back to tor labeling
This commit is contained in:
parent
d3d184f2eb
commit
6202e83c32
@ -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 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 kConfigKeyProxyServerIpAddrTor = "PROXY_SERVER_IPADDR";
|
||||
|
@ -980,7 +980,6 @@ void ServerPage::loadHiddenNode()
|
||||
expected += QString::number(detail.localPort);
|
||||
break;
|
||||
case RS_HIDDEN_TYPE_TOR:
|
||||
default:
|
||||
ui.l_serviceAddress->setText(tr("Onion Address"));
|
||||
ui.l_incomingTestResult->setText(tr("Tor incoming ok"));
|
||||
|
||||
@ -991,6 +990,13 @@ void ServerPage::loadHiddenNode()
|
||||
expected += QString::fromStdString(detail.localAddr);
|
||||
expected += ":";
|
||||
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;
|
||||
}
|
||||
ui.hiddenpage_configuration->setPlainText(expected);
|
||||
@ -1174,10 +1180,11 @@ void ServerPage::updateInProxyIndicator()
|
||||
proxy.setPort(ui.hiddenpage_proxyPort_i2p->text().toInt());
|
||||
break;
|
||||
case RS_HIDDEN_TYPE_TOR:
|
||||
default:
|
||||
proxy.setHostName(ui.hiddenpage_proxyAddress_tor->text());
|
||||
proxy.setPort(ui.hiddenpage_proxyPort_tor->text().toInt());
|
||||
break;
|
||||
default:
|
||||
return;
|
||||
}
|
||||
proxy.setCapabilities(QNetworkProxy::HostNameLookupCapability | proxy.capabilities()) ;
|
||||
|
||||
|
@ -1011,7 +1011,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
|
||||
<item>
|
||||
<widget class="QLabel" name="l_incomingTestResult">
|
||||
<property name="text">
|
||||
<string>Tor incoming ok</string>
|
||||
<string>incoming ok</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -1055,8 +1055,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="plainText">
|
||||
<string>HiddenServiceDir </your/path/to/hidden/directory/service>
|
||||
HiddenServicePort 9191 127.0.0.1:9191</string>
|
||||
<string>Please fill in a service address</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
Loading…
Reference in New Issue
Block a user