mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 07:43:01 +01:00
Code Issues Releases Wiki Activity

Close #13628: Refactor MASTER_SERVER_STATUS to strong enum

Browse Source
This commit is contained in:
Tulio Leao
2020-12-22 21:46:12 -03:00
parent 221aa8cece
commit b7f70ab20b
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/openrct2/network/NetworkServerAdvertiser.cpp
View File

@@ -34,12 +34,12 @@
# include <random> # include <random>
# include <string> # include <string>
enum MASTER_SERVER_STATUS enum class MasterServerStatus
{ {
MASTER_SERVER_STATUS_OK = 200, Ok = 200,
MASTER_SERVER_STATUS_INVALID_TOKEN = 401, InvalidToken = 401,
MASTER_SERVER_STATUS_SERVER_NOT_FOUND = 404, ServerNotFound = 404,
MASTER_SERVER_STATUS_INTERNAL_ERROR = 500 InternalError = 500
}; };
# ifndef DISABLE_HTTP # ifndef DISABLE_HTTP
@@ -229,9 +229,9 @@ private:
{ {
Guard::Assert(jsonRoot.is_object(), "OnRegistrationResponse expects parameter jsonRoot to be object"); Guard::Assert(jsonRoot.is_object(), "OnRegistrationResponse expects parameter jsonRoot to be object");
int32_t status = Json::GetNumber<int32_t>(jsonRoot["status"]); auto status = Json::GetEnum<MasterServerStatus>(jsonRoot["status"], MasterServerStatus::InternalError);
if (status == MASTER_SERVER_STATUS_OK) if (status == MasterServerStatus::Ok)
{ {
json_t jsonToken = jsonRoot["token"]; json_t jsonToken = jsonRoot["token"];
if (jsonToken.is_string()) if (jsonToken.is_string())
@@ -251,7 +251,7 @@ private:
// Hack for https://github.com/OpenRCT2/OpenRCT2/issues/6277 // Hack for https://github.com/OpenRCT2/OpenRCT2/issues/6277
// Master server may not reply correctly if using IPv6, retry forcing IPv4, // Master server may not reply correctly if using IPv6, retry forcing IPv4,
// don't wait the full timeout. // don't wait the full timeout.
if (!_forceIPv4 && status == 500) if (!_forceIPv4 && status == MasterServerStatus::InternalError)
{ {
_forceIPv4 = true; _forceIPv4 = true;
_lastAdvertiseTime = 0; _lastAdvertiseTime = 0;
@@ -268,12 +268,12 @@ private:
{ {
Guard::Assert(jsonRoot.is_object(), "OnHeartbeatResponse expects parameter jsonRoot to be object"); Guard::Assert(jsonRoot.is_object(), "OnHeartbeatResponse expects parameter jsonRoot to be object");
int32_t status = Json::GetNumber<int32_t>(jsonRoot["status"]); auto status = Json::GetEnum<MasterServerStatus>(jsonRoot["status"], MasterServerStatus::InternalError);
if (status == MASTER_SERVER_STATUS_OK) if (status == MasterServerStatus::Ok)
{ {
// Master server has successfully updated our server status // Master server has successfully updated our server status
} }
else if (status == MASTER_SERVER_STATUS_INVALID_TOKEN) else if (status == MasterServerStatus::InvalidToken)
{ {
_status = ADVERTISE_STATUS::UNREGISTERED; _status = ADVERTISE_STATUS::UNREGISTERED;
Console::WriteLine("Master server heartbeat failed: Invalid Token"); Console::WriteLine("Master server heartbeat failed: Invalid Token");