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

remove unimplemented tcpOk flag

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1750 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2009-10-30 00:35:44 +00:00
parent 324b51e250
commit 32ea1bfd0f
6 changed files with 8 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretroshare/src/rsiface/rstypes.h
View File

@ -145,7 +145,7 @@ class RsConfig
bool netDhtOk; /* response from dht */ bool netDhtOk; /* response from dht */
bool netExtOk; /* know our external address */ bool netExtOk; /* know our external address */
bool netUdpOk; /* recvd stun / udp packets */ bool netUdpOk; /* recvd stun / udp packets */
bool netTcpOk; /* recvd incoming tcp */ //bool netTcpOk; /* recvd incoming tcp */
bool netResetReq; bool netResetReq;
}; };

2
libretroshare/src/rsserver/p3face-config.cc
View File

@ -130,7 +130,7 @@ int RsServer::UpdateAllConfig()
config.netDhtOk = mConnMgr->getNetStatusDhtOk(); config.netDhtOk = mConnMgr->getNetStatusDhtOk();
config.netExtOk = mConnMgr->getNetStatusExtOk(); config.netExtOk = mConnMgr->getNetStatusExtOk();
config.netUdpOk = mConnMgr->getNetStatusUdpOk(); config.netUdpOk = mConnMgr->getNetStatusUdpOk();
config.netTcpOk = mConnMgr->getNetStatusTcpOk(); //config.netTcpOk = mConnMgr->getNetStatusTcpOk();
/* update DHT/UPnP config */ /* update DHT/UPnP config */

24
retroshare-gui/src/gui/NetworkDialog.cpp
View File

@ -761,18 +761,9 @@ void NetworkDialog::getNetworkStatus()
setLogInfo(tr("UDP Port is not active"), QString::fromUtf8("red")); setLogInfo(tr("UDP Port is not active"), QString::fromUtf8("red"));
} }
if(config.netTcpOk)
{
setLogInfo(tr("TCP Port is active (TCP Server)"), QString::fromUtf8("green"));
}
else
{
setLogInfo(tr("TCP Port is not active"), QString::fromUtf8("red"));
}
if (config.netExtOk) if (config.netExtOk)
{ {
if (config.netUpnpOk || config.netTcpOk) if (config.netUpnpOk)
{ {
setLogInfo(tr("RetroShare Server"), QString::fromUtf8("green")); setLogInfo(tr("RetroShare Server"), QString::fromUtf8("green"));
} }
@ -847,20 +838,9 @@ void NetworkDialog::updateNetworkStatus()
ui.textlabel_udp->setText(tr("UDP Port is not active")); ui.textlabel_udp->setText(tr("UDP Port is not active"));
} }
if(config.netTcpOk)
{
ui.iconlabel_tcp->setPixmap(QPixmap::QPixmap(":/images/ledon1.png"));
ui.textlabel_tcp->setText(tr("TCP Port is active (TCP Server)"));
}
else
{
ui.iconlabel_tcp->setPixmap(QPixmap::QPixmap(":/images/ledoff1.png"));
ui.textlabel_tcp->setText(tr("TCP Port is not active"));
}
if (config.netExtOk) if (config.netExtOk)
{ {
if (config.netUpnpOk || config.netTcpOk) if (config.netUpnpOk)
{ {
ui.iconlabel_netServer->setPixmap(QPixmap::QPixmap(":/images/ledon1.png")); ui.iconlabel_netServer->setPixmap(QPixmap::QPixmap(":/images/ledon1.png"));

29
retroshare-gui/src/gui/NetworkDialog.ui
View File

@ -141,7 +141,7 @@
<enum>QTabWidget::North</enum> <enum>QTabWidget::North</enum>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="log_tab"> <widget class="QWidget" name="log_tab">
<attribute name="title"> <attribute name="title">
@ -402,33 +402,6 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="4" column="0">
<layout class="QGridLayout">
<item row="0" column="0">
<widget class="QLabel" name="iconlabel_tcp">
<property name="maximumSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="images.qrc">:/images/ledoff1.png</pixmap>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="textlabel_tcp">
<property name="text">
<string>TCP Server</string>
</property>
</widget>
</item>
</layout>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>

13
retroshare-gui/src/gui/statusbar/natstatus.cpp
View File

@ -103,20 +103,9 @@ void NATStatus::getNATStatus()
iconLabel->setToolTip(tr("UDP Port is not reachable")); iconLabel->setToolTip(tr("UDP Port is not reachable"));
} }
if(config.netTcpOk)
{
iconLabel->setPixmap(QPixmap::QPixmap(":/images/greenled.png"));
iconLabel->setToolTip(tr("TCP Port is reachable"));
}
else
{
iconLabel->setPixmap(QPixmap::QPixmap(":/images/yellowled.png"));
iconLabel->setToolTip(tr("TCP Port is not reachable"));
}
if (config.netExtOk) if (config.netExtOk)
{ {
if (config.netUpnpOk || config.netTcpOk) if (config.netUpnpOk)
{ {
iconLabel->setPixmap(QPixmap::QPixmap(":/images/greenled.png")); iconLabel->setPixmap(QPixmap::QPixmap(":/images/greenled.png"));
iconLabel->setToolTip(tr("OK | RetroShare Server")); iconLabel->setToolTip(tr("OK | RetroShare Server"));

2
retroshare-gui/src/rsiface/rstypes.h
View File

@ -145,7 +145,7 @@ class RsConfig
bool netDhtOk; /* response from dht */ bool netDhtOk; /* response from dht */
bool netExtOk; /* know our external address */ bool netExtOk; /* know our external address */
bool netUdpOk; /* recvd stun / udp packets */ bool netUdpOk; /* recvd stun / udp packets */
bool netTcpOk; /* recvd incoming tcp */ //bool netTcpOk; /* recvd incoming tcp not implemented */
bool netResetReq; bool netResetReq;
}; };