Renamed egs_proto into psu_proto.

ebin/egs.app

@@ -13,7 +13,7 @@
 		psu_login,
 		psu_patch,
 		psu_instance,
-		egs_proto,
+		psu_proto,
 		psu_appearance,
 		psu_characters,
 		psu_party,

src/egs.erl

@@ -52,7 +52,7 @@ stop() ->
 %% @todo Move that in a psu module.
 global(Type, Message) ->
 	{ok, List} = egs_user_model:select(all),
-	lists:foreach(fun(User) -> egs_proto:send_global(User#egs_user_model.socket, Type, Message) end, List).
+	lists:foreach(fun(User) -> psu_proto:send_global(User#egs_user_model.socket, Type, Message) end, List).
 
 %% @doc Warp all players to a new map.
 %% @todo Move that in a psu module.

src/psu/psu_game.erl

@@ -82,9 +82,9 @@ process_init(CSocket, MPid) ->
 %% @doc Process the new connections.
 %%      Send an hello packet, authenticate the user and send him to character select.
 process() ->
-	case egs_proto:packet_recv(get(socket), 5000) of
+	case psu_proto:packet_recv(get(socket), 5000) of
 		{ok, Orig} ->
-			{command, Command, _, Data} = egs_proto:packet_parse(Orig),
+			{command, Command, _, Data} = psu_proto:packet_parse(Orig),
 			process_handle(Command, Data);
 		{error, timeout} ->
 			reload,
@@ -129,12 +129,12 @@ process_handle(Command, _) ->
 
 %% @doc Character selection screen loop.
 char_select() ->
-	case egs_proto:packet_recv(get(socket), 5000) of
+	case psu_proto:packet_recv(get(socket), 5000) of
 		{ok, Orig} ->
-			{command, Command, _, Data} = egs_proto:packet_parse(Orig),
+			{command, Command, _, Data} = psu_proto:packet_parse(Orig),
 			char_select_handle(Command, Data);
 		{error, timeout} ->
-			egs_proto:send_keepalive(get(socket)),
+			psu_proto:send_keepalive(get(socket)),
 			reload,
 			?MODULE:char_select();
 		{error, closed} ->
@@ -466,7 +466,7 @@ loop(SoFar) ->
 			send_0304(ChatTypeID, ChatGID, ChatName, ChatModifiers, ChatMessage),
 			?MODULE:loop(SoFar);
 		{psu_keepalive} ->
-			egs_proto:send_keepalive(get(socket)),
+			psu_proto:send_keepalive(get(socket)),
 			?MODULE:loop(SoFar);
 		{psu_player_spawn, _Spawn} ->
 			% Should be something along the lines of 203 201 204 or something.
@@ -481,7 +481,7 @@ loop(SoFar) ->
 			area_load(QuestID, ZoneID, MapID, EntryID),
 			?MODULE:loop(SoFar);
 		{ssl, _, Data} ->
-			{Packets, Rest} = egs_proto:packet_split(<< SoFar/bits, Data/bits >>),
+			{Packets, Rest} = psu_proto:packet_split(<< SoFar/bits, Data/bits >>),
 			[dispatch(Orig) || Orig <- Packets],
 			?MODULE:loop(Rest);
 		{ssl_closed, _} ->
@@ -497,7 +497,7 @@ loop(SoFar) ->
 
 %% @doc Dispatch the command to the right handler.
 dispatch(Orig) ->
-	{command, Command, Channel, Data} = egs_proto:packet_parse(Orig),
+	{command, Command, Channel, Data} = psu_proto:packet_parse(Orig),
 	case Channel of
 		ignore -> ignore;
 		1 -> broadcast(Command, Orig);
@@ -1137,7 +1137,7 @@ header(Command) ->
 %% @doc Send the given packet to the client.
 %% @todo Consolidate the receive and send functions better.
 send(Packet) ->
-	egs_proto:packet_send(get(socket), Packet).
+	psu_proto:packet_send(get(socket), Packet).
 
 %% @todo Figure out what this does compared to 0201(self).
 %% @todo Figure out the unknown values.

src/psu/psu_login.erl

@@ -59,13 +59,13 @@ accept(LSocket, SessionID) ->
 %% @doc Process the new connections. Send an hello packet and start the loop.
 process(CSocket, SessionID) ->
 	log(SessionID, "hello"),
-	egs_proto:packet_send(CSocket, << 16#02020300:32, 0:288, SessionID:32/little-unsigned-integer >>),
+	psu_proto:packet_send(CSocket, << 16#02020300:32, 0:288, SessionID:32/little-unsigned-integer >>),
 	?MODULE:loop(CSocket, SessionID).
 
 %% @spec loop(CSocket, SessionID) -> ok
 %% @doc Main loop for the login server.
 loop(CSocket, SessionID) ->
-	case egs_proto:packet_recv(CSocket, 5000) of
+	case psu_proto:packet_recv(CSocket, 5000) of
 		{ok, Orig} ->
 			<< _:32, Command:16/unsigned-integer, _/bits >> = Orig,
 			case handle(Command, CSocket, SessionID, Orig) of
@@ -90,7 +90,7 @@ handle(16#0217, CSocket, SessionID, _) ->
 	IP = ?GAME_IP,
 	Port = ?GAME_PORT,
 	Packet = << 16#02160300:32, 0:192, SessionID:32/little-unsigned-integer, 0:64, IP/binary, Port:32/little-unsigned-integer >>,
-	egs_proto:packet_send(CSocket, Packet),
+	psu_proto:packet_send(CSocket, Packet),
 	ssl:close(CSocket),
 	closed;
 
@@ -109,7 +109,7 @@ handle(16#0219, CSocket, SessionID, Orig) ->
 	Time = calendar:datetime_to_gregorian_seconds(calendar:universal_time()),
 	egs_user_model:write(#egs_user_model{id=SessionID, pid=self(), socket=CSocket, state={wait_for_authentication, Auth}, time=Time, folder=Folder}),
 	Packet = << 16#02230300:32, 0:192, SessionID:32/little-unsigned-integer, 0:64, SessionID:32/little-unsigned-integer, Auth:32/bits >>,
-	egs_proto:packet_send(CSocket, Packet);
+	psu_proto:packet_send(CSocket, Packet);
 
 %% 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.
@@ -122,7 +122,7 @@ handle(Command, CSocket, SessionID, Orig) when Command =:= 16#0226; Command =:=
 	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 >>,
-	egs_proto:packet_send(CSocket, Packet);
+	psu_proto:packet_send(CSocket, Packet);
 
 %% Silently ignore packets 0227 and 080e.
 handle(Command, _, _, _) when Command =:= 16#0227; Command =:= 16#080e ->

src/psu/psu_proto.erl

@@ -16,7 +16,7 @@
 %	You should have received a copy of the GNU General Public License
 %	along with EGS.  If not, see <http://www.gnu.org/licenses/>.
 
--module(egs_proto).
+-module(psu_proto).
 -compile(export_all).
 
 %% @doc Prepare a packet. Return the real size and padding at the end.