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

Added a seperation between 'desired' net mode and 'actual' net mode

Browse source 
this is needed for accurate stunlist creation. Also added stunStatus
calls from discovery.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@355 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-02-26 16:14:13 +00:00
parent 685182ff0b
commit 06cb9e0121
9 changed files with 144 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
retroshare-gui/src/gui/ChatDialog.cpp
View file

@ -181,7 +181,7 @@ void ChatDialog::insertChat()
QString timestamp = "[" + QDateTime::currentDateTime().toString("hh:mm:ss") + "]";
QString name = QString::fromStdString(it->name);
QString line = "<span style=\"color:#C00000\"><strong>" + timestamp + "</strong></span>" +
"<span style=\"color:#2D84C9\"><strong>" + " " + name + "</strong></span> \<br>";
"<span style=\"color:#2D84C9\"><strong>" + " " + name + "</strong></span> <br>";
extraTxt += line;

21
retroshare-gui/src/gui/Preferences/ServerDialog.cpp
View file

@ -79,7 +79,7 @@ void ServerDialog::load()
/* set net mode */
int netIndex = 0;
switch(detail.netMode)
switch(detail.tryNetMode)
{
case RS_NETMODE_EXT:
netIndex = 2;
@ -120,7 +120,22 @@ void ServerDialog::load()
/* set status */
std::ostringstream out;
out << "Network Mode: ";
out << "Attempted Network Mode: ";
switch(detail.tryNetMode)
{
case RS_NETMODE_EXT:
out << "External Forwarded Port (UltraPEER Mode)";
break;
case RS_NETMODE_UDP:
out << "Firewalled";
break;
default:
case RS_NETMODE_UPNP:
out << "Automatic: UPnP Forwarded Port";
break;
}
out << std::endl;
out << "Actual Network Mode: ";
switch(detail.netMode)
{
case RS_NETMODE_EXT:
@ -239,7 +254,7 @@ void ServerDialog::saveAddresses()
break;
}
if (detail.netMode != netMode)
if (detail.tryNetMode != netMode)
{
rsPeers->setNetworkMode(ownId, netMode);
}