diff options
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/room.cpp | 12 | ||||
| -rw-r--r-- | src/network/room_member.cpp | 4 | ||||
| -rw-r--r-- | src/network/room_member.h | 2 |
3 files changed, 12 insertions, 6 deletions
diff --git a/src/network/room.cpp b/src/network/room.cpp index 34298f010..8c63b255b 100644 --- a/src/network/room.cpp +++ b/src/network/room.cpp | |||
| @@ -221,7 +221,7 @@ public: | |||
| 221 | * Extracts the game name from a received ENet packet and broadcasts it. | 221 | * Extracts the game name from a received ENet packet and broadcasts it. |
| 222 | * @param event The ENet event that was received. | 222 | * @param event The ENet event that was received. |
| 223 | */ | 223 | */ |
| 224 | void HandleGameNamePacket(const ENetEvent* event); | 224 | void HandleGameInfoPacket(const ENetEvent* event); |
| 225 | 225 | ||
| 226 | /** | 226 | /** |
| 227 | * Removes the client from the members list if it was in it and announces the change | 227 | * Removes the client from the members list if it was in it and announces the change |
| @@ -242,7 +242,7 @@ void Room::RoomImpl::ServerLoop() { | |||
| 242 | HandleJoinRequest(&event); | 242 | HandleJoinRequest(&event); |
| 243 | break; | 243 | break; |
| 244 | case IdSetGameInfo: | 244 | case IdSetGameInfo: |
| 245 | HandleGameNamePacket(&event); | 245 | HandleGameInfoPacket(&event); |
| 246 | break; | 246 | break; |
| 247 | case IdProxyPacket: | 247 | case IdProxyPacket: |
| 248 | HandleProxyPacket(&event); | 248 | HandleProxyPacket(&event); |
| @@ -778,6 +778,7 @@ void Room::RoomImpl::BroadcastRoomInformation() { | |||
| 778 | packet.Write(member.fake_ip); | 778 | packet.Write(member.fake_ip); |
| 779 | packet.Write(member.game_info.name); | 779 | packet.Write(member.game_info.name); |
| 780 | packet.Write(member.game_info.id); | 780 | packet.Write(member.game_info.id); |
| 781 | packet.Write(member.game_info.version); | ||
| 781 | packet.Write(member.user_data.username); | 782 | packet.Write(member.user_data.username); |
| 782 | packet.Write(member.user_data.display_name); | 783 | packet.Write(member.user_data.display_name); |
| 783 | packet.Write(member.user_data.avatar_url); | 784 | packet.Write(member.user_data.avatar_url); |
| @@ -817,6 +818,7 @@ void Room::RoomImpl::HandleProxyPacket(const ENetEvent* event) { | |||
| 817 | in_packet.IgnoreBytes(sizeof(u16)); // Port | 818 | in_packet.IgnoreBytes(sizeof(u16)); // Port |
| 818 | 819 | ||
| 819 | in_packet.IgnoreBytes(sizeof(u8)); // Protocol | 820 | in_packet.IgnoreBytes(sizeof(u8)); // Protocol |
| 821 | |||
| 820 | bool broadcast; | 822 | bool broadcast; |
| 821 | in_packet.Read(broadcast); // Broadcast | 823 | in_packet.Read(broadcast); // Broadcast |
| 822 | 824 | ||
| @@ -909,7 +911,7 @@ void Room::RoomImpl::HandleChatPacket(const ENetEvent* event) { | |||
| 909 | } | 911 | } |
| 910 | } | 912 | } |
| 911 | 913 | ||
| 912 | void Room::RoomImpl::HandleGameNamePacket(const ENetEvent* event) { | 914 | void Room::RoomImpl::HandleGameInfoPacket(const ENetEvent* event) { |
| 913 | Packet in_packet; | 915 | Packet in_packet; |
| 914 | in_packet.Append(event->packet->data, event->packet->dataLength); | 916 | in_packet.Append(event->packet->data, event->packet->dataLength); |
| 915 | 917 | ||
| @@ -917,6 +919,7 @@ void Room::RoomImpl::HandleGameNamePacket(const ENetEvent* event) { | |||
| 917 | GameInfo game_info; | 919 | GameInfo game_info; |
| 918 | in_packet.Read(game_info.name); | 920 | in_packet.Read(game_info.name); |
| 919 | in_packet.Read(game_info.id); | 921 | in_packet.Read(game_info.id); |
| 922 | in_packet.Read(game_info.version); | ||
| 920 | 923 | ||
| 921 | { | 924 | { |
| 922 | std::lock_guard lock(member_mutex); | 925 | std::lock_guard lock(member_mutex); |
| @@ -935,7 +938,8 @@ void Room::RoomImpl::HandleGameNamePacket(const ENetEvent* event) { | |||
| 935 | if (game_info.name.empty()) { | 938 | if (game_info.name.empty()) { |
| 936 | LOG_INFO(Network, "{} is not playing", display_name); | 939 | LOG_INFO(Network, "{} is not playing", display_name); |
| 937 | } else { | 940 | } else { |
| 938 | LOG_INFO(Network, "{} is playing {}", display_name, game_info.name); | 941 | LOG_INFO(Network, "{} is playing {} ({})", display_name, game_info.name, |
| 942 | game_info.version); | ||
| 939 | } | 943 | } |
| 940 | } | 944 | } |
| 941 | } | 945 | } |
diff --git a/src/network/room_member.cpp b/src/network/room_member.cpp index 367bf377f..06818af78 100644 --- a/src/network/room_member.cpp +++ b/src/network/room_member.cpp | |||
| @@ -103,7 +103,7 @@ public: | |||
| 103 | 103 | ||
| 104 | /** | 104 | /** |
| 105 | * Extracts a ProxyPacket from a received ENet packet. | 105 | * Extracts a ProxyPacket from a received ENet packet. |
| 106 | * @param event The ENet event that was received. | 106 | * @param event The ENet event that was received. |
| 107 | */ | 107 | */ |
| 108 | void HandleProxyPackets(const ENetEvent* event); | 108 | void HandleProxyPackets(const ENetEvent* event); |
| 109 | 109 | ||
| @@ -315,6 +315,7 @@ void RoomMember::RoomMemberImpl::HandleRoomInformationPacket(const ENetEvent* ev | |||
| 315 | packet.Read(member.fake_ip); | 315 | packet.Read(member.fake_ip); |
| 316 | packet.Read(member.game_info.name); | 316 | packet.Read(member.game_info.name); |
| 317 | packet.Read(member.game_info.id); | 317 | packet.Read(member.game_info.id); |
| 318 | packet.Read(member.game_info.version); | ||
| 318 | packet.Read(member.username); | 319 | packet.Read(member.username); |
| 319 | packet.Read(member.display_name); | 320 | packet.Read(member.display_name); |
| 320 | packet.Read(member.avatar_url); | 321 | packet.Read(member.avatar_url); |
| @@ -622,6 +623,7 @@ void RoomMember::SendGameInfo(const GameInfo& game_info) { | |||
| 622 | packet.Write(static_cast<u8>(IdSetGameInfo)); | 623 | packet.Write(static_cast<u8>(IdSetGameInfo)); |
| 623 | packet.Write(game_info.name); | 624 | packet.Write(game_info.name); |
| 624 | packet.Write(game_info.id); | 625 | packet.Write(game_info.id); |
| 626 | packet.Write(game_info.version); | ||
| 625 | room_member_impl->Send(std::move(packet)); | 627 | room_member_impl->Send(std::move(packet)); |
| 626 | } | 628 | } |
| 627 | 629 | ||
diff --git a/src/network/room_member.h b/src/network/room_member.h index 4252b7146..f578f7f6a 100644 --- a/src/network/room_member.h +++ b/src/network/room_member.h | |||
| @@ -146,7 +146,7 @@ public: | |||
| 146 | const std::string& password = "", const std::string& token = ""); | 146 | const std::string& password = "", const std::string& token = ""); |
| 147 | 147 | ||
| 148 | /** | 148 | /** |
| 149 | * Sends a WiFi packet to the room. | 149 | * Sends a Proxy packet to the room. |
| 150 | * @param packet The WiFi packet to send. | 150 | * @param packet The WiFi packet to send. |
| 151 | */ | 151 | */ |
| 152 | void SendProxyPacket(const ProxyPacket& packet); | 152 | void SendProxyPacket(const ProxyPacket& packet); |