Sancaros/egs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

game: Fix a small conflict in packet dispatch.

Browse Source 
0b05 ignores the channel and could sometimes send 1, disconnecting the player.
This commit is contained in:
Loïc Hoguin 2010-05-26 05:35:31 +02:00
parent d575eae402
commit 0353915b20
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/egs_game.erl
View File

@ -348,8 +348,11 @@ close(CSocket, GID) ->
dispatch(CSocket, GID, Version, Packet) -> dispatch(CSocket, GID, Version, Packet) ->
<< _:32, Command:16/unsigned-integer, Channel:8/little-unsigned-integer, _/bits >> = Packet, << _:32, Command:16/unsigned-integer, Channel:8/little-unsigned-integer, _/bits >> = Packet,
case Channel of case [Command, Channel] of
1 -> [16#0b05, _] ->
% 0b05 uses the channel for something else, conflicts may occur
handle(Command, CSocket, GID, Version, Packet);
[_, 1] ->
broadcast(Command, GID, Packet); broadcast(Command, GID, Packet);
_ -> _ ->
handle(Command, CSocket, GID, Version, Packet) handle(Command, CSocket, GID, Version, Packet)
@ -367,7 +370,7 @@ broadcast(16#0503, GID, Packet) ->
%% @doc Default broadcast handler. Dispatch the command to everyone. %% @doc Default broadcast handler. Dispatch the command to everyone.
%% We clean up the command and use the real GID and LID of the user, disregarding what was sent and possibly tampered with. %% We clean up the command and use the real GID and LID of the user, disregarding what was sent and possibly tampered with.
%% Only a handful of commands are allowed to broadcast. An user tampering with it would gets disconnected instantly. %% Only a handful of commands are allowed to broadcast. An user tampering with it would get disconnected instantly.
%% @todo Don't query the user data everytime! Keep an User instead of a GID probably. %% @todo Don't query the user data everytime! Keep an User instead of a GID probably.
broadcast(Command, GID, Packet) broadcast(Command, GID, Packet)