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 RSNET_NATHOLE to enum class

Browse source
This commit is contained in:
sehraf 2020-02-09 21:25:19 +01:00
parent f81755e320
commit d310102808
No known key found for this signature in database
GPG key ID: DF09F6EAE356B2C6
10 changed files with 69 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -306,13 +306,13 @@ uint32_t p3ServerConfig::getUserLevel()
/* check that the firewall is open */
RsNetworkMode netMode = mNetMgr->getNetworkMode();
uint32_t firewallMode = mNetMgr->getNatHoleMode();
RsNatHoleMode firewallMode = mNetMgr->getNatHoleMode();
if ((RsNetworkMode::EXTERNALIP == netMode) ||
((RsNetworkMode::BEHINDNAT == netMode) &&
((RSNET_NATHOLE_UPNP == firewallMode) ||
(RSNET_NATHOLE_NATPMP == firewallMode) ||
(RSNET_NATHOLE_FORWARDED == firewallMode))))
(RsNatHoleMode::UPNP == firewallMode ||
(RsNatHoleMode::NATPMP == firewallMode) ||
(RsNatHoleMode::FORWARDED == firewallMode))))
{
userLevel = RSCONFIG_USER_LEVEL_POWER;
}
@ -344,7 +344,7 @@ RsNatTypeMode p3ServerConfig::getNatTypeMode()
return mNetMgr->getNatTypeMode();
}
uint32_t p3ServerConfig::getNatHoleMode()
RsNatHoleMode p3ServerConfig::getNatHoleMode()
{
return mNetMgr->getNatHoleMode();
}

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

@ -77,7 +77,7 @@ virtual uint32_t getUserLevel();
virtual uint32_t getNetState();
virtual RsNetworkMode getNetworkMode();
virtual RsNatTypeMode getNatTypeMode();
virtual uint32_t getNatHoleMode();
virtual RsNatHoleMode getNatHoleMode();
virtual uint32_t getConnectModes();
virtual bool getConfigurationOption(uint32_t key, std::string &opt);