summaryrefslogtreecommitdiff
path: root/Source/Core/Common
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2021-01-19 14:05:16 -0500
committerLioncash <mathew1800@gmail.com>2021-01-20 12:24:05 -0500
commit2f0fb2056e126e80eaaa76e9b410525591fca53d (patch)
treeab398a45a47428203e8ac984f2f8962cc96871d6 /Source/Core/Common
parent20211758090207ed3b0d1d59f388d58fb8c74485 (diff)
TraversalProto: Convert TraversalConnectFailedReason into an enum class
Diffstat (limited to 'Source/Core/Common')
-rw-r--r--Source/Core/Common/TraversalClient.h2
-rw-r--r--Source/Core/Common/TraversalProto.h10
-rw-r--r--Source/Core/Common/TraversalServer.cpp6
3 files changed, 9 insertions, 9 deletions
diff --git a/Source/Core/Common/TraversalClient.h b/Source/Core/Common/TraversalClient.h
index d322761ffd..9d61680771 100644
--- a/Source/Core/Common/TraversalClient.h
+++ b/Source/Core/Common/TraversalClient.h
@@ -19,7 +19,7 @@ public:
virtual ~TraversalClientClient() = default;
virtual void OnTraversalStateChanged() = 0;
virtual void OnConnectReady(ENetAddress addr) = 0;
- virtual void OnConnectFailed(u8 reason) = 0;
+ virtual void OnConnectFailed(TraversalConnectFailedReason reason) = 0;
};
class TraversalClient
diff --git a/Source/Core/Common/TraversalProto.h b/Source/Core/Common/TraversalProto.h
index 828d782626..95ef2bb994 100644
--- a/Source/Core/Common/TraversalProto.h
+++ b/Source/Core/Common/TraversalProto.h
@@ -34,11 +34,11 @@ enum
TraversalProtoVersion = 0
};
-enum TraversalConnectFailedReason
+enum class TraversalConnectFailedReason : u8
{
- TraversalConnectFailedClientDidntRespond = 0,
- TraversalConnectFailedClientFailure,
- TraversalConnectFailedNoSuchClient
+ ClientDidntRespond = 0,
+ ClientFailure,
+ NoSuchClient,
};
#pragma pack(push, 1)
@@ -88,7 +88,7 @@ struct TraversalPacket
struct
{
TraversalRequestId requestId;
- u8 reason;
+ TraversalConnectFailedReason reason;
} connectFailed;
};
};
diff --git a/Source/Core/Common/TraversalServer.cpp b/Source/Core/Common/TraversalServer.cpp
index 80d32d52fa..2c383bcbd7 100644
--- a/Source/Core/Common/TraversalServer.cpp
+++ b/Source/Core/Common/TraversalServer.cpp
@@ -247,7 +247,7 @@ static void ResendPackets()
TraversalPacket* fail = AllocPacket(MakeSinAddr(p.first));
fail->type = TraversalPacketConnectFailed;
fail->connectFailed.requestId = p.second;
- fail->connectFailed.reason = TraversalConnectFailedClientDidntRespond;
+ fail->connectFailed.reason = TraversalConnectFailedReason::ClientDidntRespond;
}
}
@@ -280,7 +280,7 @@ static void HandlePacket(TraversalPacket* packet, sockaddr_in6* addr)
{
ready->type = TraversalPacketConnectFailed;
ready->connectFailed.requestId = info->misc;
- ready->connectFailed.reason = TraversalConnectFailedClientFailure;
+ ready->connectFailed.reason = TraversalConnectFailedReason::ClientFailure;
}
}
@@ -332,7 +332,7 @@ static void HandlePacket(TraversalPacket* packet, sockaddr_in6* addr)
TraversalPacket* reply = AllocPacket(*addr);
reply->type = TraversalPacketConnectFailed;
reply->connectFailed.requestId = packet->requestId;
- reply->connectFailed.reason = TraversalConnectFailedNoSuchClient;
+ reply->connectFailed.reason = TraversalConnectFailedReason::NoSuchClient;
}
else
{