X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_netmaster.pas;h=41478f1cb94b74b6c0c8ef0b4b780366cd35fc99;hb=91a5ffe08943e28ecdcf8bb6752f88ff220a4cd9;hp=57d53c989550f8f3f53ba0b2bf255d736f5cea82;hpb=88ce644db1b40111bdb380f4357fa59bdb5173be;p=d2df-sdl.git diff --git a/src/game/g_netmaster.pas b/src/game/g_netmaster.pas index 57d53c9..41478f1 100644 --- a/src/game/g_netmaster.pas +++ b/src/game/g_netmaster.pas @@ -1,3 +1,19 @@ +(* Copyright (C) Doom 2D: Forever Developers + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + *) +{$INCLUDE ../shared/a_modes.inc} unit g_netmaster; interface @@ -23,7 +39,7 @@ type Port: Word; Map: string; Players, MaxPlayers, LocalPl, Bots: Byte; - Ping: Integer; + Ping: Int64; GameMode: Byte; Password: Boolean; PingAddr: ENetAddress; @@ -56,9 +72,8 @@ procedure g_Serverlist_Control(var SL: TNetServerList); implementation uses - SysUtils, e_fixedbuffer, e_input, e_graphics, e_log, g_window, g_net, g_console, - g_map, g_game, g_sound, g_textures, g_gui, g_menu, g_options, g_language, WADEDITOR, - ENetPlatform; + SysUtils, e_msg, e_input, e_graphics, e_log, g_window, g_net, g_console, + g_map, g_game, g_sound, g_gui, g_menu, g_options, g_language, wadreader; var NetMEvent: ENetEvent; @@ -66,55 +81,134 @@ var slFetched: Boolean = False; slDirPressed: Boolean = False; -function GetTimerMS(): Integer; +function GetTimerMS(): Int64; begin - Result := GetTimer() div 1000; + Result := GetTimer() {div 1000}; end; procedure PingServer(var S: TNetServer; Sock: ENetSocket); var Buf: ENetBuffer; - Ping: array [0..5] of Byte; - ClTime: Integer; + Ping: array [0..9] of Byte; + ClTime: Int64; begin ClTime := GetTimerMS(); Buf.data := Addr(Ping[0]); - Buf.dataLength := 6; + Buf.dataLength := 2+8; Ping[0] := Ord('D'); Ping[1] := Ord('F'); - LongInt(Addr(Ping[2])^) := ClTime; + Int64(Addr(Ping[2])^) := ClTime; enet_socket_send(Sock, Addr(S.PingAddr), @Buf, 1); end; +procedure PingBcast(Sock: ENetSocket); +var + S: TNetServer; +begin + S.IP := '255.255.255.255'; + S.Port := NET_PING_PORT; + enet_address_set_host(Addr(S.PingAddr), PChar(Addr(S.IP[1]))); + S.Ping := -1; + S.PingAddr.port := S.Port; + PingServer(S, Sock); +end; + function g_Net_Slist_Fetch(var SL: TNetServerList): Boolean; var Cnt: Byte; P: pENetPacket; MID: Byte; - I, T, RX: Integer; + I, RX: Integer; + T: Int64; Sock: ENetSocket; Buf: ENetBuffer; + InMsg: TMsg; SvAddr: ENetAddress; + FromSL: Boolean; + + procedure ProcessLocal(); + begin + I := Length(SL); + SetLength(SL, I + 1); + with SL[I] do + begin + IP := DecodeIPV4(SvAddr.host); + Port := InMsg.ReadWord(); + Ping := InMsg.ReadInt64(); + Ping := GetTimerMS() - Ping; + Name := InMsg.ReadString(); + Map := InMsg.ReadString(); + GameMode := InMsg.ReadByte(); + Players := InMsg.ReadByte(); + MaxPlayers := InMsg.ReadByte(); + Protocol := InMsg.ReadByte(); + Password := InMsg.ReadByte() = 1; + LocalPl := InMsg.ReadByte(); + Bots := InMsg.ReadWord(); + end; + end; + procedure CheckLocalServers(); + begin + SetLength(SL, 0); + + Sock := enet_socket_create(ENET_SOCKET_TYPE_DATAGRAM); + if Sock = ENET_SOCKET_NULL then Exit; + enet_socket_set_option(Sock, ENET_SOCKOPT_NONBLOCK, 1); + enet_socket_set_option(Sock, ENET_SOCKOPT_BROADCAST, 1); + PingBcast(Sock); + + T := GetTimerMS(); + + InMsg.Alloc(NET_BUFSIZE); + Buf.data := InMsg.Data; + Buf.dataLength := InMsg.MaxSize; + while GetTimerMS() - T <= 500 do + begin + InMsg.Clear(); + + RX := enet_socket_receive(Sock, @SvAddr, @Buf, 1); + if RX <= 0 then continue; + InMsg.CurSize := RX; + + InMsg.BeginReading(); + + if InMsg.ReadChar() <> 'D' then continue; + if InMsg.ReadChar() <> 'F' then continue; + + ProcessLocal(); + end; + + InMsg.Free(); + enet_socket_destroy(Sock); + + if Length(SL) = 0 then SL := nil; + end; begin Result := False; SL := nil; if (NetMHost <> nil) or (NetMPeer <> nil) then + begin + CheckLocalServers(); Exit; + end; if not g_Net_Slist_Connect then + begin + CheckLocalServers(); Exit; + end; - e_WriteLog('Fetching serverlist...', MSG_NOTIFY); + e_WriteLog('Fetching serverlist...', TMsgType.Notify); g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_FETCH]); - e_Buffer_Clear(@NetOut); - e_Buffer_Write(@NetOut, Byte(NET_MMSG_GET)); + NetOut.Clear(); + NetOut.Write(Byte(NET_MMSG_GET)); - P := enet_packet_create(Addr(NetOut.Data), NetOut.Len, Cardinal(ENET_PACKET_FLAG_RELIABLE)); + P := enet_packet_create(NetOut.Data, NetOut.CurSize, Cardinal(ENET_PACKET_FLAG_RELIABLE)); enet_peer_send(NetMPeer, NET_MCHAN_MAIN, P); enet_host_flush(NetMHost); @@ -122,13 +216,13 @@ begin begin if NetMEvent.kind = ENET_EVENT_TYPE_RECEIVE then begin - e_Raw_Seek(0); - MID := e_Raw_Read_Byte(NetMEvent.packet^.data); + if not InMsg.Init(NetMEvent.packet^.data, NetMEvent.packet^.dataLength, True) then continue; + + MID := InMsg.ReadByte(); if MID <> NET_MMSG_GET then continue; - Cnt := e_Raw_Read_Byte(NetMEvent.packet^.data); - e_WriteLog('Retrieved ' + IntToStr(Cnt) + ' server(s).', MSG_NOTIFY); + Cnt := InMsg.ReadByte(); g_Console_Add(_lc[I_NET_MSG] + Format(_lc[I_NET_SLIST_RETRIEVED], [Cnt]), True); if Cnt > 0 then @@ -138,18 +232,18 @@ begin for I := 0 to Cnt - 1 do begin SL[I].Number := I; - SL[I].IP := e_Raw_Read_String(NetMEvent.packet^.data); - SL[I].Port := e_Raw_Read_Word(NetMEvent.packet^.data); - SL[I].Name := e_Raw_Read_String(NetMEvent.packet^.data); - SL[I].Map := e_Raw_Read_String(NetMEvent.packet^.data); - SL[I].GameMode := e_Raw_Read_Byte(NetMEvent.packet^.data); - SL[I].Players := e_Raw_Read_Byte(NetMEvent.packet^.data); - SL[I].MaxPlayers := e_Raw_Read_Byte(NetMEvent.packet^.data); - SL[I].Protocol := e_Raw_Read_Byte(NetMEvent.packet^.data); - SL[I].Password := e_Raw_Read_Byte(NetMEvent.packet^.data) = 1; + SL[I].IP := InMsg.ReadString(); + SL[I].Port := InMsg.ReadWord(); + SL[I].Name := InMsg.ReadString(); + SL[I].Map := InMsg.ReadString(); + SL[I].GameMode := InMsg.ReadByte(); + SL[I].Players := InMsg.ReadByte(); + SL[I].MaxPlayers := InMsg.ReadByte(); + SL[I].Protocol := InMsg.ReadByte(); + SL[I].Password := InMsg.ReadByte() = 1; enet_address_set_host(Addr(SL[I].PingAddr), PChar(Addr(SL[I].IP[1]))); SL[I].Ping := -1; - SL[I].PingAddr.port := SL[I].Port + 1; + SL[I].PingAddr.port := NET_PING_PORT; end; end; @@ -159,9 +253,13 @@ begin end; g_Net_Slist_Disconnect; - e_Buffer_Clear(@NetOut); + NetOut.Clear(); - if Length(SL) = 0 then Exit; + if Length(SL) = 0 then + begin + CheckLocalServers(); + Exit; + end; Sock := enet_socket_create(ENET_SOCKET_TYPE_DATAGRAM); if Sock = ENET_SOCKET_NULL then Exit; @@ -170,49 +268,57 @@ begin for I := Low(SL) to High(SL) do PingServer(SL[I], Sock); + enet_socket_set_option(Sock, ENET_SOCKOPT_BROADCAST, 1); + PingBcast(Sock); + T := GetTimerMS(); - e_Buffer_Clear(@NetIn); - Buf.data := Addr(NetIn.Data); - Buf.dataLength := Length(NetIn.Data); + InMsg.Alloc(NET_BUFSIZE); + Buf.data := InMsg.Data; + Buf.dataLength := InMsg.MaxSize; Cnt := 0; - while Cnt < Length(SL) do + while GetTimerMS() - T <= 500 do begin - if GetTimerMS() - T > 500 then break; - - e_Buffer_Clear(@NetIn); + InMsg.Clear(); RX := enet_socket_receive(Sock, @SvAddr, @Buf, 1); if RX <= 0 then continue; - NetIn.Len := RX + 1; - NetIn.ReadPos := 0; + InMsg.CurSize := RX; - if e_Buffer_Read_Char(@NetIn) <> 'D' then continue; - if e_Buffer_Read_Char(@NetIn) <> 'F' then continue; + InMsg.BeginReading(); + if InMsg.ReadChar() <> 'D' then continue; + if InMsg.ReadChar() <> 'F' then continue; + + FromSL := False; for I := Low(SL) to High(SL) do if (SL[I].PingAddr.host = SvAddr.host) and (SL[I].PingAddr.port = SvAddr.port) then begin with SL[I] do begin - Ping := e_Buffer_Read_LongInt(@NetIn); + Port := InMsg.ReadWord(); + Ping := InMsg.ReadInt64(); Ping := GetTimerMS() - Ping; - Name := e_Buffer_Read_String(@NetIn); - Map := e_Buffer_Read_String(@NetIn); - GameMode := e_Buffer_Read_Byte(@NetIn); - Players := e_Buffer_Read_Byte(@NetIn); - MaxPlayers := e_Buffer_Read_Byte(@NetIn); - Protocol := e_Buffer_Read_Byte(@NetIn); - Password := e_Buffer_Read_Byte(@NetIn) = 1; - LocalPl := e_Buffer_Read_Byte(@NetIn); - Bots := e_Buffer_Read_Word(@NetIn); + Name := InMsg.ReadString(); + Map := InMsg.ReadString(); + GameMode := InMsg.ReadByte(); + Players := InMsg.ReadByte(); + MaxPlayers := InMsg.ReadByte(); + Protocol := InMsg.ReadByte(); + Password := InMsg.ReadByte() = 1; + LocalPl := InMsg.ReadByte(); + Bots := InMsg.ReadWord(); end; + FromSL := True; Inc(Cnt); break; end; + if not FromSL then + ProcessLocal(); end; + InMsg.Free(); enet_socket_destroy(Sock); end; @@ -221,21 +327,21 @@ var Wad, Map: string; Cli: Byte; begin - g_ProcessResourceStr(gMapInfo.Map, @Wad, nil, @Map); - Wad := ExtractFileName(Wad); + Wad := g_ExtractWadNameNoPath(gMapInfo.Map); + Map := g_ExtractFileName(gMapInfo.Map); - e_Buffer_Write(@NetOut, NetServerName); + NetOut.Write(NetServerName); - e_Buffer_Write(@NetOut, Wad + ':\' + Map); - e_Buffer_Write(@NetOut, gGameSettings.GameMode); + NetOut.Write(Wad + ':\' + Map); + NetOut.Write(gGameSettings.GameMode); Cli := NetClientCount; - e_Buffer_Write(@NetOut, Cli); + NetOut.Write(Cli); - e_Buffer_Write(@NetOut, NetMaxClients); + NetOut.Write(NetMaxClients); - e_Buffer_Write(@NetOut, Byte(NET_PROTOCOL_VER)); - e_Buffer_Write(@NetOut, Byte(NetPassword <> '')); + NetOut.Write(Byte(NET_PROTOCOL_VER)); + NetOut.Write(Byte(NetPassword <> '')); end; procedure g_Net_Slist_Update; @@ -246,17 +352,17 @@ var begin if (NetMHost = nil) or (NetMPeer = nil) then Exit; - e_Buffer_Clear(@NetOut); - e_Buffer_Write(@NetOut, Byte(NET_MMSG_UPD)); - e_Buffer_Write(@NetOut, NetAddr.port); + NetOut.Clear(); + NetOut.Write(Byte(NET_MMSG_UPD)); + NetOut.Write(NetAddr.port); g_Net_Slist_WriteInfo(); - P := enet_packet_create(Addr(NetOut.Data), NetOut.Len, Cardinal(ENET_PACKET_FLAG_RELIABLE)); + P := enet_packet_create(NetOut.Data, NetOut.CurSize, Cardinal(ENET_PACKET_FLAG_RELIABLE)); enet_peer_send(NetMPeer, NET_MCHAN_UPD, P); enet_host_flush(NetMHost); - e_Buffer_Clear(@NetOut); + NetOut.Clear(); end; procedure g_Net_Slist_Remove; @@ -264,15 +370,15 @@ var P: pENetPacket; begin if (NetMHost = nil) or (NetMPeer = nil) then Exit; - e_Buffer_Clear(@NetOut); - e_Buffer_Write(@NetOut, Byte(NET_MMSG_DEL)); - e_Buffer_Write(@NetOut, NetAddr.port); + NetOut.Clear(); + NetOut.Write(Byte(NET_MMSG_DEL)); + NetOut.Write(NetAddr.port); - P := enet_packet_create(Addr(NetOut.Data), NetOut.Len, Cardinal(ENET_PACKET_FLAG_RELIABLE)); + P := enet_packet_create(NetOut.Data, NetOut.CurSize, Cardinal(ENET_PACKET_FLAG_RELIABLE)); enet_peer_send(NetMPeer, NET_MCHAN_MAIN, P); enet_host_flush(NetMHost); - e_Buffer_Clear(@NetOut); + NetOut.Clear(); end; function g_Net_Slist_Connect: Boolean; @@ -357,15 +463,17 @@ begin begin enet_address_set_host(@NetSlistAddr, PChar(Addr(IP[1]))); NetSlistAddr.Port := Port; - e_WriteLog('Masterserver address set to ' + IP + ':' + IntToStr(Port), MSG_NOTIFY); + e_WriteLog('Masterserver address set to ' + IP + ':' + IntToStr(Port), TMsgType.Notify); end; end; procedure g_Serverlist_Draw(var SL: TNetServerList); var sy, i, y, mw, mx, l: Integer; - cw, ch: Byte; - ww, hh: Word; + cw: Byte = 0; + ch: Byte = 0; + ww: Word = 0; + hh: Word = 0; ip: string; begin ip := ''; @@ -484,13 +592,15 @@ begin end; procedure g_Serverlist_Control(var SL: TNetServerList); +var + qm: Boolean; begin if gConsoleShow or gChatShow then Exit; - e_PollInput(); + qm := g_ProcessMessages(); // this updates kbd - if e_KeyPressed(IK_ESCAPE) then + if qm or e_KeyPressed(IK_ESCAPE) or e_KeyPressed(VK_ESCAPE) then begin SL := nil; gState := STATE_MENU; @@ -501,7 +611,7 @@ begin Exit; end; - if e_KeyPressed(IK_SPACE) then + if e_KeyPressed(IK_SPACE) or e_KeyPressed(VK_JUMP) then begin if not slFetched then begin @@ -516,7 +626,8 @@ begin slWaitStr := _lc[I_NET_SLIST_NOSERVERS]; end else - slWaitStr := _lc[I_NET_SLIST_ERROR]; + if SL = nil then + slWaitStr := _lc[I_NET_SLIST_ERROR]; slFetched := True; slSelection := 0; end; @@ -526,7 +637,7 @@ begin if SL = nil then Exit; - if e_KeyPressed(IK_RETURN) then + if e_KeyPressed(IK_RETURN) or e_KeyPressed(IK_KPRETURN) or e_KeyPressed(VK_FIRE) or e_KeyPressed(VK_OPEN) then begin if not slReturnPressed then begin @@ -550,7 +661,7 @@ begin else slReturnPressed := False; - if e_KeyPressed(IK_DOWN) then + if e_KeyPressed(IK_DOWN) or e_KeyPressed(IK_KPDOWN) or e_KeyPressed(VK_DOWN) then begin if not slDirPressed then begin @@ -559,8 +670,8 @@ begin slDirPressed := True; end; end; - - if e_KeyPressed(IK_UP) then + + if e_KeyPressed(IK_UP) or e_KeyPressed(IK_KPUP) or e_KeyPressed(VK_UP) then begin if not slDirPressed then begin @@ -571,7 +682,7 @@ begin end; end; - if (not e_KeyPressed(IK_DOWN)) and (not e_KeyPressed(IK_UP)) then + if (not e_KeyPressed(IK_DOWN)) and (not e_KeyPressed(IK_UP)) and (not e_KeyPressed(IK_KPDOWN)) and (not e_KeyPressed(IK_KPUP)) and (not e_KeyPressed(VK_DOWN)) and (not e_KeyPressed(VK_UP)) then slDirPressed := False; end;