diff --git a/src/game/g_net.pas b/src/game/g_net.pas
index a743fa1cfad95dbe8791937cb819c12f72a23ff0..417be8b7c6a568ad6a1742af54ef5f86adab7f00 100644 (file)
--- a/src/game/g_net.pas
+++ b/src/game/g_net.pas
e_log, e_msg, utils, ENet, Classes, md5, MAPDEF{$IFDEF USE_MINIUPNPC}, miniupnpc;{$ELSE};{$ENDIF}
const
- NET_PROTOCOL_VER = 188;
+ NET_PROTOCOL_VER = 189;
NET_MAXCLIENTS = 24;
NET_CHANS = 12;
Player: Word;
RequestedFullUpdate: Boolean;
WaitForFirstSpawn: Boolean; // set to `true` in server, used to spawn a player on first full state request
+ FullUpdateSent: Boolean;
RCONAuth: Boolean;
Voted: Boolean;
Crimes: Integer;
@@ -208,12 +209,12 @@ function g_Net_Host(IPAddr: LongWord; Port: enet_uint16; MaxClients: Cardinal =
procedure g_Net_Host_Die();
procedure g_Net_Host_Send(ID: Integer; Reliable: Boolean; Chan: Byte = NET_CHAN_GAME);
procedure g_Net_Host_Update();
+procedure g_Net_Host_Kick(ID: Integer; Reason: enet_uint32);
function g_Net_Connect(IP: string; Port: enet_uint16): Boolean;
procedure g_Net_Disconnect(Forced: Boolean = False);
procedure g_Net_Client_Send(Reliable: Boolean; Chan: Byte = NET_CHAN_GAME);
procedure g_Net_Client_Update();
-procedure g_Net_Client_UpdateWhileLoading();
function g_Net_Client_ByName(Name: string): pTNetClient;
function g_Net_Client_ByPlayer(PID: Word): pTNetClient;
uses
SysUtils,
- e_input, e_res,
+ e_input, e_res, g_options,
g_nethandler, g_netmsg, g_netmaster, g_player, g_window, g_console,
- g_main, g_game, g_language, g_weapons, ctypes, g_system, g_map;
+ g_game, g_language, g_weapons, ctypes, g_map;
const
FILE_CHUNK_SIZE = 8192;
procedure killClientByFT (var nc: TNetClient);
begin
e_LogWritefln('disconnected client #%d due to file transfer error', [nc.ID], TMsgType.Warning);
- enet_peer_disconnect(nc.Peer, NET_DISC_FILE_TIMEOUT);
+ g_Net_Host_Kick(nc.ID, NET_DISC_FILE_TIMEOUT);
clearNetClientTransfers(nc);
g_Net_Slist_ServerPlayerLeaves();
end;
end;
if (freePacket) then begin freePacket := false; enet_packet_destroy(ev.packet); end;
end;
- ProcessLoading();
+
+ ProcessLoading(False);
if g_Net_UserRequestExit() then
begin
g_Console_Add(_lc[I_NET_MSG_ERROR] + _lc[I_NET_ERR_CONN] + ' user abort', True);
end;
if (freePacket) then begin freePacket := false; enet_packet_destroy(ev.packet); end;
end;
- ProcessLoading();
+
+ ProcessLoading(False);
if g_Net_UserRequestExit() then
begin
g_Console_Add(_lc[I_NET_MSG_ERROR] + _lc[I_NET_ERR_CONN] + ' user abort', True);
end;
if (freePacket) then begin freePacket := false; enet_packet_destroy(ev.packet); end;
end;
- ProcessLoading();
+
+ ProcessLoading(False);
if g_Net_UserRequestExit() then
begin
g_Console_Add(_lc[I_NET_MSG_ERROR] + _lc[I_NET_ERR_CONN] + ' user abort', True);
TC^.AuthTime := 0;
TC^.MsgTime := 0;
TC^.RequestedFullUpdate := False;
+ TC^.FullUpdateSent := False;
TC^.WaitForFirstSpawn := False;
TC^.NetOut[NET_UNRELIABLE].Free();
TC^.NetOut[NET_RELIABLE].Free();
if NetUseMaster then g_Net_Slist_ServerPlayerLeaves();
end;
+procedure g_Net_Host_Kick(ID: Integer; Reason: enet_uint32);
+var
+ Peer: pENetPeer;
+ TC: pTNetClient;
+begin
+ TC := @NetClients[ID];
+ if (TC <> nil) and TC^.Used and (TC^.Peer <> nil) then
+ begin
+ Peer := TC^.Peer;
+ g_Net_Host_Disconnect_Client(ID);
+ enet_peer_disconnect(Peer, Reason);
+ end;
+end;
+
procedure g_Net_Host_CheckPings();
var
ClAddr: ENetAddress;
_lc[I_NET_DISC_PROTOCOL]);
e_WriteLog('NET: Connection request from ' + IP + ' rejected: version mismatch',
TMsgType.Notify);
- NetEvent.peer^.data := GetMemory(SizeOf(Byte));
- Byte(NetEvent.peer^.data^) := 255;
enet_peer_disconnect(NetEvent.peer, NET_DISC_PROTOCOL);
- enet_host_flush(NetHost);
Exit;
end;
_lc[I_NET_DISC_BAN]);
e_WriteLog('NET: Connection request from ' + IP + ' rejected: banned',
TMsgType.Notify);
- NetEvent.peer^.data := GetMemory(SizeOf(Byte));
- Byte(NetEvent.peer^.data^) := 255;
enet_peer_disconnect(NetEvent.Peer, NET_DISC_BAN);
- enet_host_flush(NetHost);
Exit;
end;
_lc[I_NET_DISC_FULL]);
e_WriteLog('NET: Connection request from ' + IP + ' rejected: server full',
TMsgType.Notify);
- NetEvent.Peer^.data := GetMemory(SizeOf(Byte));
- Byte(NetEvent.peer^.data^) := 255;
enet_peer_disconnect(NetEvent.peer, NET_DISC_FULL);
- enet_host_flush(NetHost);
Exit;
end;
end
else
begin
+ if NetEvent.peer^.data = nil then Exit;
+
ID := Byte(NetEvent.peer^.data^);
if ID > High(NetClients) then Exit;
TC := @NetClients[ID];
ENET_EVENT_TYPE_DISCONNECT:
begin
- ID := Byte(NetEvent.peer^.data^);
- if ID > High(NetClients) then Exit;
- g_Net_Host_Disconnect_Client(ID);
+ if NetEvent.peer^.data <> nil then
+ begin
+ ID := Byte(NetEvent.peer^.data^);
+ if ID > High(NetClients) then Exit;
+ g_Net_Host_Disconnect_Client(ID);
+ end;
end;
end;
end;
case NetEvent.kind of
ENET_EVENT_TYPE_RECEIVE:
begin
- if (NetEvent.channelID = NET_CHAN_DOWNLOAD_EX) then continue; // ignore all download packets, they're processed by separate code
if NetDump then g_Net_DumpRecvBuffer(NetEvent.packet^.data, NetEvent.packet^.dataLength);
g_Net_Client_HandlePacket(NetEvent.packet, g_Net_ClientMsgHandler);
end;
end
end;
-procedure g_Net_Client_UpdateWhileLoading();
-begin
- while (enet_host_service(NetHost, @NetEvent, 0) > 0) do
- begin
- case NetEvent.kind of
- ENET_EVENT_TYPE_RECEIVE:
- begin
- if (NetEvent.channelID = NET_CHAN_DOWNLOAD_EX) then continue; // ignore all download packets, they're processed by separate code
- if NetDump then g_Net_DumpRecvBuffer(NetEvent.packet^.data, NetEvent.packet^.dataLength);
- g_Net_Client_HandlePacket(NetEvent.packet, g_Net_ClientLightMsgHandler);
- end;
-
- ENET_EVENT_TYPE_DISCONNECT:
- begin
- g_Net_Disconnect(True);
- Exit;
- end;
- end;
- end;
- g_Net_Flush();
-end;
-
function g_Net_Connect(IP: string; Port: enet_uint16): Boolean;
var
OuterLoop: Boolean;
end;
// предупредить что ждем слишком долго через N секунд
- TimeoutTime := sys_GetTicks() + NET_CONNECT_TIMEOUT;
+ TimeoutTime := GetTickCount64() + NET_CONNECT_TIMEOUT;
OuterLoop := True;
while OuterLoop do
end;
end;
- T := sys_GetTicks();
+ T := GetTickCount64();
if T > TimeoutTime then
begin
TimeoutTime := T + NET_CONNECT_TIMEOUT * 100; // одного предупреждения хватит
g_Console_Add(Format(_lc[I_NET_MSG_PORTS], [Integer(Port), Integer(NET_PING_PORT)]), True);
end;
- ProcessLoading(true);
-
+ ProcessLoading(True);
if e_KeyPressed(IK_SPACE) or e_KeyPressed(IK_ESCAPE) or e_KeyPressed(VK_ESCAPE) or
e_KeyPressed(JOY0_JUMP) or e_KeyPressed(JOY1_JUMP) or e_KeyPressed(JOY2_JUMP) or e_KeyPressed(JOY3_JUMP) then
OuterLoop := False;
begin
dataLength := Length(Data);
- if (Reliable) then
- F := LongWord(ENET_PACKET_FLAG_RELIABLE)
- else
- F := 0;
+ if Reliable
+ then F := LongWord(ENET_PACKET_FLAG_RELIABLE)
+ else F := 0;
- if (peer <> nil) then
- begin
- P := enet_packet_create(@Data[0], dataLength, F);
- if not Assigned(P) then Exit;
- enet_peer_send(peer, Chan, P);
- end
- else
- begin
- P := enet_packet_create(@Data[0], dataLength, F);
- if not Assigned(P) then Exit;
- enet_host_broadcast(NetHost, Chan, P);
- end;
+ P := enet_packet_create(@Data[0], dataLength, F);
+ if not Assigned(P) then exit;
+
+ if peer <> nil
+ then enet_peer_send(peer, Chan, P)
+ else enet_host_broadcast(NetHost, Chan, P);
enet_host_flush(NetHost);
end;
begin
s := '#' + IntToStr(C^.ID); // can't be arsed
g_Net_BanHost(C^.Peer^.address.host, NetAutoBanPerm);
- enet_peer_disconnect(C^.Peer, NET_DISC_BAN);
+ g_Net_Host_Kick(C^.ID, NET_DISC_BAN);
g_Console_Add(Format(_lc[I_PLAYER_BAN], [s]));
MH_SEND_GameEvent(NET_EV_PLAYER_BAN, 0, s);
g_Net_Slist_ServerPlayerLeaves();
if b > NetMaxClients then
begin
s := g_Player_Get(NetClients[a].Player).Name;
- enet_peer_disconnect(NetClients[a].Peer, NET_DISC_FULL);
+ g_Net_Host_Kick(NetClients[a].ID, NET_DISC_FULL);
g_Console_Add(Format(_lc[I_PLAYER_KICK], [s]));
MH_SEND_GameEvent(NET_EV_PLAYER_KICK, 0, s);
end;