From a228503d0e4860481a7c0e6f3f3d1adc11e9c193 Mon Sep 17 00:00:00 2001 From: joss17 Date: Thu, 25 Feb 2010 22:44:27 +0000 Subject: [PATCH] add the tunnel config to server tab, and activate the tunnel on fresh configs git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2429 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/pqi/p3connmgr.cc | 2 +- retroshare-gui/src/gui/settings/ServerPage.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libretroshare/src/pqi/p3connmgr.cc b/libretroshare/src/pqi/p3connmgr.cc index 5d50ddfb7..dce2ee0a6 100644 --- a/libretroshare/src/pqi/p3connmgr.cc +++ b/libretroshare/src/pqi/p3connmgr.cc @@ -148,7 +148,7 @@ p3ConnectMgr::p3ConnectMgr() //use_extr_addr_finder = true ; use_extr_addr_finder = false; - allow_tunnel_connection = false; + allow_tunnel_connection = true; mExtAddrFinder = new ExtAddrFinder; mNetInitTS = 0; diff --git a/retroshare-gui/src/gui/settings/ServerPage.cpp b/retroshare-gui/src/gui/settings/ServerPage.cpp index 834ed19cb..f8a4f35d7 100755 --- a/retroshare-gui/src/gui/settings/ServerPage.cpp +++ b/retroshare-gui/src/gui/settings/ServerPage.cpp @@ -53,10 +53,10 @@ ServerPage::ServerPage(QWidget * parent, Qt::WFlags flags) ui.allowIpDeterminationCB->setChecked(b) ; ui.IPServersLV->setEnabled(b) ; - #ifdef RS_RELEASE_VERSION - ui.allowTunnelConnectionCB->hide(); - this->toggleTunnelConnection(false); - #endif +// #ifdef RS_RELEASE_VERSION +// ui.allowTunnelConnectionCB->hide(); +// this->toggleTunnelConnection(false); +// #endif b = rsPeers->getAllowTunnelConnection() ; ui.allowTunnelConnectionCB->setChecked(b) ;