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

Browse source
This commit is contained in:
sehraf 2020-02-09 18:23:48 +01:00
parent 101bc32679
commit 0237531322
No known key found for this signature in database
GPG key ID: DF09F6EAE356B2C6
10 changed files with 68 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -305,11 +305,11 @@ uint32_t p3ServerConfig::getUserLevel()
{
/* check that the firewall is open */
uint32_t netMode = mNetMgr->getNetworkMode();
RsNetworkMode netMode = mNetMgr->getNetworkMode();
uint32_t firewallMode = mNetMgr->getNatHoleMode();
if ((RSNET_NETWORK_EXTERNALIP == netMode) ||
((RSNET_NETWORK_BEHINDNAT == netMode) &&
if ((RsNetworkMode::EXTERNALIP == netMode) ||
((RsNetworkMode::BEHINDNAT == netMode) &&
((RSNET_NATHOLE_UPNP == firewallMode) ||
(RSNET_NATHOLE_NATPMP == firewallMode) ||
(RSNET_NATHOLE_FORWARDED == firewallMode))))
@ -334,7 +334,7 @@ uint32_t p3ServerConfig::getNetState()
return mNetMgr->getNetStateMode();
}
uint32_t p3ServerConfig::getNetworkMode()
RsNetworkMode p3ServerConfig::getNetworkMode()
{
return mNetMgr->getNetworkMode();
}

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

@ -75,7 +75,7 @@ virtual std::string getRetroshareDataDirectory();
virtual uint32_t getUserLevel();
virtual uint32_t getNetState();
virtual uint32_t getNetworkMode();
virtual RsNetworkMode getNetworkMode();
virtual uint32_t getNatTypeMode();
virtual uint32_t getNatHoleMode();
virtual uint32_t getConnectModes();