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

fixed unwanted display of DHT information in connect disalog for Tor nodes and Tor friends

Browse source
This commit is contained in:
csoler 2021-08-15 15:38:16 +02:00
parent 3cfab3ace0
commit 5c560837ba
1 changed files with 92 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

42
retroshare-gui/src/gui/connect/ConnectProgressDialog.cpp
View file

@ -247,11 +247,15 @@ void ConnectProgressDialog::updateStatus()
updateNetworkStatus(); updateNetworkStatus();
updateContactStatus(); updateContactStatus();
if(!mIsPeerHiddenNode && !mAmIHiddenNode)
{
#ifdef RS_USE_BITDHT #ifdef RS_USE_BITDHT
updateDhtStatus(); updateDhtStatus();
#endif #endif
updateLookupStatus(); updateLookupStatus();
updateUdpStatus(); updateUdpStatus();
}
return; return;
break; break;
@ -282,10 +286,38 @@ void ConnectProgressDialog::stopAndClose()
void ConnectProgressDialog::updateNetworkStatus() void ConnectProgressDialog::updateNetworkStatus()
{ {
RsNetState netState = rsConfig->getNetState();
QLabel *label = ui->NetResult; QLabel *label = ui->NetResult;
switch(netState)
if(mAmIHiddenNode || mIsPeerHiddenNode)
switch(rsConfig->getNetState())
{
case RsNetState::BAD_UNKNOWN:
label->setText(tr("Unknown State"));
break;
case RsNetState::BAD_OFFLINE:
label->setText(tr("Offline"));
break;
case RsNetState::BAD_NATSYM:
label->setText(tr("Behind Symmetric NAT"));
break;
case RsNetState::WARNING_RESTART:
label->setText(tr("NET Restart"));
break;
case RsNetState::BAD_NODHT_NAT:
case RsNetState::WARNING_NATTED:
label->setText(tr("Behind NAT"));
break;
case RsNetState::WARNING_NODHT:
case RsNetState::GOOD:
label->setText(tr("NET STATE GOOD!"));
break;
case RsNetState::ADV_DARK_FORWARD:
case RsNetState::ADV_FORWARD:
label->setText(tr("UNVERIFIABLE FORWARD!"));
break;
}
else
switch(rsConfig->getNetState())
{ {
case RsNetState::BAD_UNKNOWN: case RsNetState::BAD_UNKNOWN:
label->setText(tr("Unknown State")); label->setText(tr("Unknown State"));
@ -454,14 +486,10 @@ void ConnectProgressDialog::updateLookupStatus()
mState = CONNECT_STATE_FAILED; mState = CONNECT_STATE_FAILED;
if (mLookupStatus == CONNECT_LOOKUP_NODHTCONFIG) if (mLookupStatus == CONNECT_LOOKUP_NODHTCONFIG)
{
sayPeerNoDhtConfig(); sayPeerNoDhtConfig();
}
else else
{
sayPeerOffline(); sayPeerOffline();
} }
}
case CONNECT_LOOKUP_FAIL: case CONNECT_LOOKUP_FAIL:
case CONNECT_LOOKUP_ONLINE: case CONNECT_LOOKUP_ONLINE: