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

convert RSNET_NETSTATE to enum class

Browse source
This commit is contained in:
sehraf 2020-02-09 21:58:56 +01:00
parent acda7b8cc4
commit 3f5dcecc4d
No known key found for this signature in database
GPG key ID: DF09F6EAE356B2C6
11 changed files with 87 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

39
libretroshare/src/retroshare/rsconfig.h
View file

@ -78,27 +78,28 @@ enum class RsConnectModes : uint16_t
};
RS_REGISTER_ENUM_FLAGS_TYPE(RsConnectModes)
// net state (good, okay, bad)
// BAD. (RED)
#define RSNET_NETSTATE_BAD_UNKNOWN 1
#define RSNET_NETSTATE_BAD_OFFLINE 2
#define RSNET_NETSTATE_BAD_NATSYM 3
#define RSNET_NETSTATE_BAD_NODHT_NAT 4
enum class RsNetState : uint8_t
{
// BAD. (RED)
BAD_UNKNOWN = 1,
BAD_OFFLINE = 2,
BAD_NATSYM = 3,
BAD_NODHT_NAT = 4,
// CAUTION. (ORANGE)
#define RSNET_NETSTATE_WARNING_RESTART 5
#define RSNET_NETSTATE_WARNING_NATTED 6
#define RSNET_NETSTATE_WARNING_NODHT 7
// CAUTION. (ORANGE)
WARNING_RESTART = 5,
WARNING_NATTED = 6,
WARNING_NODHT = 7,
// GOOD (GREEN)
// NAT with forwarded port, or EXT port.
#define RSNET_NETSTATE_GOOD 8
// ADVANCED MODE (BLUE)
// If the user knows what they are doing... we cannot confirm this.
#define RSNET_NETSTATE_ADV_FORWARD 9
#define RSNET_NETSTATE_ADV_DARK_FORWARD 10
// GOOD (GREEN)
// NAT with forwarded port, or EXT port.
GOOD = 8,
// ADVANCED MODE (BLUE)
// If the user knows what they are doing... we cannot confirm this.
ADV_FORWARD = 9,
ADV_DARK_FORWARD= 10
};
/* matched to the uPnP states */
#define UPNP_STATE_UNINITIALISED 0
@ -360,7 +361,7 @@ public:
virtual uint32_t getUserLevel() = 0;
virtual uint32_t getNetState() = 0;
virtual RsNetState getNetState() = 0;
virtual RsNetworkMode getNetworkMode() = 0;
virtual RsNatTypeMode getNatTypeMode() = 0;
virtual RsNatHoleMode getNatHoleMode() = 0;