From: fgsfds Date: Mon, 5 Jun 2023 23:21:34 +0000 (+0000) Subject: game: proper kick X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=commitdiff_plain;h=6107d1bd653921f093e4d2c81f2905f4e520f6d4 game: proper kick --- diff --git a/src/game/g_game.pas b/src/game/g_game.pas index 200a57a..7510eca 100644 --- a/src/game/g_game.pas +++ b/src/game/g_game.pas @@ -6603,7 +6603,7 @@ begin if (pl <> nil) then begin s := g_Net_ClientName_ByID(pl^.ID); - enet_peer_disconnect(pl^.Peer, NET_DISC_KICK); + g_Net_Host_Kick(pl^.ID, NET_DISC_KICK); g_Console_Add(Format(_lc[I_PLAYER_KICK], [s])); MH_SEND_GameEvent(NET_EV_PLAYER_KICK, 0, s); g_Net_Slist_ServerPlayerLeaves(); @@ -6647,7 +6647,7 @@ begin if NetClients[a].Used and (NetClients[a].Peer <> nil) then begin s := g_Net_ClientName_ByID(NetClients[a].ID); - enet_peer_disconnect(NetClients[a].Peer, NET_DISC_KICK); + g_Net_Host_Kick(NetClients[a].ID, NET_DISC_KICK); g_Console_Add(Format(_lc[I_PLAYER_KICK], [s])); MH_SEND_GameEvent(NET_EV_PLAYER_KICK, 0, s); g_Net_Slist_ServerPlayerLeaves(); @@ -6676,7 +6676,7 @@ begin if (pl <> nil) and pl^.Used and (pl^.Peer <> nil) then begin s := g_Net_ClientName_ByID(pl^.ID); - enet_peer_disconnect(pl^.Peer, NET_DISC_KICK); + g_Net_Host_Kick(pl^.ID, NET_DISC_KICK); g_Console_Add(Format(_lc[I_PLAYER_KICK], [s])); MH_SEND_GameEvent(NET_EV_PLAYER_KICK, 0, s); g_Net_Slist_ServerPlayerLeaves(); @@ -6704,7 +6704,7 @@ begin begin s := g_Net_ClientName_ByID(pl^.ID); g_Net_BanHost(pl^.Peer^.address.host, False); - enet_peer_disconnect(pl^.Peer, NET_DISC_TEMPBAN); + g_Net_Host_Kick(pl^.ID, NET_DISC_TEMPBAN); g_Console_Add(Format(_lc[I_PLAYER_BAN], [s])); MH_SEND_GameEvent(NET_EV_PLAYER_BAN, 0, s); g_Net_Slist_ServerPlayerLeaves(); @@ -6734,7 +6734,7 @@ begin begin s := g_Net_ClientName_ByID(NetClients[a].ID); g_Net_BanHost(NetClients[a].Peer^.address.host, False); - enet_peer_disconnect(NetClients[a].Peer, NET_DISC_TEMPBAN); + g_Net_Host_Kick(NetClients[a].ID, NET_DISC_TEMPBAN); g_Console_Add(Format(_lc[I_PLAYER_BAN], [s])); MH_SEND_GameEvent(NET_EV_PLAYER_BAN, 0, s); g_Net_Slist_ServerPlayerLeaves(); @@ -6763,7 +6763,7 @@ begin begin s := g_Net_ClientName_ByID(pl^.ID); g_Net_BanHost(pl^.Peer^.address.host, False); - enet_peer_disconnect(pl^.Peer, NET_DISC_TEMPBAN); + g_Net_Host_Kick(pl^.ID, NET_DISC_TEMPBAN); g_Console_Add(Format(_lc[I_PLAYER_BAN], [s])); MH_SEND_GameEvent(NET_EV_PLAYER_BAN, 0, s); g_Net_Slist_ServerPlayerLeaves(); @@ -6791,7 +6791,7 @@ begin begin s := g_Net_ClientName_ByID(pl^.ID); g_Net_BanHost(pl^.Peer^.address.host); - enet_peer_disconnect(pl^.Peer, NET_DISC_BAN); + g_Net_Host_Kick(pl^.ID, NET_DISC_BAN); g_Net_SaveBanList(); g_Console_Add(Format(_lc[I_PLAYER_BAN], [s])); MH_SEND_GameEvent(NET_EV_PLAYER_BAN, 0, s); @@ -6822,7 +6822,7 @@ begin begin s := g_Net_ClientName_ByID(NetClients[a].ID); g_Net_BanHost(NetClients[a].Peer^.address.host); - enet_peer_disconnect(NetClients[a].Peer, NET_DISC_BAN); + g_Net_Host_Kick(NetClients[a].ID, NET_DISC_BAN); g_Net_SaveBanList(); g_Console_Add(Format(_lc[I_PLAYER_BAN], [s])); MH_SEND_GameEvent(NET_EV_PLAYER_BAN, 0, s); @@ -6852,7 +6852,7 @@ begin begin s := g_Net_ClientName_ByID(pl^.ID); g_Net_BanHost(pl^.Peer^.address.host); - enet_peer_disconnect(pl^.Peer, NET_DISC_BAN); + g_Net_Host_Kick(pl^.ID, NET_DISC_TEMPBAN); g_Net_SaveBanList(); g_Console_Add(Format(_lc[I_PLAYER_BAN], [s])); MH_SEND_GameEvent(NET_EV_PLAYER_BAN, 0, s); diff --git a/src/game/g_net.pas b/src/game/g_net.pas index 6a17f7e..44485eb 100644 --- a/src/game/g_net.pas +++ b/src/game/g_net.pas @@ -209,6 +209,7 @@ 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); @@ -372,7 +373,7 @@ const 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; @@ -1676,6 +1677,20 @@ begin 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; @@ -1782,10 +1797,7 @@ begin _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; @@ -1795,10 +1807,7 @@ begin _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; @@ -1810,10 +1819,7 @@ begin _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; @@ -1851,6 +1857,8 @@ begin end else begin + if NetEvent.peer^.data = nil then Exit; + ID := Byte(NetEvent.peer^.data^); if ID > High(NetClients) then Exit; TC := @NetClients[ID]; @@ -1865,9 +1873,12 @@ begin 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; @@ -2297,7 +2308,7 @@ begin 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(); @@ -2507,7 +2518,7 @@ begin 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; diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas index e41eafe..73c65e3 100644 --- a/src/game/g_netmsg.pas +++ b/src/game/g_netmsg.pas @@ -341,7 +341,7 @@ procedure MH_MalformedPacket(C: pTNetClient); begin g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_MSG_HOST_REJECT] + _lc[I_NET_DISC_PROTOCOL]); - enet_peer_disconnect(C^.Peer, NET_DISC_PROTOCOL); + g_Net_Host_Kick(C^.ID, NET_DISC_PROTOCOL); end; procedure MH_RECV_Chat(C: pTNetClient; var M: TMsg); @@ -414,7 +414,7 @@ begin begin g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_MSG_HOST_REJECT] + _lc[I_NET_DISC_VERSION]); - enet_peer_disconnect(C^.Peer, NET_DISC_VERSION); + g_Net_Host_Kick(C^.ID, NET_DISC_VERSION); Exit; end; @@ -424,13 +424,13 @@ begin begin g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_MSG_HOST_REJECT] + _lc[I_NET_DISC_BAN]); - enet_peer_disconnect(C^.Peer, NET_DISC_BAN); + g_Net_Host_Kick(C^.ID, NET_DISC_BAN); end else begin g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_MSG_HOST_REJECT] + _lc[I_NET_DISC_BAN]); - enet_peer_disconnect(C^.Peer, NET_DISC_TEMPBAN); + g_Net_Host_Kick(C^.ID, NET_DISC_TEMPBAN); end; Exit; end; @@ -440,7 +440,7 @@ begin begin g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_MSG_HOST_REJECT] + _lc[I_NET_DISC_PASSWORD]); - enet_peer_disconnect(C^.Peer, NET_DISC_PASSWORD); + g_Net_Host_Kick(C^.ID, NET_DISC_PASSWORD); Exit; end;