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

psu_proto: Move system_motd_request to events.

Browse Source
This commit is contained in:
Loïc Hoguin 2010-09-19 18:41:06 +02:00
parent 05c1cc0dfd
commit 83290bc0ef
2 changed files with 56 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/egs_login.erl
View File

@ -41,17 +41,6 @@ cast(_Command, _Data, _State) ->
ok.
%% Raw commands.
%% @todo Move all of them to events.
%% @doc MOTD request handler. Handles both forms of MOTD requests, US and JP. Page number starts at 0.
%% @todo Currently ignore the language and send the same MOTD file to everyone. Language is 8 bits next to Page.
raw(Command, << _:352, Page:8, _/bits >>, #state{socket=Socket}) when Command =:= 16#0226; Command =:= 16#023f ->
{ok, File} = file:read_file("priv/psu_login/motd.txt"),
Tokens = re:split(File, "\n."),
MOTD = << << Line/binary, "\n", 0 >> || Line <- lists:sublist(Tokens, 1 + Page * 15, 15) >>,
NbPages = 1 + length(Tokens) div 15,
Packet = << 16#0225:16, 0:304, NbPages:8, Page:8, 16#8200:16/unsigned-integer, MOTD/binary, 0:16 >>,
psu_proto:packet_send(Socket, Packet);
%% @doc Dismiss all raw commands with a log notice.
%% @todo Have a log event handler instead.
@ -117,4 +106,14 @@ event({system_login_auth_request, Username, Password}, #state{socket=Socket}) ->
Time = calendar:datetime_to_gregorian_seconds(calendar:universal_time()),
egs_user_model:write(#egs_user_model{id=RealGID, pid=self(), socket=Socket, state={wait_for_authentication, Auth}, time=Time, folder=Folder}),
Packet = << 16#02230300:32, 0:192, RealGID:32/little-unsigned-integer, 0:64, RealGID:32/little-unsigned-integer, Auth:32/bits >>,
psu_proto:packet_send(Socket, Packet);
%% @doc MOTD request handler. Page number starts at 0.
%% @todo Currently ignore the language and send the same MOTD file to everyone.
event({system_motd_request, Page, _Language}, #state{socket=Socket}) ->
{ok, File} = file:read_file("priv/psu_login/motd.txt"),
Tokens = re:split(File, "\n."),
MOTD = << << Line/binary, "\n", 0 >> || Line <- lists:sublist(Tokens, 1 + Page * 15, 15) >>,
NbPages = 1 + length(Tokens) div 15,
Packet = << 16#0225:16, 0:304, NbPages:8, Page:8, 16#8200:16/unsigned-integer, MOTD/binary, 0:16 >>,
psu_proto:packet_send(Socket, Packet).

56
src/psu/psu_proto.erl
View File

@ -327,6 +327,44 @@ parse(Size, 16#021f, Channel, Data) ->
end,
{unicube_select, Selection, EntryID};
%% @doc Seems to be exactly the same as 023f, except Channel, and that it's used for JP clients.
parse(Size, 16#0226, Channel, Data) ->
<< LID:16/little, VarA:16/little, VarB:32/little, VarC:32/little, VarD:32/little, VarE:32/little, VarF:32/little,
VarG:32/little, VarH:32/little, VarI:32/little, Page:8, Language:8, VarJ:16/little >> = Data,
?ASSERT_EQ(Size, 48),
?ASSERT_EQ(Channel, 3),
?ASSERT_EQ(LID, 16#ffff),
?ASSERT_EQ(VarA, 0),
?ASSERT_EQ(VarB, 0),
?ASSERT_EQ(VarC, 0),
?ASSERT_EQ(VarD, 0),
?ASSERT_EQ(VarE, 0),
?ASSERT_EQ(VarF, 0),
?ASSERT_EQ(VarG, 0),
?ASSERT_EQ(VarH, 0),
?ASSERT_EQ(VarI, 0),
?ASSERT_EQ(VarJ, 0),
{system_motd_request, Page, language_integer_to_atom(Language)};
%% @doc Seems to be exactly the same as 0226, except Channel, and that it's used for US clients.
parse(Size, 16#023f, Channel, Data) ->
<< LID:16/little, VarA:16/little, VarB:32/little, VarC:32/little, VarD:32/little, VarE:32/little, VarF:32/little,
VarG:32/little, VarH:32/little, VarI:32/little, Page:8, Language:8, VarJ:16/little >> = Data,
?ASSERT_EQ(Size, 48),
?ASSERT_EQ(Channel, 2),
?ASSERT_EQ(LID, 16#ffff),
?ASSERT_EQ(VarA, 0),
?ASSERT_EQ(VarB, 0),
?ASSERT_EQ(VarC, 0),
?ASSERT_EQ(VarD, 0),
?ASSERT_EQ(VarE, 0),
?ASSERT_EQ(VarF, 0),
?ASSERT_EQ(VarG, 0),
?ASSERT_EQ(VarH, 0),
?ASSERT_EQ(VarI, 0),
?ASSERT_EQ(VarJ, 0),
{system_motd_request, Page, language_integer_to_atom(Language)};
parse(_Size, 16#0304, Channel, Data) ->
<< _LID:16/little, VarB:16/little, VarC:32/little, VarD:32/little, VarE:32/little, VarF:32/little,
VarG:32/little, VarH:32/little, VarI:32/little, VarJ:32/little, FromTypeID:32, FromGID:32/little,
@ -461,20 +499,13 @@ parse(Size, 16#080e, Channel, Data) ->
?ASSERT_EQ(VarP, 0),
?ASSERT_EQ(VarQ, 0),
?ASSERT_EQ(VarR, 0),
AtomLanguage = case Language of
0 -> japanese;
1 -> english;
3 -> french;
4 -> german;
_ -> log("unknown 080e Language ~p", [Language]), unknown
end,
AtomPlatform = case Platform of
0 -> ps2;
1 -> pc;
_ -> log("unknown 080e Platform ~p", [Platform]), unknown
end,
Version = Major * 1000000 + Minor * 1000 + Revision,
{system_client_version_info, AtomLanguage, AtomPlatform, Version};
{system_client_version_info, language_integer_to_atom(Language), AtomPlatform, Version};
%% @todo Find out what it's really doing!
parse(Size, 16#080f, Channel, Data) ->
@ -1205,9 +1236,14 @@ send_0d05(DestUser) ->
Size = 4 + byte_size(Packet),
ssl:send(DestSocket, << Size:32/little, Packet/binary >>).
%% Utility functions.
%% @doc Return the language as an atom from its integer value.
language_integer_to_atom(0) -> japanese;
language_integer_to_atom(1) -> english;
language_integer_to_atom(3) -> french;
language_integer_to_atom(4) -> german;
language_integer_to_atom(Language) -> log("unknown 080e Language ~p", [Language]).
%% @doc Prepare a packet. Return the real size and padding at the end.