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

fixed small bug introduced by command line params refactoring

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6560 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-08-07 14:43:34 +00:00
parent aba5033604
commit e74d91d7a5
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
retroshare-nogui/src/retroshare.cc
View file

@ -113,7 +113,6 @@ int main(int argc, char **argv)
std::string sshUser = "user"; std::string sshUser = "user";
std::string sshPwdHash = ""; std::string sshPwdHash = "";
std::string sshRsaFile = ""; std::string sshRsaFile = "";
std::string sshPortStr = "0";
uint16_t extPort = 0; uint16_t extPort = 0;
uint16_t sshPort = 7022; uint16_t sshPort = 7022;
@ -273,7 +272,10 @@ int main(int argc, char **argv)
if (enableSsh) if (enableSsh)
{ {
ssh = RsSshd::InitRsSshd(sshPortStr, "rs_ssh_host_rsa_key"); std::ostringstream os ;
os << sshPort ;
ssh = RsSshd::InitRsSshd(os.str(), "rs_ssh_host_rsa_key");
// TODO Parse Option // TODO Parse Option
if (enableSshRsa) if (enableSshRsa)
{ {
@ -287,7 +289,7 @@ int main(int argc, char **argv)
if (!extPortSet) if (!extPortSet)
{ {
extPort = atoi(sshPortStr.c_str()); extPort = sshPort;
} }
// NASTY GLOBAL VARIABLE HACK - NEED TO THINK OF A BETTER SYSTEM. // NASTY GLOBAL VARIABLE HACK - NEED TO THINK OF A BETTER SYSTEM.
@ -439,7 +441,7 @@ void generatePasswordHash()
std::cerr << std::endl; std::cerr << std::endl;
std::cerr << " - for SSH access: ./retroshare-nogui -X -S [port] -L <username> -P " << pwdHashRadix64; std::cerr << " - for SSH access: ./retroshare-nogui -X -S [port] -L <username> -P " << pwdHashRadix64;
std::cerr << std::endl; std::cerr << std::endl;
std::cerr << " - for RPC access: ./retroshare-nogui -C -S [port] -L <username> -P " << pwdHashRadix64; std::cerr << " - for RPC access: ./retroshare-nogui -C -X -S [port] -L <username> -P " << pwdHashRadix64;
std::cerr << std::endl; std::cerr << std::endl;
} }
#endif #endif