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

- Removed RsIface, and moved configuration options to RsServerConfig (rsconfig.h)

Browse source 
- Fixed cipher list to "HIGH:!DSS:!aNULL:!3DES", which should disable the weak ones, no idea how to force it to PFS (which it should use).
 - fixed void * pointer maths.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6584 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2013-08-21 21:36:33 +00:00
parent ebbf6d9e26
commit f93ed1fb6e
12 changed files with 61 additions and 312 deletions
Download patch file Download diff file Expand all files Collapse all files

45
libretroshare/src/rsserver/p3serverconfig.cc
View file

@ -27,6 +27,9 @@
#include "rsserver/p3serverconfig.h"
#include "services/p3bwctrl.h"
#include "pqi/authgpg.h"
#include "pqi/authssl.h"
RsServerConfig *rsConfig = NULL;
static const std::string pqih_ftr("PQIH_FTR");
@ -137,16 +140,50 @@ bool p3ServerConfig::setConfigurationOption(uint32_t key, const std::string &opt
return true;
}
/* From RsIface::RsConfig */
int p3ServerConfig::getConfigNetStatus(RsConfigNetStatus &/*status*/)
int p3ServerConfig::getConfigNetStatus(RsConfigNetStatus &status)
{
return 0;
status.ownId = AuthSSL::getAuthSSL()->OwnId();
status.ownName = AuthGPG::getAuthGPG()->getGPGOwnName();
// Details from PeerMgr.
peerState pstate;
mPeerMgr->getOwnNetStatus(pstate);
status.localAddr = rs_inet_ntoa(pstate.localaddr.sin_addr);
status.localPort = ntohs(pstate.localaddr.sin_port);
status.extAddr = rs_inet_ntoa(pstate.serveraddr.sin_addr);
status.extPort = ntohs(pstate.serveraddr.sin_port);
status.extDynDns = pstate.dyndns;
status.firewalled = true;
status.forwardPort = true;
/* update network configuration */
pqiNetStatus nstatus;
mNetMgr->getNetStatus(nstatus);
status.netLocalOk = nstatus.mLocalAddrOk;
status.netUpnpOk = nstatus.mUpnpOk;
status.netStunOk = false;
status.netExtAddressOk = nstatus.mExtAddrOk;
status.netDhtOk = nstatus.mDhtOk;
status.netDhtNetSize = nstatus.mDhtNetworkSize;
status.netDhtRsNetSize = nstatus.mDhtRsNetworkSize;
/* update DHT/UPnP status */
status.uPnPState = mNetMgr->getUPnPState();
status.uPnPActive = mNetMgr->getUPnPEnabled();
status.DHTActive = mNetMgr->getDHTEnabled();
return 1;
}
int p3ServerConfig::getConfigStartup(RsConfigStartup &/*params*/)
{
//status.promptAtBoot = true; /* popup the password prompt */
return 0;
}