X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_net.pas;h=6a17f7e52be79bf63cea6a249a27b940f5c5b822;hb=fbef4d7a21bdc9a5b9c55f2b7b7d8ecde1151fe0;hp=54b06bf579020e5d0882bbe5b2e7946d710ce1c5;hpb=1ed3829fd20e57c32081d8324a8c2e58ee846419;p=d2df-sdl.git diff --git a/src/game/g_net.pas b/src/game/g_net.pas index 54b06bf..6a17f7e 100644 --- a/src/game/g_net.pas +++ b/src/game/g_net.pas @@ -21,7 +21,7 @@ uses e_log, e_msg, utils, ENet, Classes, md5, MAPDEF{$IFDEF USE_MINIUPNPC}, miniupnpc;{$ELSE};{$ENDIF} const - NET_PROTOCOL_VER = 187; + NET_PROTOCOL_VER = 188; NET_MAXCLIENTS = 24; NET_CHANS = 12; @@ -103,6 +103,7 @@ type 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; @@ -160,9 +161,10 @@ var NetAutoBanLimit: Integer = 5; NetAutoBanPerm: Boolean = True; NetAutoBanWarn: Boolean = False; + NetAutoBanForTimeout: Boolean = False; - NetAuthTimeout: Integer = 36 * 15; - NetPacketTimeout: Integer = 36 * 60; + NetAuthTimeout: Integer = 30 * 1000; + NetPacketTimeout: Integer = 60 * 1000; NetState: Integer = NET_STATE_NONE; @@ -206,13 +208,12 @@ procedure g_Net_Flush(); function g_Net_Host(IPAddr: LongWord; Port: enet_uint16; MaxClients: Cardinal = 16): Boolean; procedure g_Net_Host_Die(); procedure g_Net_Host_Send(ID: Integer; Reliable: Boolean; Chan: Byte = NET_CHAN_GAME); -function g_Net_Host_Update(): enet_size_t; +procedure g_Net_Host_Update(); 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); -function g_Net_Client_Update(): enet_size_t; -function g_Net_Client_UpdateWhileLoading(): enet_size_t; +procedure g_Net_Client_Update(); function g_Net_Client_ByName(Name: string): pTNetClient; function g_Net_Client_ByPlayer(PID: Word): pTNetClient; @@ -918,7 +919,8 @@ begin 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); @@ -1066,7 +1068,8 @@ begin 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); @@ -1265,7 +1268,8 @@ begin 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); @@ -1623,6 +1627,55 @@ begin NetOut.Clear(); end; +procedure g_Net_Host_Disconnect_Client(ID: Integer; Force: Boolean = False); +var + TP: TPlayer; + TC: pTNetClient; +begin + TC := @NetClients[ID]; + if (TC = nil) then Exit; + clearNetClient(NetClients[ID]); + if not (TC^.Used) then Exit; + + TP := g_Player_Get(TC^.Player); + + if TP <> nil then + begin + TP.Lives := 0; + TP.Kill(K_SIMPLEKILL, 0, HIT_DISCON); + g_Console_Add(Format(_lc[I_PLAYER_LEAVE], [TP.Name]), True); + e_WriteLog('NET: Client ' + TP.Name + ' [' + IntToStr(TC^.ID) + '] disconnected.', TMsgType.Notify); + g_Player_Remove(TP.UID); + end; + + if (TC^.Peer^.data <> nil) then + begin + FreeMemory(TC^.Peer^.data); + TC^.Peer^.data := nil; + end; + + if (Force) then + enet_peer_reset(TC^.Peer); + + TC^.Used := False; + TC^.State := NET_STATE_NONE; + TC^.Peer := nil; + TC^.Player := 0; + TC^.Crimes := 0; + 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(); + + g_Console_Add(_lc[I_NET_MSG] + Format(_lc[I_NET_MSG_HOST_DISC], [ID])); + Dec(NetClientCount); + + if NetUseMaster then g_Net_Slist_ServerPlayerLeaves(); +end; + procedure g_Net_Host_CheckPings(); var ClAddr: ENetAddress; @@ -1678,67 +1731,28 @@ begin if (State = NET_STATE_AUTH) and (AuthTime > 0) and (AuthTime <= gTime) then begin g_Net_Penalize(@NetClients[ID], 'auth taking too long'); - AuthTime := gTime + 18; // do it twice a second to give them a chance + AuthTime := gTime + 1000; // do it every second to give them a chance end else if (State = NET_STATE_GAME) and (MsgTime > 0) and (MsgTime <= gTime) then begin - g_Net_Penalize(@NetClients[ID], 'message timeout'); - AuthTime := gTime + 18; // do it twice a second to give them a chance + // client hasn't sent packets in a while; either ban em or kick em + if (NetAutoBanForTimeout) then + begin + g_Net_Penalize(@NetClients[ID], 'message timeout'); + MsgTime := gTime + (NetPacketTimeout div 2) + 500; // wait less for the next check + end + else + begin + e_LogWritefln('NET: client #%u (cid #%u) timed out', [ID, Player]); + g_Net_Host_Disconnect_Client(ID, True); + end; end; end; end; end; -procedure g_Net_Host_Disconnect_Client(ID: Integer; Force: Boolean = False); -var - TP: TPlayer; - TC: pTNetClient; -begin - TC := @NetClients[ID]; - if (TC = nil) then Exit; - clearNetClient(NetClients[ID]); - if not (TC^.Used) then Exit; - - TP := g_Player_Get(TC^.Player); - - if TP <> nil then - begin - TP.Lives := 0; - TP.Kill(K_SIMPLEKILL, 0, HIT_DISCON); - g_Console_Add(Format(_lc[I_PLAYER_LEAVE], [TP.Name]), True); - e_WriteLog('NET: Client ' + TP.Name + ' [' + IntToStr(TC^.ID) + '] disconnected.', TMsgType.Notify); - g_Player_Remove(TP.UID); - end; - - if (Force) then - enet_peer_reset(TC^.Peer); - - TC^.Used := False; - TC^.State := NET_STATE_NONE; - TC^.Peer := nil; - TC^.Player := 0; - TC^.Crimes := 0; - TC^.AuthTime := 0; - TC^.MsgTime := 0; - TC^.RequestedFullUpdate := False; - TC^.WaitForFirstSpawn := False; - TC^.NetOut[NET_UNRELIABLE].Free(); - TC^.NetOut[NET_RELIABLE].Free(); - - if (NetEvent.peer^.data <> nil) then - begin - FreeMemory(NetEvent.peer^.data); - NetEvent.peer^.data := nil; - end; - - g_Console_Add(_lc[I_NET_MSG] + Format(_lc[I_NET_MSG_HOST_DISC], [ID])); - Dec(NetClientCount); - - if NetUseMaster then g_Net_Slist_ServerPlayerLeaves(); -end; - -function g_Net_Host_Update(): enet_size_t; +procedure g_Net_Host_Update(); var IP: string; Port: Word; @@ -1746,7 +1760,6 @@ var TC: pTNetClient; begin IP := ''; - Result := 0; if NetUseMaster then g_Net_Slist_Pulse(); g_Net_Host_CheckPings(); @@ -1931,15 +1944,13 @@ begin g_Net_Flush(); // FIXME: for now, send immediately end; -function g_Net_Client_Update(): enet_size_t; +procedure g_Net_Client_Update(); begin - Result := 0; while (NetHost <> nil) and (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_ClientMsgHandler); end; @@ -1947,37 +1958,12 @@ begin ENET_EVENT_TYPE_DISCONNECT: begin g_Net_Disconnect(True); - Result := 1; Exit; end; end; end end; -function g_Net_Client_UpdateWhileLoading(): enet_size_t; -begin - Result := 0; - 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); - Result := 1; - Exit; - end; - end; - end; - g_Net_Flush(); -end; - function g_Net_Connect(IP: string; Port: enet_uint16): Boolean; var OuterLoop: Boolean; @@ -2060,8 +2046,7 @@ begin 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; @@ -2157,23 +2142,16 @@ var 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; @@ -2582,9 +2560,10 @@ initialization conRegVar('sv_autoban_threshold', @NetAutoBanLimit, '', 'max crimes before autoban (0 = no autoban)'); conRegVar('sv_autoban_permanent', @NetAutoBanPerm, '', 'whether autobans are permanent'); conRegVar('sv_autoban_warn', @NetAutoBanWarn, '', 'send warnings to the client when he triggers penalties'); + conRegVar('sv_autoban_packet_timeout', @NetAutoBanForTimeout, '', 'autoban for packet timeouts'); - conRegVar('sv_auth_timeout', @NetAuthTimeout, '', 'number of frames in which connecting clients must complete auth (0 = unlimited)'); - conRegVar('sv_packet_timeout', @NetPacketTimeout, '', 'number of frames the client must idle to be kicked (0 = unlimited)'); + conRegVar('sv_auth_timeout', @NetAuthTimeout, '', 'number of msec in which connecting clients must complete auth (0 = unlimited)'); + conRegVar('sv_packet_timeout', @NetPacketTimeout, '', 'number of msec the client must idle to be kicked (0 = unlimited)'); conRegVar('net_master_list', @NetMasterList, '', 'list of master servers');