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

added parameter to supply user defined tor executable path

Browse source
This commit is contained in:
csoler 2022-11-02 21:00:24 +01:00
parent 1474dfdd66
commit 486aa83680
1 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
retroshare-friendserver/src/retroshare-friendserver.cc
View file

@ -47,17 +47,22 @@ int main(int argc, char* argv[])
//RsControl::earlyInitNotificationSystem(); //RsControl::earlyInitNotificationSystem();
std::string base_directory = "FSData"; std::string base_directory = "FSData";
std::string tor_executable_path ;
argstream as(argc,argv); argstream as(argc,argv);
as >> parameter( 'c',"base-dir", base_directory, "set base directory to store data files (keys, etc)", false ) as >> parameter( 'c',"base-dir", base_directory, "set base directory to store data files (keys, etc)", false )
>> help( 'h', "help", "Display this Help" ); >> parameter( 't',"tor-executable", tor_executable_path, "set absolute path for tor executable", false )
>> help( 'h', "help", "Display this Help" );
as.defaultErrorHandling(true, true); as.defaultErrorHandling(true, true);
RsConfigOptions conf; RsConfigOptions conf;
conf.main_executable_path = argv[0]; conf.main_executable_path = argv[0];
if(!tor_executable_path.empty())
RsTor::setTorExecutablePath(tor_executable_path);
RsInit::InitRsConfig(); RsInit::InitRsConfig();
RsInit::InitRetroShare(conf); RsInit::InitRetroShare(conf);
@ -68,6 +73,17 @@ int main(int argc, char* argv[])
RsErr() << "Cannot create base directory \"" << base_directory << "\". Check permissions, paths, etc." ; RsErr() << "Cannot create base directory \"" << base_directory << "\". Check permissions, paths, etc." ;
return 1; return 1;
} }
// Check the existance of the Tor executable path
if (!RsDirUtil::fileExists(RsTor::torExecutablePath()))
{
RsErr() << "Tor executable not found. Try supplying the full path for tor executable with the -t option.";
return 1;
}
else
RsDbg() << "Using Tor executable: \"" << RsTor::torExecutablePath() << "\"";
// Create/start TorManager // Create/start TorManager
RsTor::setTorDataDirectory(RsDirUtil::makePath(base_directory,"tor")); RsTor::setTorDataDirectory(RsDirUtil::makePath(base_directory,"tor"));