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

Added Installation of BitDHT bootstrap file.

Browse source 
* new DataDirectory Function in rsinit.cc
  * new copyFile() and checkFile() functions in rsdirutils.
  * bdboot.txt is checked for and copied over if missing.

NB: This has been tested under OSX, but Linux / Windows need checking.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3713 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2010-10-28 22:59:46 +00:00
parent dd19278d58
commit 634dbca14f
4 changed files with 227 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -789,6 +789,98 @@ void RsInit::setupBaseDir()
}
/***********************************************************
* This Directory is used to store data and "template" file that Retroshare requires.
* These files will either be copied into Retroshare's configuration directory,
* if they are to be modified. Or used directly, if read-only.
*
* This will initially be used for the DHT bootstrap file.
*
* Please modify the code below to suit your platform!
*
* WINDOWS:
* WINDOWS PORTABLE:
* Linux:
* OSX:
***********/
#ifdef __APPLE__
/* needs CoreFoundation Framework */
#include <CoreFoundation/CoreFoundation.h>
//#include <CFURL.h>
//#include <CFBundle.h>
#endif
std::string RsInit::getRetroshareDataDirectory()
{
std::string dataDirectory;
/******************************** WINDOWS/UNIX SPECIFIC PART ******************/
#ifndef WINDOWS_SYS
#ifdef __APPLE__
/* For OSX, applications are Bundled in a directory...
* need to get the path to the executable Bundle.
*
* Code nicely supplied by Qt!
*/
CFURLRef pluginRef = CFBundleCopyBundleURL(CFBundleGetMainBundle());
CFStringRef macPath = CFURLCopyFileSystemPath(pluginRef,
kCFURLPOSIXPathStyle);
const char *pathPtr = CFStringGetCStringPtr(macPath,
CFStringGetSystemEncoding());
dataDirectory = pathPtr;
CFRelease(pluginRef);
CFRelease(macPath);
dataDirectory += "/Contents/Resources";
std::cerr << "getRetroshareDataDirectory() OSX: " << dataDirectory;
#else
/* For Linux, we have a fixed standard data directory */
dataDirectory = "/usr/share/Retroshare";
std::cerr << "getRetroshareDataDirectory() Linux: " << dataDirectory;
#endif
#else
if (RsInitConfig::portable)
{
/* For Windows Portable, files must be in the data directory */
dataDirectory = "Data";
std::cerr << "getRetroshareDataDirectory() WINDOWS PORTABLE: " << dataDirectory;
std::cerr << std::endl;
}
else
{
/* For Windows: environment variable APPDATA should be suitable */
dataDirectory = getenv("APPDATA");
dataDirectory += "\\RetroShare";
std::cerr << "getRetroshareDataDirectory() WINDOWS: " << dataDirectory;
std::cerr << std::endl;
}
#endif
/******************************** WINDOWS/UNIX SPECIFIC PART ******************/
/* Make sure the directory exists, else return emptyString */
if (!RsDirUtil::checkDirectory(dataDirectory))
{
std::cerr << "Data Directory not Found: " << dataDirectory << std::endl;
dataDirectory = "";
}
else
{
std::cerr << "Data Directory Found: " << dataDirectory << std::endl;
}
return dataDirectory;
}
/* directories with valid certificates in the expected location */
bool getAvailableAccounts(std::list<accountId> &ids)
{
@ -2233,12 +2325,48 @@ int RsServer::StartupRetroShare()
rsUdpStack *mUdpStack = new rsUdpStack(tmpladdr);
#ifdef RS_USE_BITDHT
#define BITDHT_BOOTSTRAP_FILENAME "bdboot.txt"
std::string bootstrapfile = RsInitConfig::configDir.c_str();
if (bootstrapfile != "")
{
bootstrapfile += "/";
}
bootstrapfile += "bdboot.txt";
bootstrapfile += BITDHT_BOOTSTRAP_FILENAME;
std::cerr << "Checking for DHT bootstrap file: " << bootstrapfile << std::endl;
/* check if bootstrap file exists...
* if not... copy from dataDirectory
*/
if (!RsDirUtil::checkFile(bootstrapfile))
{
std::cerr << "DHT bootstrap file not in ConfigDir: " << bootstrapfile << std::endl;
std::string installfile = RsInit::getRetroshareDataDirectory();
installfile += RsInitConfig::dirSeperator;
installfile += BITDHT_BOOTSTRAP_FILENAME;
std::cerr << "Checking for Installation DHT bootstrap file " << installfile << std::endl;
if ((installfile != "") && (RsDirUtil::checkFile(installfile)))
{
std::cerr << "Copying Installation DHT bootstrap file..." << std::endl;
if (RsDirUtil::copyFile(installfile, bootstrapfile))
{
std::cerr << "Installed DHT bootstrap file in configDir" << std::endl;
}
else
{
std::cerr << "Failed Installation DHT bootstrap file..." << std::endl;
}
}
else
{
std::cerr << "No Installation DHT bootstrap file to copy" << std::endl;
}
}
p3BitDht *mBitDht = new p3BitDht(ownId, mConnMgr,
mUdpStack, bootstrapfile);