mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-08-18 10:58:43 -04:00
update start wizard, change gui settings directory into ssl profile directory (RestroShare.conf)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2141 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
fb5bbf2e96
commit
e142c63180
16 changed files with 1189 additions and 1588 deletions
|
@ -144,12 +144,15 @@ p3ConnectMgr::p3ConnectMgr()
|
|||
ownState.name = AuthGPG::getAuthGPG()->getGPGOwnName();
|
||||
ownState.location = AuthSSL::getAuthSSL()->getOwnLocation();
|
||||
ownState.netMode = RS_NET_MODE_UDP;
|
||||
ownState.netMode |= RS_NET_MODE_TRY_UPNP;
|
||||
|
||||
//use_extr_addr_finder = true ;
|
||||
use_extr_addr_finder = false;
|
||||
allow_tunnel_connection = true;
|
||||
mExtAddrFinder = new ExtAddrFinder;
|
||||
|
||||
netReset();
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -2707,10 +2710,9 @@ bool p3ConnectMgr::setVisState(std::string id, uint32_t visState)
|
|||
{
|
||||
if (id == AuthSSL::getAuthSSL()->OwnId())
|
||||
{
|
||||
uint32_t netMode = ownState.netMode;
|
||||
setOwnNetConfig(netMode, visState);
|
||||
|
||||
return true;
|
||||
ownState.visState = visState;
|
||||
IndicateConfigChanged(); /**** INDICATE MSG CONFIG CHANGED! *****/
|
||||
return true;
|
||||
}
|
||||
|
||||
RsStackMutex stack(connMtx); /****** STACK LOCK MUTEX *******/
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue