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

update start wizard, change gui settings directory into ssl profile directory (RestroShare.conf)

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2141 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2010-01-27 22:31:25 +00:00
parent fb5bbf2e96
commit e142c63180
16 changed files with 1189 additions and 1588 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libretroshare/src/pqi/p3connmgr.cc
View file

@ -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 *******/

1
libretroshare/src/rsiface/rsinit.h
View file

@ -80,6 +80,7 @@ class RsInit
/* Post Login Options */
static std::string RsConfigDirectory();
static std::string RsProfileConfigDirectory();
static bool setStartMinimised() ;

21
libretroshare/src/rsserver/rsinit.cc
View file

@ -950,16 +950,12 @@ bool RsInit::GenerateSSLCertificate(std::string gpg_id, std::string org, std
/* try to load it, and get Id */
std::string location;
bool ret = LoadCheckX509andGetLocation(cert_name.c_str(), location, sslId) ;
std::cout << "LoadCheckX509andGetLocation: returned " << ret << ", sslId=" << sslId << std::endl ;
if (LoadCheckX509andGetLocation(cert_name.c_str(), location, sslId) == 0) {
std::cerr << "RsInit::GenerateSSLCertificate() Cannot check own signature, maybe the files are corrupted." << std::endl;
return false;
}
if(!ret)
{
std::cerr << "LoadCheckX509andGetLocation failed. Sorry." << std::endl ;
return false ;
}
/* Move directory to correct id */
/* Move directory to correct id */
std::string finalbase = RsInitConfig::basedir + RsInitConfig::dirSeperator + sslId + RsInitConfig::dirSeperator;
/* Rename Directory */
@ -1621,6 +1617,13 @@ std::string RsInit::RsConfigDirectory()
return RsInitConfig::basedir;
}
std::string RsInit::RsProfileConfigDirectory()
{
std::string dir = RsInitConfig::basedir + RsInitConfig::dirSeperator + RsInitConfig::preferedId;
std::cerr << "RsInit::RsProfileConfigDirectory() returning : " << dir << std::endl;
return dir;
}
bool RsInit::setStartMinimised()
{
return RsInitConfig::startMinimised;