Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-12 07:59:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUGFIX: Config MetaFile, and Signature File now saved in correct directory.

Browse Source 
BUGFIX: forceExtPort now initialised.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@407 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-03-23 19:11:36 +00:00
parent ba87009a25
commit 72823768bb
2 changed files with 50 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
libretroshare/src/pqi/p3cfgmgr.cc
View File

@ -131,6 +131,16 @@ void p3ConfigMgr::saveConfiguration()
item->print(std::cerr, 20); item->print(std::cerr, 20);
#endif #endif
/* construct filename */
std::string filename1 = basedir;
std::string filename2 = basedir;
if (basedir != "")
{
filename1 += "/";
filename2 += "/";
}
filename1 += metasigfname;
filename2 += metafname;
/* Write the data to a stream */ /* Write the data to a stream */
uint32_t bioflags = BIN_FLAGS_WRITEABLE; uint32_t bioflags = BIN_FLAGS_WRITEABLE;
@ -154,7 +164,7 @@ void p3ConfigMgr::saveConfiguration()
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
if (!membio->writetofile(metafname.c_str())) if (!membio->writetofile(filename2.c_str()))
{ {
#ifdef CONFIG_DEBUG #ifdef CONFIG_DEBUG
std::cerr << "p3ConfigMgr::saveConfiguration() Failed to Write MetaFile"; std::cerr << "p3ConfigMgr::saveConfiguration() Failed to Write MetaFile";
@ -167,7 +177,7 @@ void p3ConfigMgr::saveConfiguration()
BinMemInterface *signbio = new BinMemInterface(signature.c_str(), BinMemInterface *signbio = new BinMemInterface(signature.c_str(),
signature.length(), BIN_FLAGS_READABLE); signature.length(), BIN_FLAGS_READABLE);
if (!signbio->writetofile(metasigfname.c_str())) if (!signbio->writetofile(filename1.c_str()))
{ {
#ifdef CONFIG_DEBUG #ifdef CONFIG_DEBUG
std::cerr << "p3ConfigMgr::saveConfiguration() Failed to Write MetaSignFile"; std::cerr << "p3ConfigMgr::saveConfiguration() Failed to Write MetaSignFile";
@ -187,15 +197,50 @@ void p3ConfigMgr::loadConfiguration()
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
/* construct filename */
std::string filename1 = basedir;
std::string filename2 = basedir;
if (basedir != "")
{
filename1 += "/";
filename2 += "/";
}
filename1 += metasigfname;
filename2 += metafname;
/* write signature to configuration */ /* write signature to configuration */
BinMemInterface *signbio = new BinMemInterface(1000, BIN_FLAGS_READABLE); BinMemInterface *signbio = new BinMemInterface(1000, BIN_FLAGS_READABLE);
if (!signbio->readfromfile(metasigfname.c_str())) if (!signbio->readfromfile(filename1.c_str()))
{ {
#ifdef CONFIG_DEBUG #ifdef CONFIG_DEBUG
std::cerr << "p3ConfigMgr::loadConfiguration() Failed to Load MetaSignFile"; std::cerr << "p3ConfigMgr::loadConfiguration() Failed to Load MetaSignFile";
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
/* HACK to load the old one (with the wrong directory)
* THIS SHOULD BE REMOVED IN A COUPLE OF VERSIONS....
* ONLY HERE TO CORRECT BAD MISTAKE IN EARLIER VERSIONS.
*/
filename1 = metasigfname;
filename2 = metafname;
if (!signbio->readfromfile(filename1.c_str()))
{
#ifdef CONFIG_DEBUG
std::cerr << "p3ConfigMgr::loadConfiguration() HACK: Failed to Load ALT MetaSignFile";
std::cerr << std::endl;
#endif
}
else
{
#ifdef CONFIG_DEBUG
std::cerr << "p3ConfigMgr::loadConfiguration() HACK: Loaded ALT MetaSignFile";
std::cerr << std::endl;
#endif
}
} }
std::string oldsignature((char *) signbio->memptr(), signbio->memsize()); std::string oldsignature((char *) signbio->memptr(), signbio->memsize());
@ -203,7 +248,7 @@ void p3ConfigMgr::loadConfiguration()
BinMemInterface *membio = new BinMemInterface(1000, BIN_FLAGS_READABLE); BinMemInterface *membio = new BinMemInterface(1000, BIN_FLAGS_READABLE);
if (!membio->readfromfile(metafname.c_str())) if (!membio->readfromfile(filename2.c_str()))
{ {
#ifdef CONFIG_DEBUG #ifdef CONFIG_DEBUG
std::cerr << "p3ConfigMgr::loadConfiguration() Failed to Load MetaFile"; std::cerr << "p3ConfigMgr::loadConfiguration() Failed to Load MetaFile";

1
libretroshare/src/rsserver/p3face-startup.cc
View File

@ -117,6 +117,7 @@ RsInit *InitRsConfig()
config -> forceLocalAddr = false; config -> forceLocalAddr = false;
config -> haveLogFile = false; config -> haveLogFile = false;
config -> outStderr = false; config -> outStderr = false;
config -> forceExtPort = false;
strcpy(config->inet, "127.0.0.1"); strcpy(config->inet, "127.0.0.1");
strcpy(config->logfname, ""); strcpy(config->logfname, "");