X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_net.pas;h=417be8b7c6a568ad6a1742af54ef5f86adab7f00;hb=7987b26c39597f832b3206957ee190a3f5b1564a;hp=3a233da20e47efe7d962b5fb489041afebddda5d;hpb=0e32b76121dd532a73259cbdbf15c43ffdedd5c9;p=d2df-sdl.git diff --git a/src/game/g_net.pas b/src/game/g_net.pas index 3a233da..417be8b 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 = 188; + NET_PROTOCOL_VER = 189; NET_MAXCLIENTS = 24; NET_CHANS = 12; @@ -209,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; @@ -268,9 +268,9 @@ implementation 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; @@ -373,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; @@ -920,7 +920,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); @@ -1068,7 +1069,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); @@ -1267,7 +1269,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); @@ -1674,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; @@ -1780,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; @@ -1793,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; @@ -1808,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; @@ -1849,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]; @@ -1863,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; @@ -1949,7 +1962,6 @@ 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; @@ -1963,28 +1975,6 @@ begin 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; @@ -2038,7 +2028,7 @@ begin end; // предупредить что ждем слишком долго через N секунд - TimeoutTime := sys_GetTicks() + NET_CONNECT_TIMEOUT; + TimeoutTime := GetTickCount64() + NET_CONNECT_TIMEOUT; OuterLoop := True; while OuterLoop do @@ -2059,7 +2049,7 @@ begin end; end; - T := sys_GetTicks(); + T := GetTickCount64(); if T > TimeoutTime then begin TimeoutTime := T + NET_CONNECT_TIMEOUT * 100; // одного предупреждения хватит @@ -2067,8 +2057,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; @@ -2164,23 +2153,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; @@ -2326,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(); @@ -2536,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;