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

convert RSCONFIG_USER_LEVEL to enum class

Browse source
This commit is contained in:
sehraf 2020-02-09 22:11:25 +01:00
parent 3f5dcecc4d
commit c285bb0ab8
No known key found for this signature in database
GPG key ID: DF09F6EAE356B2C6
4 changed files with 30 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -48,7 +48,7 @@ p3ServerConfig::p3ServerConfig(p3PeerMgr *peerMgr, p3LinkMgr *linkMgr, p3NetMgr
RsStackMutex stack(configMtx); /******* LOCKED MUTEX *****/
mUserLevel = RSCONFIG_USER_LEVEL_NEW; /* START LEVEL */
mUserLevel = RsConfigUserLvl::NEW; /* START LEVEL */
mRateDownload = DEFAULT_DOWNLOAD_KB_RATE;
mRateUpload = DEFAULT_UPLOAD_KB_RATE;
@ -264,9 +264,9 @@ std::string p3ServerConfig::getRetroshareDataDirectory()
/* New Stuff */
uint32_t p3ServerConfig::getUserLevel()
RsConfigUserLvl p3ServerConfig::getUserLevel()
{
uint32_t userLevel = RSCONFIG_USER_LEVEL_NEW;
RsConfigUserLvl userLevel = RsConfigUserLvl::NEW;
{
RsStackMutex stack(configMtx); /******* LOCKED MUTEX *****/
userLevel = mUserLevel;
@ -274,33 +274,33 @@ uint32_t p3ServerConfig::getUserLevel()
switch(userLevel)
{
case RSCONFIG_USER_LEVEL_OVERRIDE:
case RsConfigUserLvl::OVERRIDE:
break;
#define MIN_BASIC_FRIENDS 2
// FALL THROUGH EVERYTHING.
default:
case RSCONFIG_USER_LEVEL_NEW:
case RsConfigUserLvl::NEW:
{
if (mPeerMgr->getFriendCount(true, false) > MIN_BASIC_FRIENDS)
{
userLevel = RSCONFIG_USER_LEVEL_BASIC;
userLevel = RsConfigUserLvl::BASIC;
}
}
/* fallthrough */
case RSCONFIG_USER_LEVEL_BASIC:
case RsConfigUserLvl::BASIC:
{
/* check that we have some lastConnect > 0 */
if (mPeerMgr->haveOnceConnected())
{
userLevel = RSCONFIG_USER_LEVEL_CASUAL;
userLevel = RsConfigUserLvl::CASUAL;
}
}
/* fallthrough */
case RSCONFIG_USER_LEVEL_CASUAL:
case RSCONFIG_USER_LEVEL_POWER:
case RsConfigUserLvl::CASUAL:
case RsConfigUserLvl::POWER:
{
/* check that the firewall is open */
@ -314,7 +314,7 @@ uint32_t p3ServerConfig::getUserLevel()
(RsNatHoleMode::NATPMP == firewallMode) ||
(RsNatHoleMode::FORWARDED == firewallMode))))
{
userLevel = RSCONFIG_USER_LEVEL_POWER;
userLevel = RsConfigUserLvl::POWER;
}
}
break; /* for all */

4
libretroshare/src/rsserver/p3serverconfig.h
View file

@ -72,7 +72,7 @@ virtual std::string getRetroshareDataDirectory();
/* New Stuff */
virtual uint32_t getUserLevel();
virtual RsConfigUserLvl getUserLevel();
virtual RsNetState getNetState();
virtual RsNetworkMode getNetworkMode();
@ -108,7 +108,7 @@ bool findConfigurationOption(uint32_t key, std::string &keystr);
p3GeneralConfig *mGeneralConfig;
RsMutex configMtx;
uint32_t mUserLevel; // store last one... will later be a config Item too.
RsConfigUserLvl mUserLevel; // store last one... will later be a config Item too.
float mRateDownload;
float mRateUpload;