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
This commit is contained in:
joss17 2010-02-25 22:44:27 +00:00
parent 3d33f5d729
commit a228503d0e
2 changed files with 5 additions and 5 deletions

View File

@ -148,7 +148,7 @@ p3ConnectMgr::p3ConnectMgr()
//use_extr_addr_finder = true ; //use_extr_addr_finder = true ;
use_extr_addr_finder = false; use_extr_addr_finder = false;
allow_tunnel_connection = false; allow_tunnel_connection = true;
mExtAddrFinder = new ExtAddrFinder; mExtAddrFinder = new ExtAddrFinder;
mNetInitTS = 0; mNetInitTS = 0;

View File

@ -53,10 +53,10 @@ ServerPage::ServerPage(QWidget * parent, Qt::WFlags flags)
ui.allowIpDeterminationCB->setChecked(b) ; ui.allowIpDeterminationCB->setChecked(b) ;
ui.IPServersLV->setEnabled(b) ; ui.IPServersLV->setEnabled(b) ;
#ifdef RS_RELEASE_VERSION // #ifdef RS_RELEASE_VERSION
ui.allowTunnelConnectionCB->hide(); // ui.allowTunnelConnectionCB->hide();
this->toggleTunnelConnection(false); // this->toggleTunnelConnection(false);
#endif // #endif
b = rsPeers->getAllowTunnelConnection() ; b = rsPeers->getAllowTunnelConnection() ;
ui.allowTunnelConnectionCB->setChecked(b) ; ui.allowTunnelConnectionCB->setChecked(b) ;