X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_nethandler.pas;h=ccaddfc87b2b29e1d2966f78d080aa30db6f7ed1;hb=c55f7817903ddb9173e96819ec8723447b2d4c68;hp=d8b83e043afe46edb44e4a74740553d2575841d4;hpb=1e8d8649f9fa70dd54b628bee55772e2f4b934a0;p=d2df-sdl.git

diff --git a/src/game/g_nethandler.pas b/src/game/g_nethandler.pas
index d8b83e0..ccaddfc 100644
--- a/src/game/g_nethandler.pas
+++ b/src/game/g_nethandler.pas
@@ -34,29 +34,36 @@ implementation
 
 uses sysutils, g_console;
 
+// TODO: Unify this with g_Net_Host_HandlePacket() somehow? They're almost the same.
 procedure g_Net_Client_HandlePacket(P: pENetPacket; Handler: TNetClientMsgHandler);
 var
   MNext: Integer;
   MSize: LongWord;
   MHandled: Boolean = false;
   NetMsg: TMsg;
+  Err: Boolean;
 begin
-  if not NetMsg.Init(P^.data, P^.dataLength, True) then
-    Exit;
+  if not NetMsg.Init(P^.data, P^.dataLength, True)
+    then exit;
 
+  Err := False;
   MNext := 0;
 
-  while NetMsg.BytesLeft() > 0 do
+  while (NetMsg.BytesLeft() > 0) and (not Err) do
   begin
-    MSize := NetMsg.ReadLongWord();
-    MNext := NetMsg.ReadCount + MSize;
-    MHandled := Handler(NetMsg); // TODO: maybe do something with this bool
-    NetMsg.Seek(MNext);
+    try
+      MSize := NetMsg.ReadLongWord();
+      MNext := NetMsg.ReadCount + MSize;
+      MHandled := Handler(NetMsg); // TODO: maybe do something with this bool
+      NetMsg.Seek(MNext);
+    except
+      Err := True;
+    end;
   end;
 
-  MHandled := not MHandled; //k8: stfu, fpc!
-
   enet_packet_destroy(P);
+  //if Err
+  //  then MC_MalformedPacket(S);
 end;
 
 procedure g_Net_Host_HandlePacket(S: pTNetClient; P: pENetPacket; Handler: TNetHostMsgHandler);
@@ -65,32 +72,47 @@ var
   MSize: LongWord;
   MHandled: Boolean = false;
   NetMsg: TMsg;
+  Err: Boolean;
 begin
-  if not NetMsg.Init(P^.data, P^.dataLength, True) then
-    Exit;
+  if not NetMsg.Init(P^.data, P^.dataLength, True)
+    then exit;
 
+  Err := False;
   MNext := 0;
 
-  while NetMsg.BytesLeft() > 0 do
+  while (NetMsg.BytesLeft() > 0) and (not Err) do
   begin
-    MSize := NetMsg.ReadLongWord();
-    MNext := NetMsg.ReadCount + MSize;
-    MHandled := Handler(S, NetMsg); // TODO: maybe do something with this bool
-    NetMsg.Seek(MNext);
+    try
+      MSize := NetMsg.ReadLongWord();
+      MNext := NetMsg.ReadCount + MSize;
+      MHandled := Handler(S, NetMsg); // TODO: maybe do something with this bool
+      NetMsg.Seek(MNext);
+    except
+      Err := True;
+    end;
   end;
 
-  MHandled := not MHandled; //k8: stfu, fpc!
-
   enet_packet_destroy(P);
+  if Err
+    then MH_MalformedPacket(S);
 end;
 
 
 function g_Net_ClientMsgHandler(NetMsg: TMsg): Boolean;
 var
   MID: Byte;
+  Err: Boolean;
 begin
   Result := True;
-  MID := NetMsg.ReadByte();
+  Err := False;
+  try
+    MID := NetMsg.ReadByte();
+  except
+    MID := 0;
+    Err := True;
+  end;
+
+  //if Err then begin MC_MalformedPacket(S); Exit; end;
 
   case MID of
     NET_MSG_CHAT:   MC_RECV_Chat(NetMsg);
@@ -101,6 +123,7 @@ begin
     NET_MSG_GEVENT: MC_RECV_GameEvent(NetMsg);
     NET_MSG_FLAG:   MC_RECV_FlagEvent(NetMsg);
     NET_MSG_GSET:   MC_RECV_GameSettings(NetMsg);
+    NET_MSG_FLAGPOS:MC_RECV_FlagPos(NetMsg);
 
     NET_MSG_PLR:    MC_RECV_PlayerCreate(NetMsg);
     NET_MSG_PLRPOS: MC_RECV_PlayerPos(NetMsg);
@@ -123,6 +146,7 @@ begin
 
     NET_MSG_ISPAWN: MC_RECV_ItemSpawn(NetMsg);
     NET_MSG_IDEL:   MC_RECV_ItemDestroy(NetMsg);
+    NET_MSG_IPOS:   MC_RECV_ItemPos(NetMsg);
 
     NET_MSG_PSTATE: MC_RECV_PanelState(NetMsg);
     NET_MSG_PTEX:   MC_RECV_PanelTexture(NetMsg);
@@ -144,9 +168,18 @@ end;
 function g_Net_ClientLightMsgHandler(NetMsg: TMsg): Boolean;
 var
   MID: Byte;
+  Err: Boolean;
 begin
   Result := True;
-  MID := NetMsg.ReadByte();
+  Err := False;
+  try
+    MID := NetMsg.ReadByte();
+  except
+    MID := 0;
+    Err := True;
+  end;
+
+  //if Err then begin MC_MalformedPacket(S); Exit; end;
 
   case MID of
     NET_MSG_GEVENT: MC_RECV_GameEvent(NetMsg);
@@ -162,9 +195,18 @@ end;
 function g_Net_HostMsgHandler(S: pTNetClient; NetMsg: TMsg): Boolean;
 var
   MID: Byte;
+  Err: Boolean;
 begin
   Result := True;
-  MID := NetMsg.ReadByte();
+  Err := False;
+  try
+    MID := NetMsg.ReadByte();
+  except
+    MID := 0;
+    Err := True;
+  end;
+
+  if Err then begin MH_MalformedPacket(S); Exit; end;
 
   case MID of
     NET_MSG_INFO: MH_RECV_Info(S, NetMsg);
@@ -178,8 +220,8 @@ begin
     NET_MSG_RCON_AUTH: MH_RECV_RCONPassword(S, NetMsg);
     NET_MSG_RCON_CMD:  MH_RECV_RCONCommand(S, NetMsg);
 
-    NET_MSG_MAP_REQUEST: MH_RECV_MapRequest(S, NetMsg);
-    NET_MSG_RES_REQUEST: MH_RECV_ResRequest(S, NetMsg);
+    //NET_MSG_MAP_REQUEST: MH_RECV_MapRequest(S, NetMsg);
+    //NET_MSG_RES_REQUEST: MH_RECV_ResRequest(S, NetMsg);
 
     NET_MSG_VOTE_EVENT: MH_RECV_Vote(S, NetMsg);
   end;