X-Git-Url: https://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fgame%2Fg_netmaster.pas;h=393c4e572fc5191271ce324832860541376bfb79;hp=f8246d64bf04c85ec4533c5e2204e431da5a8a40;hb=3ef8e8c536c444b9e8a0adf38908d25082584e92;hpb=2304c541d7bdbf7de389437482ecdff37fc7fbd5 diff --git a/src/game/g_netmaster.pas b/src/game/g_netmaster.pas index f8246d6..393c4e5 100644 --- a/src/game/g_netmaster.pas +++ b/src/game/g_netmaster.pas @@ -34,10 +34,10 @@ type TNetServer = record Number: Byte; Protocol: Byte; - Name: string; - IP: string; + Name: AnsiString; + IP: AnsiString; Port: Word; - Map: string; + Map: AnsiString; Players, MaxPlayers, LocalPl, Bots: Byte; Ping: Int64; GameMode: Byte; @@ -58,94 +58,98 @@ type TMasterHost = record public hostName: AnsiString; - hostPort: Word; public - //host: pENetHost; peer: pENetPeer; - event: ENetEvent; enetAddr: ENetAddress; // inside the game, calling `connect()` is disasterous, as it is blocking. // so we'll use this variable to indicate if "connected" event is received. NetHostConnected: Boolean; - NetHostConReqTime: Int64; // to timeout `connect` + NetHostConReqTime: Int64; // to timeout `connect`; -1 means "waiting for shutdown" NetUpdatePending: Boolean; // should we send an update after connection completes? + lastConnectTime: Int64; updateSent: Boolean; lastUpdateTime: Int64; - addressInited: Boolean; + // server list request working flags + srvAnswered: Integer; + srvAnswer: array of TNetServer; + slMOTD: AnsiString; + slUrgent: AnsiString; + slReadUrgent: Boolean; + // temporary mark + justAdded: Boolean; private netmsg: TMsg; - private - function processPendingConnection (timeout: Integer=0): Boolean; - public - constructor Create (hostandport: AnsiString); + constructor Create (var ea: ENetAddress); procedure clear (); - function setAddress (hostandport: AnsiString): Boolean; + function setAddress (var ea: ENetAddress; hostStr: AnsiString): Boolean; function isValid (): Boolean; function isAlive (): Boolean; // not disconnected function isConnecting (): Boolean; // is connection in progress? function isConnected (): Boolean; - // returns `false` if connection failed - function waitForConnection (): Boolean; - // call as often as you want, the object will do the rest // but try to call this at least once in 100 msecs - // returns `true` if we got a packet (it won't be parsed to TMsg) - function service (timeout: Integer=0): Boolean; + procedure pulse (); - procedure disconnect (spamConsole: Boolean=false); + procedure disconnect (forced: Boolean); function connect (): Boolean; - procedure update (immediateSend: Boolean=true); + procedure update (); procedure remove (); class procedure writeInfo (var msg: TMsg); static; - // call only if `service()` returned `true`! - procedure clearPacket (); + procedure connectedEvent (); + procedure disconnectedEvent (); + procedure receivedEvent (pkt: pENetPacket); // `pkt` is never `nil` end; var slCurrent: TNetServerList = nil; slTable: TNetServerTable = nil; - slWaitStr: string = ''; + slWaitStr: AnsiString = ''; slReturnPressed: Boolean = True; - slMOTD: string = ''; - slUrgent: string = ''; - -procedure g_Net_Slist_Set (IP: string; Port: Word); -function g_Net_Slist_Fetch (var SL: TNetServerList): Boolean; + slMOTD: AnsiString = ''; + slUrgent: AnsiString = ''; -{ -procedure g_Net_Slist_Update (immediateSend: Boolean=true); -procedure g_Net_Slist_Remove (); -function g_Net_Slist_Connect (blocking: Boolean=True): Boolean; -procedure g_Net_Slist_Check (); -procedure g_Net_Slist_Disconnect (spamConsole: Boolean=true); -procedure g_Net_Slist_WriteInfo (); -function g_Net_Slist_IsConnectionActive (): Boolean; // returns `false` if totally disconnected -function g_Net_Slist_IsConnectionInProgress (): Boolean; -} +procedure g_Net_Slist_Set (IP: AnsiString; Port: Word; list: AnsiString=''); +function g_Net_Slist_Fetch (var SL: TNetServerList): Boolean; // make this server private procedure g_Net_Slist_Private (); - -// called on network mode init -procedure g_Net_Slist_NetworkStarted (); -// called on network mode shutdown -procedure g_Net_Slist_NetworkStopped (); - -procedure g_Net_Slist_Pulse (); +// make this server public +procedure g_Net_Slist_Public (); + +// called while the server is running +procedure g_Net_Slist_ServerUpdate (); +// called when the server is started +procedure g_Net_Slist_ServerStarted (); +// called when the server is stopped +procedure g_Net_Slist_ServerClosed (); + +// called when new netword player comes +procedure g_Net_Slist_ServerPlayerComes (); +// called when new netword player comes +procedure g_Net_Slist_ServerPlayerLeaves (); +// started new map +procedure g_Net_Slist_ServerMapStarted (); +// this server renamed (or password mode changed, or other params changed) +procedure g_Net_Slist_ServerRenamed (); + +// non-zero timeout ignores current status (used to fetch server list) +procedure g_Net_Slist_Pulse (timeout: Integer=0); + +procedure g_Net_Slist_ShutdownAll (); procedure g_Serverlist_GenerateTable (SL: TNetServerList; var ST: TNetServerTable); procedure g_Serverlist_Draw (var SL: TNetServerList; var ST: TNetServerTable); @@ -159,74 +163,338 @@ implementation uses 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, g_basic, - wadreader, g_system, utils; + wadreader, g_system, utils, hashtable; -// make this server private + +// ////////////////////////////////////////////////////////////////////////// // +var + NetMHost: pENetHost = nil; + NetMEvent: ENetEvent; + mlist: array of TMasterHost = nil; + + slSelection: Byte = 0; + slFetched: Boolean = False; + slDirPressed: Boolean = False; + slReadUrgent: Boolean = False; + + reportsEnabled: Boolean = true; + + +//========================================================================== +// +// GetTimerMS +// +//========================================================================== +function GetTimerMS (): Int64; +begin + Result := sys_GetTicks() {div 1000}; +end; + + +//========================================================================== +// +// findByPeer +// +//========================================================================== +function findByPeer (peer: pENetPeer): Integer; +var + f: Integer; +begin + for f := 0 to High(mlist) do if (mlist[f].peer = peer) then begin result := f; exit; end; + result := -1; +end; + + +//========================================================================== +// +// ShutdownAll +// +//========================================================================== +procedure g_Net_Slist_ShutdownAll (); +var + f, sres, idx: Integer; + stt, ct: Int64; + activeCount: Integer = 0; +begin + if (NetMHost = nil) then exit; + for f := 0 to High(mlist) do + begin + if (mlist[f].isAlive()) then + begin + Inc(activeCount); + if (mlist[f].isConnected() and mlist[f].updateSent) then + begin + writeln('unregistering from [', mlist[f].hostName, ']'); + mlist[f].remove(); + end; + //mlist[f].disconnect(false); + enet_peer_disconnect_later(mlist[f].peer, 0); + end; + end; + if (activeCount = 0) then exit; + stt := GetTimerMS(); + while (activeCount > 0) do + begin + ct := GetTimerMS(); + if (ct < stt) or (ct-stt >= 1500) then break; + + sres := enet_host_service(NetMHost, @NetMEvent, 100); + if (sres < 0) then break; + if (sres = 0) then continue; + + idx := findByPeer(NetMEvent.peer); + if (idx < 0) then + begin + if (NetMEvent.kind = ENET_EVENT_TYPE_RECEIVE) then enet_packet_destroy(NetMEvent.packet); + continue; + end; + + if (NetMEvent.kind = ENET_EVENT_TYPE_CONNECT) then + begin + mlist[idx].connectedEvent(); + //mlist[idx].disconnect(false); + enet_peer_disconnect(mlist[f].peer, 0); + end + else if (NetMEvent.kind = ENET_EVENT_TYPE_DISCONNECT) then + begin + mlist[idx].disconnectedEvent(); + Dec(activeCount); + end + else if (NetMEvent.kind = ENET_EVENT_TYPE_RECEIVE) then + begin + mlist[idx].receivedEvent(NetMEvent.packet); + enet_packet_destroy(NetMEvent.packet); + end; + end; + enet_host_destroy(NetMHost); + NetMHost := nil; +end; + + +//========================================================================== +// +// DisconnectAll +// +//========================================================================== +procedure DisconnectAll (forced: Boolean=false); +var + f: Integer; +begin + for f := 0 to High(mlist) do + begin + if (mlist[f].isAlive()) then mlist[f].disconnect(forced); + end; +end; + + +//========================================================================== +// +// ConnectAll +// +//========================================================================== +procedure ConnectAll (sendUpdate: Boolean); +var + f: Integer; +begin + for f := 0 to High(mlist) do + begin + // force reconnect + mlist[f].lastConnectTime := 0; + //if (not mlist[f].isAlive()) then continue; + // force updating + if (sendUpdate) then + begin + mlist[f].NetUpdatePending := true; + mlist[f].lastUpdateTime := 0; + end; + end; +end; + + +//========================================================================== +// +// UpdateAll +// +//========================================================================== +procedure UpdateAll (force: Boolean); +var + f: Integer; +begin + for f := 0 to High(mlist) do + begin + if (not mlist[f].isAlive()) then continue; + mlist[f].NetUpdatePending := true; + if (force) then mlist[f].lastUpdateTime := 0; + end; +end; + + +//************************************************************************** +// +// public api +// +//************************************************************************** + +//========================================================================== +// +// g_Net_Slist_Private +// +// make this server private +// +//========================================================================== procedure g_Net_Slist_Private (); begin + DisconnectAll(); + reportsEnabled := false; end; -// called on network mode init -procedure g_Net_Slist_NetworkStarted (); +//========================================================================== +// +// g_Net_Slist_Public +// +// make this server public +// +//========================================================================== +procedure g_Net_Slist_Public (); begin + if (not reportsEnabled) then + begin + reportsEnabled := true; + ConnectAll(true); + end; end; -// called on network mode shutdown -procedure g_Net_Slist_NetworkStopped (); + +//========================================================================== +// +// g_Net_Slist_ServerUpdate +// +// called while the server is running +// +//========================================================================== +procedure g_Net_Slist_ServerUpdate (); begin + UpdateAll(false); end; +// called when the server is started +procedure g_Net_Slist_ServerStarted (); +begin + reportsEnabled := NetUseMaster; + if reportsEnabled and g_Game_IsServer() and g_Game_IsNet() then + begin + writeln('*** server started; reporting to master...'); + ConnectAll(true); + end; +end; + + +//========================================================================== +// +// g_Net_Slist_ServerClosed +// +// called when the server is stopped +// +//========================================================================== +procedure g_Net_Slist_ServerClosed (); var - NetMHost: pENetHost = nil; - mlist: array of TMasterHost = nil; + f: Integer; +begin + if reportsEnabled then + begin + reportsEnabled := false; + for f := 0 to High(mlist) do + begin + if (mlist[f].isConnected()) then mlist[f].remove(); + end; + end; + DisconnectAll(); +end; - slSelection: Byte = 0; - slFetched: Boolean = False; - slDirPressed: Boolean = False; - slReadUrgent: Boolean = False; - { - NetMHost: pENetHost = nil; - NetMPeer: pENetPeer = nil; - NetMEvent: ENetEvent; - // inside the game, calling `g_Net_Slist_Connect()` is disasterous, as it is blocking. - // so we'll use this variable to indicate if "connected" event is received. - NetHostConnected: Boolean = false; - NetHostConReqTime: Int64 = 0; // to timeout `connect` - NetUpdatePending: Boolean = false; - } + +//========================================================================== +// +// g_Net_Slist_ServerPlayerComes +// +// called when new netword player comes +// +//========================================================================== +procedure g_Net_Slist_ServerPlayerComes (); +begin + UpdateAll(true); +end; //========================================================================== // -// GetTimerMS +// g_Net_Slist_ServerPlayerLeaves +// +// called when new netword player comes // //========================================================================== -function GetTimerMS (): Int64; +procedure g_Net_Slist_ServerPlayerLeaves (); begin - Result := sys_GetTicks() {div 1000}; + UpdateAll(true); end; +//========================================================================== +// +// g_Net_Slist_ServerMapStarted +// +// started new map +// +//========================================================================== +procedure g_Net_Slist_ServerMapStarted (); +begin + UpdateAll(true); +end; + + +//========================================================================== +// +// g_Net_Slist_ServerRenamed +// +// this server renamed (or password mode changed, or other params changed) +// +//========================================================================== +procedure g_Net_Slist_ServerRenamed (); +begin + UpdateAll(true); +end; + + +//************************************************************************** +// +// TMasterHost +// +//************************************************************************** + //========================================================================== // // TMasterHost.Create // //========================================================================== -constructor TMasterHost.Create (hostandport: AnsiString); +constructor TMasterHost.Create (var ea: ENetAddress); begin - //host := nil; peer := nil; - ZeroMemory(@event, sizeof(event)); NetHostConnected := false; NetHostConReqTime := 0; NetUpdatePending := false; + lastConnectTime := 0; updateSent := false; + lastUpdateTime := 0; hostName := ''; - hostPort := 25665; + ZeroMemory(@enetAddr, sizeof(enetAddr)); + SetLength(srvAnswer, 0); + srvAnswered := 0; + slMOTD := ''; + slUrgent := ''; + slReadUrgent := true; netmsg.Alloc(NET_BUFSIZE); - setAddress(hostandport); + setAddress(ea, ''); end; @@ -238,10 +506,15 @@ end; procedure TMasterHost.clear (); begin updateSent := false; // do not send 'remove' - disconnect(); + disconnect(true); hostName := ''; - hostPort := 25665; netmsg.Free(); + SetLength(srvAnswer, 0); + srvAnswered := 0; + slMOTD := ''; + slUrgent := ''; + slReadUrgent := true; + ZeroMemory(@enetAddr, sizeof(enetAddr)); end; @@ -250,47 +523,24 @@ end; // TMasterHost.setAddress // //========================================================================== -function TMasterHost.setAddress (hostandport: AnsiString): Boolean; -var - cp, pp: Integer; +function TMasterHost.setAddress (var ea: ENetAddress; hostStr: AnsiString): Boolean; begin result := false; + SetLength(srvAnswer, 0); + srvAnswered := 0; + slMOTD := ''; + slUrgent := ''; + slReadUrgent := true; updateSent := false; // do not send 'remove' - disconnect(); - addressInited := false; + disconnect(true); hostName := ''; - hostPort := 25665; - hostandport := Trim(hostandport); - if (length(hostandport) > 0) then - begin - hostName := hostandport; - cp := Pos(':', hostandport); - if (cp > 0) then - begin - hostName := Copy(hostandport, 1, cp-1); - Delete(hostandport, 1, cp); - if (length(hostandport) > 0) then - begin - try - pp := StrToInt(hostandport); - except - pp := -1; - end; - if (pp > 0) and (pp < 65536) then hostPort := pp else hostPort := 0; - end; - end; - end; - if not isValid() then exit; - if (NetInitDone) then - begin - if (enet_address_set_host(@enetAddr, PChar(Addr(hostName[1]))) <> 0) then - begin - hostName := ''; - hostPort := 0; - end; - enetAddr.Port := hostPort; - end; + if (not g_Net_IsNetworkAvailable()) then exit; + + enetAddr := ea; + if (enetAddr.host = 0) or (enetAddr.port = 0) then exit; + + if (length(hostStr) > 0) then hostName := hostStr else hostName := IntToStr(enetAddr.host)+':'+IntToStr(ea.port); result := isValid(); end; @@ -303,7 +553,7 @@ end; //========================================================================== function TMasterHost.isValid (): Boolean; begin - result := (length(hostName) > 0) and (hostPort > 0); + result := (enetAddr.host <> 0) and (enetAddr.port <> 0); end; @@ -329,7 +579,7 @@ end; //========================================================================== function TMasterHost.isConnecting (): Boolean; begin - result := isAlive() and (not NetHostConnected); + result := isAlive() and (not NetHostConnected) and (NetHostConReqTime <> -1); end; @@ -340,191 +590,225 @@ end; //========================================================================== function TMasterHost.isConnected (): Boolean; begin - result := isAlive() and (NetHostConnected); + result := isAlive() and (NetHostConnected) and (NetHostConReqTime <> -1); end; //========================================================================== // -// TMasterHost.disconnect +// TMasterHost.connectedEvent // //========================================================================== -procedure TMasterHost.disconnect (spamConsole: Boolean=false); +procedure TMasterHost.connectedEvent (); begin if not isAlive() then exit; - if (NetMode = NET_SERVER) and isConnected() and updateSent then remove(); - - enet_peer_disconnect(peer, 0); - enet_host_flush(NetMHost); + if NetHostConnected then exit; + NetHostConnected := true; + e_LogWritefln('connected to master at [%s]', [hostName], TMsgType.Notify); + //g_Console_Add(Format(_lc[I_NET_MSG]+_lc[I_NET_SLIST_CONN], [mlist[f].hostName])); +end; - enet_peer_reset(peer); - //enet_host_destroy(NetMHost); - peer := nil; - //NetMHost := nil; - NetHostConnected := False; - NetHostConReqTime := 0; - NetUpdatePending := false; - updateSent := false; - - if (spamConsole) then g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_DISC]); +//========================================================================== +// +// TMasterHost.disconnectedEvent +// +//========================================================================== +procedure TMasterHost.disconnectedEvent (); +begin + if not isAlive() then exit; + e_LogWritefln('disconnected from master at [%s]', [hostName], TMsgType.Notify); + disconnect(true); + //if (spamConsole) then g_Console_Add(Format(_lc[I_NET_MSG]+_lc[I_NET_SLIST_DISC], [hostName])); end; //========================================================================== // -// TMasterHost.connect +// TMasterHost.receivedEvent +// +// `pkt` is never `nil` // //========================================================================== -function TMasterHost.connect (): Boolean; +procedure TMasterHost.receivedEvent (pkt: pENetPacket); var - res: Integer; + msg: TMsg; + MID: Byte; + Cnt: Byte; + f: Integer; + s: AnsiString; begin - updateSent := false; // do not send 'remove' - disconnect(); - result := false; - if not isValid() then exit; - - if (not NetInitDone) then exit; - - if (NetMHost = nil) then + e_LogWritefln('received packed from master at [%s]', [hostName], TMsgType.Notify); + if not msg.Init(pkt^.data, pkt^.dataLength, True) then exit; + // packet type + MID := msg.ReadByte(); + if (MID <> NET_MMSG_GET) then exit; + e_LogWritefln('received list packet from master at [%s]', [hostName], TMsgType.Notify); + SetLength(srvAnswer, 0); + if (srvAnswered > 0) then Inc(srvAnswered); + slMOTD := ''; + //slUrgent := ''; + slReadUrgent := true; + // number of items + Cnt := msg.ReadByte(); + //g_Console_Add(_lc[I_NET_MSG]+Format(_lc[I_NET_SLIST_RETRIEVED], [Cnt, hostName]), True); + e_LogWritefln('got %u server(s) from master at [%s]', [Cnt, hostName], TMsgType.Notify); + if (Cnt > 0) then begin - NetMHost := enet_host_create(nil, 1, NET_MCHANS, 0, 0); - if (NetMHost = nil) then + SetLength(srvAnswer, Cnt); + for f := 0 to Cnt-1 do begin - g_Console_Add(_lc[I_NET_MSG_ERROR]+_lc[I_NET_ERR_CLIENT], True); - Exit; + srvAnswer[f].Number := f; + srvAnswer[f].IP := msg.ReadString(); + srvAnswer[f].Port := msg.ReadWord(); + srvAnswer[f].Name := msg.ReadString(); + srvAnswer[f].Map := msg.ReadString(); + srvAnswer[f].GameMode := msg.ReadByte(); + srvAnswer[f].Players := msg.ReadByte(); + srvAnswer[f].MaxPlayers := msg.ReadByte(); + srvAnswer[f].Protocol := msg.ReadByte(); + srvAnswer[f].Password := msg.ReadByte() = 1; + enet_address_set_host(Addr(srvAnswer[f].PingAddr), PChar(Addr(srvAnswer[f].IP[1]))); + srvAnswer[f].Ping := -1; + srvAnswer[f].PingAddr.port := NET_PING_PORT; end; end; - if (not addressInited) then + if (msg.ReadCount < msg.CurSize) then begin - if (enet_address_set_host(@enetAddr, PChar(Addr(hostName[1]))) <> 0) then + // new master, supports version reports + s := msg.ReadString(); + if (s <> {MyVer}GAME_VERSION) then begin - hostName := ''; - hostPort := 0; - exit; + { TODO } + g_Console_Add('!!! UpdVer = `'+s+'`'); + end; + // even newer master, supports extra info + if (msg.ReadCount < msg.CurSize) then + begin + slMOTD := b_Text_Format(msg.ReadString()); + if (slMOTD <> '') then e_LogWritefln('got MOTD from master at [%s]: %s', [hostName, slMOTD], TMsgType.Notify); + s := b_Text_Format(msg.ReadString()); + // check if the message has updated and the user has to read it again + if (slUrgent <> s) then slReadUrgent := false; + slUrgent := s; + if (s <> '') then e_LogWritefln('got urgent from master at [%s]: %s', [hostName, s], TMsgType.Notify); end; - enetAddr.Port := hostPort; - addressInited := true; end; +end; - peer := enet_host_connect(NetMHost, @enetAddr, NET_MCHANS, 0); - if (peer = nil) then - begin - g_Console_Add(_lc[I_NET_MSG_ERROR]+_lc[I_NET_ERR_CLIENT], true); - //enet_host_destroy(NetMHost); - //NetMHost := nil; - exit; - end; - res := enet_host_service(NetMHost, @event, 0); - if (res < 0) then +//========================================================================== +// +// TMasterHost.pulse +// +// this performs various scheduled tasks, if necessary +// +//========================================================================== +procedure TMasterHost.pulse (); +var + ct: Int64; + mrate: Cardinal; +begin + if not isAlive() then exit; + if (NetHostConReqTime = -1) then exit; // waiting for shutdown (disconnect in progress) + ct := GetTimerMS(); + // process pending connection timeout + if (not NetHostConnected) then begin - enet_peer_reset(peer); - peer := nil; + if (ct < NetHostConReqTime) or (ct-NetHostConReqTime >= 3000) then + begin + e_LogWritefln('failed to connect to master at [%s]', [hostName], TMsgType.Notify); + // do not spam with error messages, it looks like the master is down + //g_Console_Add(_lc[I_NET_MSG_ERROR] + _lc[I_NET_SLIST_ERROR], True); + enet_peer_disconnect(peer, 0); + // main pulse will take care of the rest + NetHostConReqTime := -1; + end; exit; end; - - result := true; - if (res > 0) then + // send update, if necessary + if (NetUpdatePending) then begin - if (event.kind = ENET_EVENT_TYPE_CONNECT) then + mrate := NetMasterRate; + if (mrate < 10000) then mrate := 10000 + else if (mrate > 1000*60*10) then mrate := 1000*60*10; + if (lastUpdateTime = 0) or (ct < lastUpdateTime) or (ct-lastUpdateTime >= mrate) then begin - NetHostConnected := true; - g_Console_Add(_lc[I_NET_MSG]+_lc[I_NET_SLIST_CONN]); - exit; + lastUpdateTime := ct; + update(); end; - if (event.kind = ENET_EVENT_TYPE_RECEIVE) then enet_packet_destroy(event.packet); end; +end; - if not NetHostConnected then NetHostConReqTime := GetTimerMS(); - { - if (blocking) then - begin - g_Console_Add(_lc[I_NET_MSG_ERROR] + _lc[I_NET_SLIST_ERROR], True); +//========================================================================== +// +// TMasterHost.disconnect +// +//========================================================================== +procedure TMasterHost.disconnect (forced: Boolean); +begin + if not isAlive() then exit; - if NetMPeer <> nil then enet_peer_reset(NetMPeer); - if NetMHost <> nil then enet_host_destroy(NetMHost); - NetMPeer := nil; - NetMHost := nil; - NetHostConnected := False; + if (forced) then + begin + enet_peer_reset(peer); + peer := nil; NetHostConReqTime := 0; - NetUpdatePending := false; end else begin - NetHostConReqTime := GetTimerMS(); - g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_WCONN]); + enet_peer_disconnect_later(peer, 0); + // main pulse will take care of the rest + NetHostConReqTime := -1; end; - } + + NetHostConnected := false; + NetUpdatePending := false; + //updateSent := false; + lastUpdateTime := 0; + //lastConnectTime := 0; + //if (spamConsole) then g_Console_Add(Format(_lc[I_NET_MSG]+_lc[I_NET_SLIST_DISC], [hostName])); end; -//========================================================================== -// -// TMasterHost.processPendingConnection -// -// should be called only if host/peer is here -// returns `false` if not connected or dead -// -//========================================================================== -function TMasterHost.processPendingConnection (timeout: Integer=0): Boolean; -var - ct: Int64; - cres: Integer; -begin - result := false; - if not isAlive() then exit; - // are we waiting for connection? - if (not NetHostConnected) then +//========================================================================== +// +// TMasterHost.connect +// +//========================================================================== +function TMasterHost.connect (): Boolean; +begin + result := false; + if not isValid() then exit; + if (NetHostConReqTime = -1) then + begin + disconnect(true); + end + else + begin + if isAlive() then begin result := true; exit; end; + end; + + lastConnectTime := GetTimerMS(); + SetLength(srvAnswer, 0); + srvAnswered := 0; + NetHostConnected := false; + NetHostConReqTime := 0; + NetUpdatePending := false; + updateSent := false; + lastUpdateTime := 0; + + peer := enet_host_connect(NetMHost, @enetAddr, NET_MCHANS, 0); + if (peer = nil) then begin - // check for connection event - cres := enet_host_service(NetMHost, @event, timeout); - if (cres < 0) then - begin - //TODO: reconnect here - updateSent := false; // do not send 'remove' - disconnect(); - exit; - end; - if (cres > 0) then - begin - if (event.kind = ENET_EVENT_TYPE_CONNECT) then - begin - NetHostConnected := true; - if NetUpdatePending then update(false); - g_Console_Add(_lc[I_NET_MSG]+_lc[I_NET_SLIST_CONN]); - result := true; - exit; - end - else if (event.kind = ENET_EVENT_TYPE_DISCONNECT) then - begin - //TODO: reconnect here - updateSent := false; // do not send 'remove' - disconnect(); - exit; - end - else if (event.kind = ENET_EVENT_TYPE_RECEIVE) then - begin - enet_packet_destroy(event.packet); - end; - end; - // check for connection timeout - if (not NetHostConnected) then - begin - ct := GetTimerMS(); - if (ct < NetHostConReqTime) or (ct-NetHostConReqTime >= 3000) then - begin - // do not spam with error messages, it looks like the master is down - //g_Console_Add(_lc[I_NET_MSG_ERROR] + _lc[I_NET_SLIST_ERROR], True); - disconnect(false); - end; - exit; - end; + g_Console_Add(_lc[I_NET_MSG_ERROR]+_lc[I_NET_ERR_CLIENT], true); + exit; end; - result := true; + + NetHostConReqTime := lastConnectTime; + e_LogWritefln('connecting to master at [%s]', [hostName], TMsgType.Notify); end; @@ -535,7 +819,7 @@ end; //========================================================================== class procedure TMasterHost.writeInfo (var msg: TMsg); var - wad, map: string; + wad, map: AnsiString; begin wad := g_ExtractWadNameNoPath(gMapInfo.Map); map := g_ExtractFileName(gMapInfo.Map); @@ -559,32 +843,46 @@ end; // TMasterHost.update // //========================================================================== -procedure TMasterHost.update (immediateSend: Boolean=true); +procedure TMasterHost.update (); var pkt: pENetPacket; begin - if not processPendingConnection() then + if not isAlive() then exit; + if not isConnected() then begin NetUpdatePending := isConnecting(); exit; end; - NetUpdatePending := false; - netmsg.Clear(); - netmsg.Write(Byte(NET_MMSG_UPD)); - netmsg.Write(NetAddr.port); - writeInfo(netmsg); + if reportsEnabled and g_Game_IsServer() and g_Game_IsNet() and NetUseMaster then + begin + try + netmsg.Write(Byte(NET_MMSG_UPD)); + netmsg.Write(NetAddr.port); + //writeln(formatstrf('%08x', [NetAddr.host]), ' : ', NetAddr.host); + + writeInfo(netmsg); - pkt := enet_packet_create(netmsg.Data, netmsg.CurSize, ENET_PACKET_FLAG_RELIABLE); - if assigned(pkt) then + pkt := enet_packet_create(netmsg.Data, netmsg.CurSize, ENET_PACKET_FLAG_RELIABLE); + if assigned(pkt) then + begin + if (enet_peer_send(peer, NET_MCHAN_UPD, pkt) = 0) then + begin + e_LogWritefln('sent update to master at [%s]', [hostName], TMsgType.Notify); + NetUpdatePending := false; + updateSent := true; + end; + end; + finally + netmsg.Clear(); + end; + end + else begin - enet_peer_send(peer, NET_MCHAN_UPD, pkt); - if (immediateSend) then enet_host_flush(NetMHost); + NetUpdatePending := false; end; - - netmsg.Clear(); end; @@ -597,150 +895,178 @@ procedure TMasterHost.remove (); var pkt: pENetPacket; begin - if not processPendingConnection() then exit; + NetUpdatePending := false; + lastUpdateTime := 0; + updateSent := false; + if not isAlive() then exit; + if not isConnected() then exit; netmsg.Clear(); - netmsg.Write(Byte(NET_MMSG_DEL)); - netmsg.Write(NetAddr.port); + try + netmsg.Write(Byte(NET_MMSG_DEL)); + netmsg.Write(NetAddr.port); - pkt := enet_packet_create(netmsg.Data, netmsg.CurSize, ENET_PACKET_FLAG_RELIABLE); - if assigned(pkt) then - begin - enet_peer_send(peer, NET_MCHAN_MAIN, pkt); - enet_host_flush(NetMHost); + pkt := enet_packet_create(netmsg.Data, netmsg.CurSize, ENET_PACKET_FLAG_RELIABLE); + if assigned(pkt) then + begin + enet_peer_send(peer, NET_MCHAN_MAIN, pkt); + end; + finally + netmsg.Clear(); end; - - netmsg.Clear(); end; -//========================================================================== -// -// TMasterHost.waitForConnection +//************************************************************************** // -// returns `false` if connection failed +// other functions // -//========================================================================== -function TMasterHost.waitForConnection (): Boolean; -begin - result := isAlive(); - if not result then exit; - while isAlive() and isConnecting() do - begin - if not processPendingConnection(300) then break; - end; - if not isConnected() then - begin - updateSent := false; // do not send 'remove' - disconnect(); - end; - result := isAlive(); -end; +//************************************************************************** +type + THashStrDWord = specialize THashBase; + +var + knownHosts: THashStrDWord = nil; //========================================================================== // -// TMasterHost.service -// -// call as often as you want, the object will do the rest -// but try to call this at least once in 100 msecs -// -// returns `true` if we got a packet (it won't be parsed to TMsg) +// parseAddressPort // //========================================================================== -function TMasterHost.service (timeout: Integer=0): Boolean; +function parseAddressPort (var ea: ENetAddress; hostandport: AnsiString): Boolean; var - ct: Int64; - hres: Integer; + cp, port: Integer; + hostName: AnsiString; + ip: LongWord; begin result := false; - if not isAlive() then exit; - if not processPendingConnection() then exit; + if (not g_Net_IsNetworkAvailable()) then exit; - ct := GetTimerMS(); - if (ct < lastUpdateTime) or (ct-lastUpdateTime >= 1000*60) then - begin - lastUpdateTime := ct; - update(false); - end; + hostandport := Trim(hostandport); + if (length(hostandport) = 0) then exit; - while true do + hostName := hostandport; + port := 25665; + + cp := Pos(':', hostandport); + if (cp > 0) then begin - hres := enet_host_service(NetMHost, @event, timeout); - if (hres < 0) then + hostName := Trim(Copy(hostandport, 1, cp-1)); + Delete(hostandport, 1, cp); + hostandport := Trim(hostandport); + if (length(hostandport) > 0) then begin - //TODO: reconnect here - updateSent := false; // do not send 'remove' - disconnect(); - exit; + try + port := StrToInt(hostandport); + except + port := -1; + end; end; - if (hres = 0) then break; - if (event.kind = ENET_EVENT_TYPE_CONNECT) then - begin - NetHostConnected := true; - if NetUpdatePending then update(false); - g_Console_Add(_lc[I_NET_MSG]+_lc[I_NET_SLIST_CONN]); - end - else if (event.kind = ENET_EVENT_TYPE_DISCONNECT) then - begin - //TODO: reconnect here - g_Console_Add(_lc[I_NET_MSG]+_lc[I_NET_SLIST_LOST], True); - updateSent := false; // do not send 'remove' - disconnect(); - exit; - end - else if (event.kind = ENET_EVENT_TYPE_RECEIVE) then + end; + + if (length(hostName) = 0) then exit; + if (port < 1) or (port > 65535) then exit; + + if not assigned(knownHosts) then knownHosts := THashStrDWord.Create(); + + if knownHosts.get(hostName, ip) then + begin + ea.host := ip; + end + else + begin + if (enet_address_set_host(@ea, PChar(Addr(hostName[1]))) <> 0) then begin - //enet_packet_destroy(event.packet); - //if (timeout <> 0) then break; - result := true; + knownHosts.put(hostName, 0); exit; end; + knownHosts.put(hostName, ea.host); end; + ea.Port := port; + result := true; end; //========================================================================== // -// TMasterHost.clearPacket +// addMasterRecord // //========================================================================== -procedure TMasterHost.clearPacket (); +procedure addMasterRecord (var ea: ENetAddress; sa: AnsiString); +var + f: Integer; + freeIdx: Integer; begin - if (event.packet <> nil) then + freeIdx := -1; + for f := 0 to High(mlist) do + begin + if (mlist[f].enetAddr.host = ea.host) and (mlist[f].enetAddr.port = ea.port) then + begin + mlist[f].justAdded := true; + exit; + end; + if (freeIdx < 0) and (not mlist[f].isValid()) then freeIdx := f; + end; + if (freeIdx < 0) then begin - enet_packet_destroy(event.packet); - event.packet := nil; + freeIdx := length(mlist); + SetLength(mlist, freeIdx+1); + mlist[freeIdx].Create(ea); end; + mlist[freeIdx].justAdded := true; + mlist[freeIdx].setAddress(ea, sa); + e_LogWritefln('added masterserver with address [%s]', [sa], TMsgType.Notify); end; -//************************************************************************** +//========================================================================== // -// other functions +// g_Net_Slist_Set // -//************************************************************************** - -procedure g_Net_Slist_Set (IP: string; Port: Word); +//========================================================================== +procedure g_Net_Slist_Set (IP: AnsiString; Port: Word; list: AnsiString=''); +var + f, dest: Integer; + sa: AnsiString; + ea: ENetAddress; + pp: Integer; begin - if (length(mlist) = 0) then + if (not g_Net_IsNetworkAvailable()) then exit; + + for f := 0 to High(mlist) do mlist[f].justAdded := false; + + IP := Trim(IP); + if (length(IP) > 0) and (Port > 0) then begin - SetLength(mlist, 1); - mlist[0].Create(ip+':'+IntToStr(Port)); - end - else + sa := IP+':'+IntToStr(Port); + if parseAddressPort(ea, sa) then addMasterRecord(ea, sa); + end; + + list := Trim(list); + //writeln('list=[', list, ']'); + while (length(list) > 0) do begin - mlist[0].setAddress(ip+':'+IntToStr(Port)); + pp := Pos(',', list); + if (pp < 1) then pp := length(list)+1; + sa := Trim(Copy(list, 1, pp-1)); + Delete(list, 1, pp); + //writeln(' sa=[', sa, ']'); + if (length(sa) > 0) and parseAddressPort(ea, sa) then addMasterRecord(ea, sa); end; - e_LogWritefln('Masterserver address set to %s:%u', [IP, Port], TMsgType.Notify); - { - if NetInitDone then + + // remove unknown master servers + dest := 0; + for f := 0 to High(mlist) do begin - enet_address_set_host(@NetSlistAddr, PChar(Addr(IP[1]))); - NetSlistAddr.Port := Port; - e_WriteLog('Masterserver address set to ' + IP + ':' + IntToStr(Port), TMsgType.Notify); + if (not mlist[f].justAdded) then mlist[f].clear(); + if (mlist[f].isValid()) then + begin + if (dest <> f) then mlist[dest] := mlist[f]; + Inc(dest); + end; end; - } + if (dest <> length(mlist)) then SetLength(mlist, dest); end; @@ -749,8 +1075,113 @@ end; // main pulse // //************************************************************************** -procedure g_Net_Slist_Pulse (); + +//========================================================================== +// +// g_Net_Slist_Pulse +// +// non-zero timeout ignores current status (used to fetch server list) +// +//========================================================================== +procedure g_Net_Slist_Pulse (timeout: Integer=0); +var + f: Integer; + sres: Integer; + idx: Integer; + ct: Int64; begin + if (not g_Net_IsNetworkAvailable()) then exit; + + if (length(mlist) = 0) then + begin + if (NetMHost <> nil) then + begin + enet_host_destroy(NetMHost); + NetMHost := nil; + exit; + end; + end; + + if (NetMHost = nil) then + begin + NetMHost := enet_host_create(nil, 64, NET_MCHANS, 1024*1024, 1024*1024); + if (NetMHost = nil) then + begin + g_Console_Add(_lc[I_NET_MSG_ERROR]+_lc[I_NET_ERR_CLIENT], True); + for f := 0 to High(mlist) do mlist[f].clear(); + SetLength(mlist, 0); + Exit; + end; + end; + + ct := GetTimerMS(); + for f := 0 to High(mlist) do + begin + if (not mlist[f].isValid()) then continue; + if (not mlist[f].isAlive()) then + begin + if (timeout > 0) or (reportsEnabled and g_Game_IsServer() and g_Game_IsNet() and NetUseMaster) then + begin + if (mlist[f].lastConnectTime = 0) or (ct < mlist[f].lastConnectTime) or (ct-mlist[f].lastConnectTime >= 1000*60*5) then + begin + e_LogWritefln('reconnecting to master [%s]', [mlist[f].hostName], TMsgType.Notify); + mlist[f].connect(); + end; + end; + end + else + begin + if (timeout = 0) and (not reportsEnabled or not g_Game_IsServer() or not g_Game_IsNet() or not NetUseMaster) then + begin + if (mlist[f].isConnected()) and (mlist[f].updateSent) then + begin + e_LogWritefln('removing from master [%s]', [mlist[f].hostName], TMsgType.Notify); + mlist[f].remove(); + end; + //e_LogWritefln('disconnecting from master [%s]', [mlist[f].hostName], TMsgType.Notify); + mlist[f].disconnect(false); + end; + end; + mlist[f].pulse(); + end; + + sres := enet_host_service(NetMHost, @NetMEvent, timeout); + while (sres <> 0) do + begin + if (sres < 0) then + begin + g_Console_Add(_lc[I_NET_MSG_ERROR]+_lc[I_NET_ERR_CLIENT], True); + for f := 0 to High(mlist) do mlist[f].clear(); + SetLength(mlist, 0); + enet_host_destroy(NetMHost); + NetMHost := nil; + exit; + end; + + idx := findByPeer(NetMEvent.peer); + if (idx < 0) then + begin + e_LogWriteln('network event from unknown master host. ignored.', TMsgType.Warning); + if (NetMEvent.kind = ENET_EVENT_TYPE_RECEIVE) then enet_packet_destroy(NetMEvent.packet); + end + else + begin + if (NetMEvent.kind = ENET_EVENT_TYPE_CONNECT) then + begin + mlist[idx].connectedEvent(); + end + else if (NetMEvent.kind = ENET_EVENT_TYPE_DISCONNECT) then + begin + mlist[idx].disconnectedEvent(); + end + else if (NetMEvent.kind = ENET_EVENT_TYPE_RECEIVE) then + begin + mlist[idx].receivedEvent(NetMEvent.packet); + enet_packet_destroy(NetMEvent.packet); + end; + end; + sres := enet_host_service(NetMHost, @NetMEvent, 0); + end; end; @@ -810,8 +1241,7 @@ end; function g_Net_Slist_Fetch (var SL: TNetServerList): Boolean; var Cnt: Byte; - P: pENetPacket; - MID: Byte; + pkt: pENetPacket; I, RX: Integer; T: Int64; Sock: ENetSocket; @@ -819,7 +1249,7 @@ var InMsg: TMsg; SvAddr: ENetAddress; FromSL: Boolean; - MyVer, Str: string; + MyVer: AnsiString; procedure ProcessLocal (); begin @@ -880,30 +1310,24 @@ var if Length(SL) = 0 then SL := nil; end; +var + f, c, n, pos: Integer; + aliveCount: Integer; + hasUnanswered: Boolean; + stt, ct: Int64; begin - Result := False; + result := false; SL := nil; - if (length(mlist) > 0) and (mlist[0].isAlive()) then - begin - CheckLocalServers(); - Exit; - end; - - if (length(mlist) = 0) or (not mlist[0].connect()) then + if (not g_Net_IsNetworkAvailable()) then begin - CheckLocalServers(); - Exit; + SetLength(SL, 0); + exit; end; - if not mlist[0].waitForConnection() then - begin - CheckLocalServers(); - Exit; - end; + g_Net_Slist_Pulse(); // this will create mhost - e_WriteLog('Fetching serverlist...', TMsgType.Notify); - g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_FETCH]); + DisconnectAll(true); // forced disconnect NetOut.Clear(); NetOut.Write(Byte(NET_MMSG_GET)); @@ -912,144 +1336,190 @@ begin MyVer := GAME_VERSION; NetOut.Write(MyVer); - P := enet_packet_create(NetOut.Data, NetOut.CurSize, Cardinal(ENET_PACKET_FLAG_RELIABLE)); - enet_peer_send(mlist[0].peer, NET_MCHAN_MAIN, P); - enet_host_flush(NetMHost); + try + e_WriteLog('Fetching serverlist...', TMsgType.Notify); + g_Console_Add(_lc[I_NET_MSG]+_lc[I_NET_SLIST_FETCH]); - while mlist[0].isAlive() do - begin - if not mlist[0].service(5000) then continue; - if not InMsg.Init(mlist[0].event.packet^.data, mlist[0].event.packet^.dataLength, True) then + // wait until all servers connected and answered + stt := GetTimerMS(); + while true do begin - mlist[0].clearPacket(); - continue; + aliveCount := 0; + hasUnanswered := false; + for f := 0 to High(mlist) do + begin + { + e_LogWritefln(' master #%d: [%s] valid=%d; alive=%d; connected=%d; connecting=%d', + [f, mlist[f].hostName, Integer(mlist[f].isValid()), Integer(mlist[f].isAlive()), + Integer(mlist[f].isConnected()), Integer(mlist[f].isConnecting())], TMsgType.Notify); + } + if (not mlist[f].isValid()) then continue; + if (not mlist[f].isAlive()) then + begin + mlist[f].connect(); + if (mlist[f].isAlive()) then + begin + //g_Console_Add(Format(_lc[I_NET_MSG]+_lc[I_NET_SLIST_WCONN], [mlist[f].hostName])); + hasUnanswered := true; + stt := GetTimerMS(); + end; + end + else if (mlist[f].isConnected()) then + begin + //g_Console_Add(Format(_lc[I_NET_MSG]+_lc[I_NET_SLIST_CONN], [mlist[f].hostName])); + if (mlist[f].srvAnswered = 0) then + begin + pkt := enet_packet_create(NetOut.Data, NetOut.CurSize, Cardinal(ENET_PACKET_FLAG_RELIABLE)); + if assigned(pkt) then + begin + if (enet_peer_send(mlist[f].peer, NET_MCHAN_MAIN, pkt) = 0) then + begin + hasUnanswered := true; + mlist[f].srvAnswered := 1; + stt := GetTimerMS(); + end; + end; + end + else if (mlist[f].srvAnswered = 1) then + begin + hasUnanswered := true; + end + else if (mlist[f].srvAnswered > 1) then + begin + Inc(aliveCount); + end; + end + else if (mlist[f].isConnecting()) then + begin + hasUnanswered := true; + end; + end; + if (not hasUnanswered) then break; + // check for timeout + ct := GetTimerMS(); + if (ct < stt) or (ct-stt > 4000) then break; + g_Net_Slist_Pulse(300); end; - MID := InMsg.ReadByte(); - - if (MID <> NET_MMSG_GET) then + if (aliveCount = 0) then begin - mlist[0].clearPacket(); - continue; + DisconnectAll(); + CheckLocalServers(); + exit; end; - Cnt := InMsg.ReadByte(); - g_Console_Add(_lc[I_NET_MSG]+Format(_lc[I_NET_SLIST_RETRIEVED], [Cnt]), True); + slMOTD := ''; + { + slUrgent := ''; + slReadUrgent := true; + } - if (Cnt > 0) then + SetLength(SL, 0); + for f := 0 to High(mlist) do begin - SetLength(SL, Cnt); - - for I := 0 to Cnt-1 do + if (mlist[f].srvAnswered < 2) then continue; + for n := 0 to High(mlist[f].srvAnswer) do begin - SL[I].Number := I; - 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 := NET_PING_PORT; + pos := -1; + for c := 0 to High(SL) do + begin + if (SL[c].IP = mlist[f].srvAnswer[n].IP) and (SL[c].Port = mlist[f].srvAnswer[n].Port) then + begin + pos := c; + break; + end; + end; + if (pos < 0) then + begin + pos := length(SL); + SetLength(SL, pos+1); + SL[pos] := mlist[f].srvAnswer[n]; + SL[pos].Number := pos; + end; end; - end; - - if InMsg.ReadCount < InMsg.CurSize then - begin - // new master, supports version reports - Str := InMsg.ReadString(); - if (Str <> MyVer) then + if (not mlist[f].slReadUrgent) and (mlist[f].slUrgent <> '') then begin - { TODO } - g_Console_Add('!!! UpdVer = `' + Str + '`'); + if (mlist[f].slUrgent <> slUrgent) then + begin + slUrgent := mlist[f].slUrgent; + slReadUrgent := false; + end; end; - // even newer master, supports extra info - if (InMsg.ReadCount < InMsg.CurSize) then + if (slMOTD <> '') and (mlist[f].slMOTD <> '') then begin - slMOTD := b_Text_Format(InMsg.ReadString()); - Str := b_Text_Format(InMsg.ReadString()); - // check if the message has updated and the user has to read it again - if slUrgent <> Str then slReadUrgent := False; - slUrgent := Str; + slMOTD := mlist[f].slMOTD; end; end; - mlist[0].clearPacket(); - Result := True; - break; - end; - - mlist[0].disconnect(false); - NetOut.Clear(); + DisconnectAll(); - if Length(SL) = 0 then - begin - CheckLocalServers(); - Exit; - end; + if (length(SL) = 0) then + begin + CheckLocalServers(); + exit; + end; - Sock := enet_socket_create(ENET_SOCKET_TYPE_DATAGRAM); - if Sock = ENET_SOCKET_NULL then Exit; - enet_socket_set_option(Sock, ENET_SOCKOPT_NONBLOCK, 1); + Sock := enet_socket_create(ENET_SOCKET_TYPE_DATAGRAM); + if Sock = ENET_SOCKET_NULL then Exit; + enet_socket_set_option(Sock, ENET_SOCKOPT_NONBLOCK, 1); - for I := Low(SL) to High(SL) do PingServer(SL[I], Sock); + for I := Low(SL) to High(SL) do PingServer(SL[I], Sock); - enet_socket_set_option(Sock, ENET_SOCKOPT_BROADCAST, 1); - PingBcast(Sock); + enet_socket_set_option(Sock, ENET_SOCKOPT_BROADCAST, 1); + PingBcast(Sock); - T := GetTimerMS(); + T := GetTimerMS(); - InMsg.Alloc(NET_BUFSIZE); - Buf.data := InMsg.Data; - Buf.dataLength := InMsg.MaxSize; - Cnt := 0; - while GetTimerMS() - T <= 500 do - begin - InMsg.Clear(); + InMsg.Alloc(NET_BUFSIZE); + Buf.data := InMsg.Data; + Buf.dataLength := InMsg.MaxSize; + Cnt := 0; + while GetTimerMS() - T <= 500 do + begin + InMsg.Clear(); - RX := enet_socket_receive(Sock, @SvAddr, @Buf, 1); - if RX <= 0 then continue; - InMsg.CurSize := RX; + RX := enet_socket_receive(Sock, @SvAddr, @Buf, 1); + if RX <= 0 then continue; + InMsg.CurSize := RX; - InMsg.BeginReading(); + InMsg.BeginReading(); - if InMsg.ReadChar() <> 'D' then continue; - if InMsg.ReadChar() <> 'F' then continue; + 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 + 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 - 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(); + with SL[I] do + begin + 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; + FromSL := True; + Inc(Cnt); + break; end; - FromSL := True; - Inc(Cnt); - break; - end; - if not FromSL then - ProcessLocal(); - end; + if not FromSL then + ProcessLocal(); + end; - InMsg.Free(); - enet_socket_destroy(Sock); + InMsg.Free(); + enet_socket_destroy(Sock); + finally + NetOut.Clear(); + end; end; @@ -1095,7 +1565,7 @@ var ch: Byte = 0; ww: Word = 0; hh: Word = 0; - ip: string; + ip: AnsiString; begin ip := ''; sy := 0; @@ -1243,7 +1713,7 @@ procedure g_Serverlist_GenerateTable (SL: TNetServerList; var ST: TNetServerTabl var i, j: Integer; - function FindServerInTable(Name: string): Integer; + function FindServerInTable(Name: AnsiString): Integer; var i: Integer; begin @@ -1338,6 +1808,8 @@ var qm: Boolean; Srv: TNetServer; begin + g_Net_Slist_Pulse(); + if gConsoleShow or gChatShow then Exit;