diff --git a/libretroshare/src/rsiface/rstypes.h b/libretroshare/src/rsiface/rstypes.h
index 5a6474fb6..b98cea318 100644
--- a/libretroshare/src/rsiface/rstypes.h
+++ b/libretroshare/src/rsiface/rstypes.h
@@ -145,7 +145,7 @@ class RsConfig
bool netDhtOk; /* response from dht */
bool netExtOk; /* know our external address */
bool netUdpOk; /* recvd stun / udp packets */
- bool netTcpOk; /* recvd incoming tcp */
+ //bool netTcpOk; /* recvd incoming tcp */
bool netResetReq;
};
diff --git a/libretroshare/src/rsserver/p3face-config.cc b/libretroshare/src/rsserver/p3face-config.cc
index 16dcca0fb..bd17c5c18 100644
--- a/libretroshare/src/rsserver/p3face-config.cc
+++ b/libretroshare/src/rsserver/p3face-config.cc
@@ -130,7 +130,7 @@ int RsServer::UpdateAllConfig()
config.netDhtOk = mConnMgr->getNetStatusDhtOk();
config.netExtOk = mConnMgr->getNetStatusExtOk();
config.netUdpOk = mConnMgr->getNetStatusUdpOk();
- config.netTcpOk = mConnMgr->getNetStatusTcpOk();
+ //config.netTcpOk = mConnMgr->getNetStatusTcpOk();
/* update DHT/UPnP config */
diff --git a/retroshare-gui/src/gui/NetworkDialog.cpp b/retroshare-gui/src/gui/NetworkDialog.cpp
index 4550269d3..83833d339 100644
--- a/retroshare-gui/src/gui/NetworkDialog.cpp
+++ b/retroshare-gui/src/gui/NetworkDialog.cpp
@@ -761,18 +761,9 @@ void NetworkDialog::getNetworkStatus()
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.netUpnpOk || config.netTcpOk)
+ if (config.netUpnpOk)
{
setLogInfo(tr("RetroShare Server"), QString::fromUtf8("green"));
}
@@ -846,21 +837,10 @@ void NetworkDialog::updateNetworkStatus()
ui.iconlabel_udp->setPixmap(QPixmap::QPixmap(":/images/ledoff1.png"));
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.netUpnpOk || config.netTcpOk)
+ if (config.netUpnpOk)
{
ui.iconlabel_netServer->setPixmap(QPixmap::QPixmap(":/images/ledon1.png"));
diff --git a/retroshare-gui/src/gui/NetworkDialog.ui b/retroshare-gui/src/gui/NetworkDialog.ui
index 7b967580b..53fa7626c 100644
--- a/retroshare-gui/src/gui/NetworkDialog.ui
+++ b/retroshare-gui/src/gui/NetworkDialog.ui
@@ -141,7 +141,7 @@
QTabWidget::North
- 0
+ 1
@@ -402,33 +402,6 @@
- -
-
-
-
-
-
-
- 16
- 16
-
-
-
-
-
-
- :/images/ledoff1.png
-
-
-
- -
-
-
- TCP Server
-
-
-
-
-
diff --git a/retroshare-gui/src/gui/statusbar/natstatus.cpp b/retroshare-gui/src/gui/statusbar/natstatus.cpp
index 470ea0c45..9025a67fc 100644
--- a/retroshare-gui/src/gui/statusbar/natstatus.cpp
+++ b/retroshare-gui/src/gui/statusbar/natstatus.cpp
@@ -103,20 +103,9 @@ void NATStatus::getNATStatus()
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.netUpnpOk || config.netTcpOk)
+ if (config.netUpnpOk)
{
iconLabel->setPixmap(QPixmap::QPixmap(":/images/greenled.png"));
iconLabel->setToolTip(tr("OK | RetroShare Server"));
diff --git a/retroshare-gui/src/rsiface/rstypes.h b/retroshare-gui/src/rsiface/rstypes.h
index 5a6474fb6..02d6ddfda 100644
--- a/retroshare-gui/src/rsiface/rstypes.h
+++ b/retroshare-gui/src/rsiface/rstypes.h
@@ -145,7 +145,7 @@ class RsConfig
bool netDhtOk; /* response from dht */
bool netExtOk; /* know our external address */
bool netUdpOk; /* recvd stun / udp packets */
- bool netTcpOk; /* recvd incoming tcp */
+ //bool netTcpOk; /* recvd incoming tcp not implemented */
bool netResetReq;
};