piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-25 23:29:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

refine the LAN protocol some

Browse Source
This commit is contained in:
Arisotura
2023-09-10 11:35:00 +02:00
parent db886e5eb3
commit 3b422cd57b
1 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/frontend/qt_sdl/LAN.cpp
View File

@ -810,19 +810,21 @@ void ProcessHostEvent(ENetEvent& event)
case 0x04: // player connected case 0x04: // player connected
{ {
if (event.packet->dataLength != 2) break; if (event.packet->dataLength != 1) break;
if (data[1] > 15) break; Player* player = (Player*)event.peer->data;
if (!player) break;
ConnectedBitmask |= (1<<data[1]); ConnectedBitmask |= (1 << player->ID);
} }
break; break;
case 0x05: // player disconnected case 0x05: // player disconnected
{ {
if (event.packet->dataLength != 2) break; if (event.packet->dataLength != 1) break;
if (data[1] > 15) break; Player* player = (Player*)event.peer->data;
if (!player) break;
ConnectedBitmask &= ~(1<<data[1]); ConnectedBitmask &= ~(1 << player->ID);
} }
break; break;
} }
@ -862,6 +864,7 @@ void ProcessClientEvent(ENetEvent& event)
} }
RemotePeers[playerid] = event.peer; RemotePeers[playerid] = event.peer;
event.peer->data = &Players[playerid];
} }
break; break;
@ -919,19 +922,21 @@ void ProcessClientEvent(ENetEvent& event)
case 0x04: // player connected case 0x04: // player connected
{ {
if (event.packet->dataLength != 2) break; if (event.packet->dataLength != 1) break;
if (data[1] > 15) break; Player* player = (Player*)event.peer->data;
if (!player) break;
ConnectedBitmask |= (1<<data[1]); ConnectedBitmask |= (1 << player->ID);
} }
break; break;
case 0x05: // player disconnected case 0x05: // player disconnected
{ {
if (event.packet->dataLength != 2) break; if (event.packet->dataLength != 1) break;
if (data[1] > 15) break; Player* player = (Player*)event.peer->data;
if (!player) break;
ConnectedBitmask &= ~(1<<data[1]); ConnectedBitmask &= ~(1 << player->ID);
} }
break; break;
} }
@ -995,12 +1000,12 @@ void MPBegin()
{ {
if (!Host) return; if (!Host) return;
ConnectedBitmask |= (1<<MyPlayer.ID); ConnectedBitmask |= (1 << MyPlayer.ID);
LastHostID = -1; LastHostID = -1;
LastHostPeer = nullptr; LastHostPeer = nullptr;
u8 cmd[2] = {0x04, (u8)MyPlayer.ID}; u8 cmd = 0x04;
ENetPacket* pkt = enet_packet_create(cmd, 2, ENET_PACKET_FLAG_RELIABLE); ENetPacket* pkt = enet_packet_create(&cmd, 1, ENET_PACKET_FLAG_RELIABLE);
enet_host_broadcast(Host, 0, pkt); enet_host_broadcast(Host, 0, pkt);
} }
@ -1008,10 +1013,10 @@ void MPEnd()
{ {
if (!Host) return; if (!Host) return;
ConnectedBitmask &= ~(1<<MyPlayer.ID); ConnectedBitmask &= ~(1 << MyPlayer.ID);
u8 cmd[2] = {0x05, (u8)MyPlayer.ID}; u8 cmd = 0x05;
ENetPacket* pkt = enet_packet_create(&cmd, 2, ENET_PACKET_FLAG_RELIABLE); ENetPacket* pkt = enet_packet_create(&cmd, 1, ENET_PACKET_FLAG_RELIABLE);
enet_host_broadcast(Host, 0, pkt); enet_host_broadcast(Host, 0, pkt);
} }