piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 06:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

TraversalProto: Convert TraversalConnectFailedReason into an enum class

Browse Source
This commit is contained in:
Lioncash
2021-01-19 14:05:16 -05:00
parent 2021175809
commit 2f0fb2056e
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/TraversalClient.h
View File

@ -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

10
Source/Core/Common/TraversalProto.h
View File

@ -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;
};
};

6
Source/Core/Common/TraversalServer.cpp
View File

@ -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
{