X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_netmaster.pas;h=d9c62c9efb78ea8821016e803d929bfac3e7a4c2;hb=a8d974b1564603bd91bd7663bf108c0a05fb7947;hp=98f191cb232a2c78e7e056409789377136856325;hpb=987c4a835a103345b59937e8e1be8524a6228712;p=d2df-sdl.git diff --git a/src/game/g_netmaster.pas b/src/game/g_netmaster.pas index 98f191c..d9c62c9 100644 --- a/src/game/g_netmaster.pas +++ b/src/game/g_netmaster.pas @@ -17,7 +17,8 @@ unit g_netmaster; interface -uses ENet; +uses + ENet, SysUtils, e_msg; const NET_MCHANS = 2; @@ -29,14 +30,22 @@ const NET_MMSG_DEL = 201; NET_MMSG_GET = 202; +const + // all timeouts in seconds + NMASTER_TIMEOUT_CONNECT = 3; // 3 seconds + NMASTER_TIMEOUT_RECONNECT = 5*60; // 5 minutes + //NMASTER_TIMEOUT_RECONNECT = 30; // 5 minutes + //NMASTER_FORCE_UPDATE_TIMEOUT = 20; + //NMASTER_FORCE_UPDATE_TIMEOUT = 0; + 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; @@ -53,51 +62,1194 @@ type pTNetServerList = ^TNetServerList; TNetServerTable = array of TNetServerRow; +type + TMasterHost = record + public + hostName: AnsiString; + + public + peer: pENetPeer; + 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`; -1 means "waiting for shutdown" + NetUpdatePending: Boolean; // should we send an update after connection completes? + lastDisconnectTime: Int64; // last real disconnect time; <0: do not reconnect + updateSent: Boolean; // was at least one update sent? (used to decide if we should call `remove()`) + lastUpdateTime: Int64; + // server list request working flags + srvAnswered: Integer; + srvAnswer: array of TNetServer; + slMOTD: AnsiString; + slUrgent: AnsiString; + slReadUrgent: Boolean; + // temporary mark + justAdded: Boolean; + connectCount: Integer; + + private + netmsg: TMsg; + + public + constructor Create (var ea: ENetAddress); + + procedure clear (); + + 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; + + // call as often as you want, the object will do the rest + // but try to call this at least once in 100 msecs + procedure pulse (); + + procedure disconnect (forced: Boolean); + function connect (): Boolean; + + procedure update (); + procedure remove (); + + class procedure writeInfo (var msg: TMsg); static; + + procedure connectedEvent (); + procedure disconnectedEvent (); + procedure receivedEvent (pkt: pENetPacket); // `pkt` is never `nil` + end; + + +var + slCurrent: TNetServerList = nil; + slTable: TNetServerTable = nil; + slWaitStr: AnsiString = ''; + slReturnPressed: Boolean = True; + + slMOTD: AnsiString = ''; + slUrgent: AnsiString = ''; + + NMASTER_FORCE_UPDATE_TIMEOUT: Integer = 0; // fuck you, fpc, and your idiotic "diagnostics" + + +procedure g_Net_Slist_Set (list: AnsiString); +function g_Net_Slist_Fetch (var SL: TNetServerList): Boolean; + +// make this server private +procedure g_Net_Slist_Private (); +// 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_Control (var SL: TNetServerList; var ST: TNetServerTable); + +function GetServerFromTable (Index: Integer; SL: TNetServerList; ST: TNetServerTable): TNetServer; + +function GetTimerMS (): Int64; + + var (* private state *) + slSelection: Byte = 0; + slReadUrgent: Boolean = False; + +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, r_game, + wadreader, g_system, utils, hashtable; + + +// ////////////////////////////////////////////////////////////////////////// // +var + NetMHost: pENetHost = nil; + NetMEvent: ENetEvent; + mlist: array of TMasterHost = nil; + + slFetched: Boolean = False; + slDirPressed: 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; + + // fuck! https://www.mail-archive.com/enet-discuss@cubik.org/msg00852.html + // tl;dr: on shitdows, we can get -1 sometimes, and it is *NOT* a failure. + // thank you, enet. let's ignore failures altogether then. + 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 + // set flags; pulse will take care of the rest + for f := 0 to High(mlist) do + begin + // force reconnect + mlist[f].lastDisconnectTime := 0; + // 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 + // set flags; pulse will take care of the rest + 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; + + +//========================================================================== +// +// 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; + + +//========================================================================== +// +// 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 + 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; + + +//========================================================================== +// +// g_Net_Slist_ServerPlayerComes +// +// called when new netword player comes +// +//========================================================================== +procedure g_Net_Slist_ServerPlayerComes (); +begin + UpdateAll(true); +end; + + +//========================================================================== +// +// g_Net_Slist_ServerPlayerLeaves +// +// called when new netword player comes +// +//========================================================================== +procedure g_Net_Slist_ServerPlayerLeaves (); +begin + 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 (var ea: ENetAddress); +begin + peer := nil; + NetHostConnected := false; + NetHostConReqTime := 0; + NetUpdatePending := false; + lastDisconnectTime := 0; + updateSent := false; + lastUpdateTime := 0; + hostName := ''; + ZeroMemory(@enetAddr, sizeof(enetAddr)); + SetLength(srvAnswer, 0); + srvAnswered := 0; + slMOTD := ''; + slUrgent := ''; + slReadUrgent := true; + justAdded := false; + connectCount := 0; + netmsg.Alloc(NET_BUFSIZE); + setAddress(ea, ''); +end; + + +//========================================================================== +// +// TMasterHost.clear +// +//========================================================================== +procedure TMasterHost.clear (); +begin + updateSent := false; // do not send 'remove' + disconnect(true); + hostName := ''; + netmsg.Free(); + SetLength(srvAnswer, 0); + srvAnswered := 0; + slMOTD := ''; + slUrgent := ''; + slReadUrgent := true; + ZeroMemory(@enetAddr, sizeof(enetAddr)); +end; + + +//========================================================================== +// +// TMasterHost.setAddress +// +//========================================================================== +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(true); + hostName := ''; + + 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; + + +//========================================================================== +// +// TMasterHost.isValid +// +//========================================================================== +function TMasterHost.isValid (): Boolean; +begin + result := (enetAddr.host <> 0) and (enetAddr.port <> 0); +end; + + +//========================================================================== +// +// TMasterHost.isAlive +// +// not disconnected +// +//========================================================================== +function TMasterHost.isAlive (): Boolean; +begin + result := (NetMHost <> nil) and (peer <> nil); +end; + + +//========================================================================== +// +// TMasterHost.isConnecting +// +// is connection in progress? +// +//========================================================================== +function TMasterHost.isConnecting (): Boolean; +begin + result := isAlive() and (not NetHostConnected) and (NetHostConReqTime <> -1); +end; + + +//========================================================================== +// +// TMasterHost.isConnected +// +//========================================================================== +function TMasterHost.isConnected (): Boolean; +begin + result := isAlive() and (NetHostConnected) and (NetHostConReqTime <> -1); +end; + + +//========================================================================== +// +// TMasterHost.connectedEvent +// +//========================================================================== +procedure TMasterHost.connectedEvent (); +begin + if not isAlive() then exit; + if NetHostConnected then exit; + NetHostConnected := true; + NetHostConReqTime := 0; // just in case + 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; + + +//========================================================================== +// +// 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.receivedEvent +// +// `pkt` is never `nil` +// +//========================================================================== +procedure TMasterHost.receivedEvent (pkt: pENetPacket); +var + msg: TMsg; + MID: Byte; + Cnt: Byte; + f: Integer; + s: AnsiString; +begin + 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 + SetLength(srvAnswer, Cnt); + for f := 0 to Cnt-1 do + begin + 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 (msg.ReadCount < msg.CurSize) then + begin + // new master, supports version reports + s := msg.ReadString(); + if (s <> {MyVer}GAME_VERSION) then + begin + { 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; + end; +end; + + +//========================================================================== +// +// TMasterHost.disconnect +// +//========================================================================== +procedure TMasterHost.disconnect (forced: Boolean); +begin + if isAlive() then + begin + lastDisconnectTime := GetTimerMS(); + if forced or (not NetHostConnected) or (NetHostConReqTime = -1) then + begin + enet_peer_reset(peer); + peer := nil; + NetHostConReqTime := 0; + updateSent := false; + end + else + begin + enet_peer_disconnect_later(peer, 0); + // main pulse will take care of the rest + NetHostConReqTime := -1; + end; + end + else + begin + // just in case + NetHostConReqTime := 0; + updateSent := false; + end; + + NetHostConnected := false; + NetUpdatePending := false; + lastUpdateTime := 0; + //if (spamConsole) then g_Console_Add(Format(_lc[I_NET_MSG]+_lc[I_NET_SLIST_DISC], [hostName])); +end; + + +//========================================================================== +// +// TMasterHost.connect +// +//========================================================================== +function TMasterHost.connect (): Boolean; +begin + result := false; + if not isValid() then exit; + if (NetHostConReqTime = -1) then + begin + disconnect(true); + if (NetHostConReqTime = -1) then e_LogWritefln('ketmar broke master [%s] logic! (000)', [hostName], TMsgType.Notify); + if (isAlive()) then e_LogWritefln('ketmar broke master [%s] logic! (001)', [hostName], TMsgType.Notify); + end + else + begin + if isAlive() then begin result := true; exit; end; + end; + + lastDisconnectTime := GetTimerMS(); // why not? + SetLength(srvAnswer, 0); + srvAnswered := 0; + NetHostConnected := false; + NetHostConReqTime := 0; + NetUpdatePending := false; + updateSent := false; + lastUpdateTime := 0; + Inc(connectCount); + + 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); + exit; + end; + + NetHostConReqTime := lastDisconnectTime; + e_LogWritefln('connecting to master at [%s]', [hostName], TMsgType.Notify); +end; + + +//========================================================================== +// +// TMasterHost.writeInfo +// +//========================================================================== +class procedure TMasterHost.writeInfo (var msg: TMsg); +var + wad, map: AnsiString; +begin + wad := g_ExtractWadNameNoPath(gMapInfo.Map); + map := g_ExtractFileName(gMapInfo.Map); + + msg.Write(NetServerName); + + msg.Write(wad+':/'+map); + msg.Write(gGameSettings.GameMode); + + msg.Write(Byte(NetClientCount)); + + msg.Write(NetMaxClients); + + msg.Write(Byte(NET_PROTOCOL_VER)); + msg.Write(Byte(NetPassword <> '')); +end; + + +//========================================================================== +// +// TMasterHost.update +// +//========================================================================== +procedure TMasterHost.update (); +var + pkt: pENetPacket; +begin + if not isAlive() then exit; + if not isConnected() then + begin + NetUpdatePending := isConnecting(); + exit; + end; + + netmsg.Clear(); + + 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 + 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 + NetUpdatePending := false; + end; +end; + + +//========================================================================== +// +// TMasterHost.remove +// +//========================================================================== +procedure TMasterHost.remove (); +var + pkt: pENetPacket; +begin + NetUpdatePending := false; + lastUpdateTime := 0; + updateSent := false; + if not isAlive() then exit; + if not isConnected() then exit; + + netmsg.Clear(); + 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); + end; + finally + netmsg.Clear(); + end; +end; + + +//========================================================================== +// +// 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 + if (ct < NetHostConReqTime) or (ct-NetHostConReqTime >= 1000*NMASTER_TIMEOUT_CONNECT) 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); + disconnect(true); + end; + exit; + end; + // send update, if necessary + if (NetUpdatePending) then + begin + mrate := NetMasterRate; + if (mrate < 10000) then mrate := 10000 + else if (mrate > 1000*60*10) then mrate := 1000*60*10; + if (NMASTER_FORCE_UPDATE_TIMEOUT > 0) then mrate := NMASTER_FORCE_UPDATE_TIMEOUT*1000; + if (lastUpdateTime = 0) or (ct < lastUpdateTime) or (ct-lastUpdateTime >= mrate) then + begin + //e_LogWritefln('update timeout: %d', [Integer(mrate)], TMsgType.Notify); + lastUpdateTime := ct; + update(); + end; + end; +end; + + +//************************************************************************** +// +// other functions +// +//************************************************************************** +type + THashStrDWord = specialize THashBase; + +var + knownHosts: THashStrDWord = nil; + + +//========================================================================== +// +// parseAddressPort +// +//========================================================================== +function parseAddressPort (var ea: ENetAddress; hostandport: AnsiString): Boolean; +var + cp, port: Integer; + hostName: AnsiString; + ip: LongWord; +begin + result := false; + if (not g_Net_IsNetworkAvailable()) then exit; + + hostandport := Trim(hostandport); + if (length(hostandport) = 0) then exit; + + hostName := hostandport; + port := 25665; + + cp := Pos(':', hostandport); + if (cp > 0) then + begin + hostName := Trim(Copy(hostandport, 1, cp-1)); + Delete(hostandport, 1, cp); + hostandport := Trim(hostandport); + if (length(hostandport) > 0) then + begin + try + port := StrToInt(hostandport); + except + port := -1; + end; + end; + 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 + knownHosts.put(hostName, 0); + exit; + end; + knownHosts.put(hostName, ea.host); + end; + ea.Port := port; + result := true; +end; + + +//========================================================================== +// +// addMasterRecord +// +//========================================================================== +procedure addMasterRecord (var ea: ENetAddress; sa: AnsiString); +var + f: Integer; + freeIdx: Integer; +begin + 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 + 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; + + +//========================================================================== +// +// g_Net_Slist_Set +// +//========================================================================== +procedure g_Net_Slist_Set (list: AnsiString); var - NetMHost: pENetHost = nil; - NetMPeer: pENetPeer = nil; + f, dest: Integer; + sa: AnsiString; + ea: ENetAddress; + pp: Integer; +begin + if (not g_Net_IsNetworkAvailable()) then exit; - slCurrent: TNetServerList = nil; - slTable: TNetServerTable = nil; - slWaitStr: string = ''; - slReturnPressed: Boolean = True; + for f := 0 to High(mlist) do mlist[f].justAdded := false; - slMOTD: string = ''; - slUrgent: string = ''; + list := Trim(list); + //writeln('list=[', list, ']'); + while (length(list) > 0) do + begin + 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; -procedure g_Net_Slist_Set(IP: string; Port: Word); -function g_Net_Slist_Fetch(var SL: TNetServerList): Boolean; -procedure g_Net_Slist_Update(); -procedure g_Net_Slist_Remove(); -function g_Net_Slist_Connect(): Boolean; -procedure g_Net_Slist_Check(); -procedure g_Net_Slist_Disconnect(); -procedure g_Net_Slist_WriteInfo(); + // remove unknown master servers + dest := 0; + for f := 0 to High(mlist) do + begin + 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; -procedure g_Serverlist_GenerateTable(SL: TNetServerList; var ST: TNetServerTable); -procedure g_Serverlist_Draw(var SL: TNetServerList; var ST: TNetServerTable); -procedure g_Serverlist_Control(var SL: TNetServerList; var ST: TNetServerTable); -implementation +//************************************************************************** +// +// main pulse +// +//************************************************************************** -uses - 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, g_basic, - wadreader; +//========================================================================== +// +// isMasterReportsEnabled +// +//========================================================================== +function isMasterReportsEnabled (): Boolean; +begin + result := (reportsEnabled and g_Game_IsServer() and g_Game_IsNet() and NetUseMaster); +end; -var - NetMEvent: ENetEvent; - slSelection: Byte = 0; - slFetched: Boolean = False; - slDirPressed: Boolean = False; - slReadUrgent: Boolean = False; -function GetTimerMS(): Int64; +//========================================================================== +// +// 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; + isListQuery: Boolean; + count: Integer; begin - Result := GetTimer() {div 1000}; + 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 + e_LogWriteln(_lc[I_NET_MSG_ERROR] + _lc[I_NET_ERR_CLIENT] + ' (host_create)', TMsgType.Notify); + for f := 0 to High(mlist) do mlist[f].clear(); + SetLength(mlist, 0); + Exit; + end; + end; + + isListQuery := (timeout > 0); + ct := GetTimerMS(); + // reconnect/disconnect/pulse for each master + for f := 0 to High(mlist) do + begin + if (not mlist[f].isValid()) then continue; + if (not mlist[f].isAlive()) then + begin + // not connected; try to reconnect if we're asking for a host list, or we are in netgame, and we are the host + if (not isListQuery) and isMasterReportsEnabled() then + begin + if (mlist[f].lastDisconnectTime = 0) or (ct < mlist[f].lastDisconnectTime) or (ct-mlist[f].lastDisconnectTime >= 1000*NMASTER_TIMEOUT_RECONNECT) then + begin + e_LogWritefln('reconnecting to master [%s]', [mlist[f].hostName], TMsgType.Notify); + mlist[f].connect(); + end + else + begin + //e_LogWritefln('DEAD master [%s]: ct=%d; ldt=%d; diff=%d', [mlist[f].hostName, Integer(ct), Integer(mlist[f].lastDisconnectTime), Integer(ct-mlist[f].lastDisconnectTime)], TMsgType.Notify); + end; + end; + end + else + begin + // if we're not in slist query, and not in netgame (or not a host), disconnect + if (not isListQuery) and (not isMasterReportsEnabled()) 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; + + // fuck! https://www.mail-archive.com/enet-discuss@cubik.org/msg00852.html + // tl;dr: on shitdows, we can get -1 sometimes, and it is *NOT* a failure. + // thank you, enet. let's ignore failures altogether then. + count := 10; // no more than ten events in a row + sres := enet_host_service(NetMHost, @NetMEvent, timeout); + while (sres > 0) do + begin + { + if (sres < 0) then + begin + e_LogWriteln(_lc[I_NET_MSG_ERROR] + _lc[I_NET_ERR_CLIENT] + ' (host_service)', TMsgType.Notify); + 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; + + Dec(count); + if (count = 0) then break; + sres := enet_host_service(NetMHost, @NetMEvent, 0); + end; end; -procedure PingServer(var S: TNetServer; Sock: ENetSocket); + +//************************************************************************** +// +// gui and server list +// +//************************************************************************** + +//========================================================================== +// +// PingServer +// +//========================================================================== +procedure PingServer (var S: TNetServer; Sock: ENetSocket); var Buf: ENetBuffer; Ping: array [0..9] of Byte; @@ -115,7 +1267,13 @@ begin enet_socket_send(Sock, Addr(S.PingAddr), @Buf, 1); end; -procedure PingBcast(Sock: ENetSocket); + +//========================================================================== +// +// PingBcast +// +//========================================================================== +procedure PingBcast (Sock: ENetSocket); var S: TNetServer; begin @@ -127,11 +1285,16 @@ begin PingServer(S, Sock); end; -function g_Net_Slist_Fetch(var SL: TNetServerList): Boolean; + +//========================================================================== +// +// g_Net_Slist_Fetch +// +//========================================================================== +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; @@ -139,9 +1302,9 @@ var InMsg: TMsg; SvAddr: ENetAddress; FromSL: Boolean; - MyVer, Str: string; + MyVer: AnsiString; - procedure ProcessLocal(); + procedure ProcessLocal (); begin I := Length(SL); SetLength(SL, I + 1); @@ -162,7 +1325,8 @@ var Bots := InMsg.ReadWord(); end; end; - procedure CheckLocalServers(); + + procedure CheckLocalServers (); begin SetLength(SL, 0); @@ -198,25 +1362,33 @@ var if Length(SL) = 0 then SL := nil; end; + +var + f, c, n, pos: Integer; + aliveCount: Integer; + hasUnanswered: Boolean; + stt, ct: Int64; + tmpsv: TNetServer; begin - Result := False; + result := false; SL := nil; - if (NetMHost <> nil) or (NetMPeer <> nil) then + if (not g_Net_IsNetworkAvailable()) then begin - CheckLocalServers(); - Exit; + SetLength(SL, 0); + exit; end; - if not g_Net_Slist_Connect then + g_Net_Slist_Pulse(); // this will create mhost + + DisconnectAll(true); // forced disconnect + + for f := 0 to High(mlist) do begin - CheckLocalServers(); - Exit; + mlist[f].connectCount := 0; + mlist[f].srvAnswered := 0; end; - e_WriteLog('Fetching serverlist...', TMsgType.Notify); - g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_FETCH]); - NetOut.Clear(); NetOut.Write(Byte(NET_MMSG_GET)); @@ -224,286 +1396,219 @@ begin MyVer := GAME_VERSION; NetOut.Write(MyVer); - 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); + try + e_WriteLog('Fetching serverlist...', TMsgType.Notify); + g_Console_Add(_lc[I_NET_MSG]+_lc[I_NET_SLIST_FETCH]); - while enet_host_service(NetMHost, @NetMEvent, 5000) > 0 do - begin - if NetMEvent.kind = ENET_EVENT_TYPE_RECEIVE then + // wait until all servers connected and answered + stt := GetTimerMS(); + while true do begin - if not InMsg.Init(NetMEvent.packet^.data, NetMEvent.packet^.dataLength, True) then continue; - - MID := InMsg.ReadByte(); - - if MID <> NET_MMSG_GET then continue; - - Cnt := InMsg.ReadByte(); - g_Console_Add(_lc[I_NET_MSG] + Format(_lc[I_NET_SLIST_RETRIEVED], [Cnt]), True); - - if Cnt > 0 then + aliveCount := 0; + hasUnanswered := false; + for f := 0 to High(mlist) do begin - SetLength(SL, Cnt); - - for I := 0 to Cnt - 1 do + { + 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 + if (mlist[f].connectCount = 0) 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].srvAnswered > 1) then + begin + Inc(aliveCount); + end; + end + else if (mlist[f].isConnected()) then 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; + //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); + mlist[f].disconnect(false); // not forced + 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; + + if (aliveCount = 0) then + begin + DisconnectAll(); + CheckLocalServers(); + exit; + end; + + slMOTD := ''; + { + slUrgent := ''; + slReadUrgent := true; + } - if InMsg.ReadCount < InMsg.CurSize then + SetLength(SL, 0); + for f := 0 to High(mlist) do + begin + if (mlist[f].srvAnswered < 2) then continue; + for n := 0 to High(mlist[f].srvAnswer) do begin - // new master, supports version reports - Str := InMsg.ReadString(); - if (Str <> MyVer) then + pos := -1; + for c := 0 to High(SL) do begin - { TODO } - g_Console_Add('!!! UpdVer = `' + Str + '`'); + 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; - // even newer master, supports extra info - if InMsg.ReadCount < InMsg.CurSize then + if (pos < 0) 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; + pos := length(SL); + SetLength(SL, pos+1); + SL[pos] := mlist[f].srvAnswer[n]; + SL[pos].Number := pos; end; end; - - Result := True; - break; - end; - end; - - g_Net_Slist_Disconnect; - NetOut.Clear(); - - 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); - - 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(); - - 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; - - 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 + if (not mlist[f].slReadUrgent) and (mlist[f].slUrgent <> '') then begin - with SL[I] do + if (mlist[f].slUrgent <> slUrgent) 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(); + slUrgent := mlist[f].slUrgent; + slReadUrgent := false; end; - FromSL := True; - Inc(Cnt); - break; end; - if not FromSL then - ProcessLocal(); - end; - - InMsg.Free(); - enet_socket_destroy(Sock); -end; - -procedure g_Net_Slist_WriteInfo(); -var - Wad, Map: string; - Cli: Byte; -begin - Wad := g_ExtractWadNameNoPath(gMapInfo.Map); - Map := g_ExtractFileName(gMapInfo.Map); - - NetOut.Write(NetServerName); - - NetOut.Write(Wad + ':\' + Map); - NetOut.Write(gGameSettings.GameMode); - - Cli := NetClientCount; - NetOut.Write(Cli); - - NetOut.Write(NetMaxClients); - - NetOut.Write(Byte(NET_PROTOCOL_VER)); - NetOut.Write(Byte(NetPassword <> '')); -end; - -procedure g_Net_Slist_Update; -var - - P: pENetPacket; - -begin - if (NetMHost = nil) or (NetMPeer = nil) then Exit; - - NetOut.Clear(); - NetOut.Write(Byte(NET_MMSG_UPD)); - NetOut.Write(NetAddr.port); - - g_Net_Slist_WriteInfo(); - - 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); - NetOut.Clear(); -end; + if (slMOTD <> '') and (mlist[f].slMOTD <> '') then + begin + slMOTD := mlist[f].slMOTD; + end; + end; -procedure g_Net_Slist_Remove; -var - P: pENetPacket; -begin - if (NetMHost = nil) or (NetMPeer = nil) then Exit; - NetOut.Clear(); - NetOut.Write(Byte(NET_MMSG_DEL)); - NetOut.Write(NetAddr.port); + DisconnectAll(); - P := enet_packet_create(NetOut.Data, NetOut.CurSize, Cardinal(ENET_PACKET_FLAG_RELIABLE)); - enet_peer_send(NetMPeer, NET_MCHAN_MAIN, P); + if (length(SL) = 0) then + begin + CheckLocalServers(); + exit; + end; - enet_host_flush(NetMHost); - NetOut.Clear(); -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); -function g_Net_Slist_Connect: Boolean; -begin - Result := False; + for I := Low(SL) to High(SL) do PingServer(SL[I], Sock); - NetMHost := enet_host_create(nil, 1, NET_MCHANS, 0, 0); - if (NetMHost = nil) then - begin - g_Console_Add(_lc[I_NET_MSG_ERROR] + _lc[I_NET_ERR_CLIENT], True); - Exit; - end; + enet_socket_set_option(Sock, ENET_SOCKOPT_BROADCAST, 1); + PingBcast(Sock); - NetMPeer := enet_host_connect(NetMHost, @NetSlistAddr, NET_MCHANS, 0); - if (NetMPeer = 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; + T := GetTimerMS(); - if (enet_host_service(NetMHost, @NetMEvent, 3000) > 0) then - if NetMEvent.kind = ENET_EVENT_TYPE_CONNECT then + InMsg.Alloc(NET_BUFSIZE); + Buf.data := InMsg.Data; + Buf.dataLength := InMsg.MaxSize; + Cnt := 0; + while GetTimerMS() - T <= 500 do begin - Result := True; - g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_CONN]); - Exit; - end - else - if NetMEvent.kind = ENET_EVENT_TYPE_RECEIVE then - enet_packet_destroy(NetMEvent.packet); - - g_Console_Add(_lc[I_NET_MSG_ERROR] + _lc[I_NET_SLIST_ERROR], True); - - NetMHost := nil; - NetMPeer := nil; -end; - -procedure g_Net_Slist_Disconnect; -begin - if (NetMHost = nil) and (NetMPeer = nil) then Exit; + InMsg.Clear(); - if NetMode = NET_SERVER then g_Net_Slist_Remove; + RX := enet_socket_receive(Sock, @SvAddr, @Buf, 1); + if RX <= 0 then continue; + InMsg.CurSize := RX; - enet_peer_disconnect(NetMPeer, 0); - enet_host_flush(NetMHost); + InMsg.BeginReading(); - enet_peer_reset(NetMPeer); - enet_host_destroy(NetMHost); + if InMsg.ReadChar() <> 'D' then continue; + if InMsg.ReadChar() <> 'F' then continue; - NetMPeer := nil; - NetMHost := nil; + with tmpsv 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(); + PingAddr := SvAddr; + end; - g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_DISC]); -end; + FromSL := False; + for I := Low(SL) to High(SL) do + if (SL[I].PingAddr.host = SvAddr.host) and + (SL[I].PingAddr.port = SvAddr.port) and + (SL[I].Port = tmpsv.Port) and + (SL[I].Name = tmpsv.Name) then + begin + tmpsv.IP := SL[I].IP; + SL[I] := tmpsv; + FromSL := True; + Inc(Cnt); + break; + end; -procedure g_Net_Slist_Check; -begin - if (NetMHost = nil) or (NetMPeer = nil) then Exit; + if not FromSL then + begin + I := Length(SL); + SetLength(SL, I + 1); + tmpsv.IP := DecodeIPV4(SvAddr.host); + SL[I] := tmpsv; + end; + end; - while (enet_host_service(NetMHost, @NetMEvent, 0) > 0) do - begin - if NetMEvent.kind = ENET_EVENT_TYPE_DISCONNECT then - begin - g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_LOST], True); - if NetMPeer <> nil then enet_peer_reset(NetMPeer); - if NetMHost <> nil then enet_host_destroy(NetMHost); - NetMPeer := nil; - NetMHost := nil; - Break; - end - else - if NetMEvent.kind = ENET_EVENT_TYPE_RECEIVE then - enet_packet_destroy(NetMEvent.packet); + InMsg.Free(); + enet_socket_destroy(Sock); + finally + NetOut.Clear(); end; end; -procedure g_Net_Slist_Set(IP: string; Port: Word); -begin - if NetInitDone then - begin - enet_address_set_host(@NetSlistAddr, PChar(Addr(IP[1]))); - NetSlistAddr.Port := Port; - e_WriteLog('Masterserver address set to ' + IP + ':' + IntToStr(Port), TMsgType.Notify); - end; -end; -function GetServerFromTable(Index: Integer; SL: TNetServerList; ST: TNetServerTable): TNetServer; +//========================================================================== +// +// GetServerFromTable +// +//========================================================================== +function GetServerFromTable (Index: Integer; SL: TNetServerList; ST: TNetServerTable): TNetServer; begin Result.Number := 0; Result.Protocol := 0; @@ -526,157 +1631,17 @@ begin Result := SL[ST[Index].Indices[ST[Index].Current]]; end; -procedure g_Serverlist_Draw(var SL: TNetServerList; var ST: TNetServerTable); -var - Srv: TNetServer; - sy, i, y, mw, mx, l, motdh: Integer; - cw: Byte = 0; - ch: Byte = 0; - ww: Word = 0; - hh: Word = 0; - ip: string; -begin - ip := ''; - sy := 0; - - e_CharFont_GetSize(gMenuFont, _lc[I_NET_SLIST], ww, hh); - e_CharFont_Print(gMenuFont, (gScreenWidth div 2) - (ww div 2), 16, _lc[I_NET_SLIST]); - - e_TextureFontGetSize(gStdFont, cw, ch); - - ip := _lc[I_NET_SLIST_HELP]; - mw := (Length(ip) * cw) div 2; - - motdh := gScreenHeight - 49 - ch * b_Text_LineCount(slMOTD); - - e_DrawFillQuad(16, 64, gScreenWidth-16, motdh, 64, 64, 64, 110); - e_DrawQuad(16, 64, gScreenWidth-16, motdh, 255, 127, 0); - - e_TextureFontPrintEx(gScreenWidth div 2 - mw, gScreenHeight-24, ip, gStdFont, 225, 225, 225, 1); - - // MOTD - if slMOTD <> '' then - begin - e_DrawFillQuad(16, motdh, gScreenWidth-16, gScreenHeight-44, 64, 64, 64, 110); - e_DrawQuad(16, motdh, gScreenWidth-16, gScreenHeight-44, 255, 127, 0); - e_TextureFontPrintFmt(20, motdh + 3, slMOTD, gStdFont, False, True); - end; - - // Urgent message - if not slReadUrgent and (slUrgent <> '') then - begin - e_DrawFillQuad(17, 65, gScreenWidth-17, motdh-1, 64, 64, 64, 128); - e_DrawFillQuad(gScreenWidth div 2 - 256, gScreenHeight div 2 - 60, - gScreenWidth div 2 + 256, gScreenHeight div 2 + 60, 64, 64, 64, 128); - e_DrawQuad(gScreenWidth div 2 - 256, gScreenHeight div 2 - 60, - gScreenWidth div 2 + 256, gScreenHeight div 2 + 60, 255, 127, 0); - e_DrawLine(1, gScreenWidth div 2 - 256, gScreenHeight div 2 - 40, - gScreenWidth div 2 + 256, gScreenHeight div 2 - 40, 255, 127, 0); - l := Length(_lc[I_NET_SLIST_URGENT]) div 2; - e_TextureFontPrint(gScreenWidth div 2 - cw * l, gScreenHeight div 2 - 58, - _lc[I_NET_SLIST_URGENT], gStdFont); - l := Length(slUrgent) div 2; - e_TextureFontPrintFmt(gScreenWidth div 2 - 253, gScreenHeight div 2 - 38, - slUrgent, gStdFont, False, True); - l := Length(_lc[I_NET_SLIST_URGENT_CONT]) div 2; - e_TextureFontPrint(gScreenWidth div 2 - cw * l, gScreenHeight div 2 + 41, - _lc[I_NET_SLIST_URGENT_CONT], gStdFont); - e_DrawLine(1, gScreenWidth div 2 - 256, gScreenHeight div 2 + 40, - gScreenWidth div 2 + 256, gScreenHeight div 2 + 40, 255, 127, 0); - Exit; - end; - - if SL = nil then - begin - l := Length(slWaitStr) div 2; - e_DrawFillQuad(17, 65, gScreenWidth-17, motdh-1, 64, 64, 64, 128); - e_DrawQuad(gScreenWidth div 2 - 192, gScreenHeight div 2 - 10, - gScreenWidth div 2 + 192, gScreenHeight div 2 + 11, 255, 127, 0); - e_TextureFontPrint(gScreenWidth div 2 - cw * l, gScreenHeight div 2 - ch div 2, - slWaitStr, gStdFont); - Exit; - end; - - y := 90; - if (slSelection < Length(ST)) then - begin - I := slSelection; - sy := y + 42 * I - 4; - Srv := GetServerFromTable(I, SL, ST); - ip := _lc[I_NET_ADDRESS] + ' ' + Srv.IP + ':' + IntToStr(Srv.Port); - if Srv.Password then - ip := ip + ' ' + _lc[I_NET_SERVER_PASSWORD] + ' ' + _lc[I_MENU_YES] - else - ip := ip + ' ' + _lc[I_NET_SERVER_PASSWORD] + ' ' + _lc[I_MENU_NO]; - end else - if Length(ST) > 0 then - slSelection := 0; - - mw := (gScreenWidth - 188); - mx := 16 + mw; - - e_DrawFillQuad(16 + 1, sy, gScreenWidth - 16 - 1, sy + 40, 64, 64, 64, 0); - e_DrawLine(1, 16 + 1, sy, gScreenWidth - 16 - 1, sy, 205, 205, 205); - e_DrawLine(1, 16 + 1, sy + 41, gScreenWidth - 16 - 1, sy + 41, 255, 255, 255); - - e_DrawLine(1, 16, 85, gScreenWidth - 16, 85, 255, 127, 0); - e_DrawLine(1, 16, motdh-20, gScreenWidth-16, motdh-20, 255, 127, 0); - - e_DrawLine(1, mx - 70, 64, mx - 70, motdh, 255, 127, 0); - e_DrawLine(1, mx, 64, mx, motdh-20, 255, 127, 0); - e_DrawLine(1, mx + 52, 64, mx + 52, motdh-20, 255, 127, 0); - e_DrawLine(1, mx + 104, 64, mx + 104, motdh-20, 255, 127, 0); - - e_TextureFontPrintEx(18, 68, 'NAME/MAP', gStdFont, 255, 127, 0, 1); - e_TextureFontPrintEx(mx - 68, 68, 'PING', gStdFont, 255, 127, 0, 1); - e_TextureFontPrintEx(mx + 2, 68, 'MODE', gStdFont, 255, 127, 0, 1); - e_TextureFontPrintEx(mx + 54, 68, 'PLRS', gStdFont, 255, 127, 0, 1); - e_TextureFontPrintEx(mx + 106, 68, 'VER', gStdFont, 255, 127, 0, 1); - - y := 90; - for I := 0 to High(ST) do - begin - Srv := GetServerFromTable(I, SL, ST); - // Name and map - e_TextureFontPrintEx(18, y, Srv.Name, gStdFont, 255, 255, 255, 1); - e_TextureFontPrintEx(18, y + 16, Srv.Map, gStdFont, 210, 210, 210, 1); - - // Ping and similar count - if (Srv.Ping < 0) or (Srv.Ping > 999) then - e_TextureFontPrintEx(mx - 68, y, _lc[I_NET_SLIST_NO_ACCESS], gStdFont, 255, 0, 0, 1) - else - if Srv.Ping = 0 then - e_TextureFontPrintEx(mx - 68, y, '<1' + _lc[I_NET_SLIST_PING_MS], gStdFont, 255, 255, 255, 1) - else - e_TextureFontPrintEx(mx - 68, y, IntToStr(Srv.Ping) + _lc[I_NET_SLIST_PING_MS], gStdFont, 255, 255, 255, 1); - - if Length(ST[I].Indices) > 1 then - e_TextureFontPrintEx(mx - 68, y + 16, '< ' + IntToStr(Length(ST[I].Indices)) + ' >', gStdFont, 210, 210, 210, 1); - - // Game mode - e_TextureFontPrintEx(mx + 2, y, g_Game_ModeToText(Srv.GameMode), gStdFont, 255, 255, 255, 1); - - // Players - e_TextureFontPrintEx(mx + 54, y, IntToStr(Srv.Players) + '/' + IntToStr(Srv.MaxPlayers), gStdFont, 255, 255, 255, 1); - e_TextureFontPrintEx(mx + 54, y + 16, IntToStr(Srv.LocalPl) + '+' + IntToStr(Srv.Bots), gStdFont, 210, 210, 210, 1); - - // Version - e_TextureFontPrintEx(mx + 106, y, IntToStr(Srv.Protocol), gStdFont, 255, 255, 255, 1); - y := y + 42; - end; - - e_TextureFontPrintEx(20, motdh-20+3, ip, gStdFont, 205, 205, 205, 1); - ip := IntToStr(Length(ST)) + _lc[I_NET_SLIST_SERVERS]; - e_TextureFontPrintEx(gScreenWidth - 48 - (Length(ip) + 1)*cw, - motdh-20+3, ip, gStdFont, 205, 205, 205, 1); -end; - -procedure g_Serverlist_GenerateTable(SL: TNetServerList; var ST: TNetServerTable); +//========================================================================== +// +// g_Serverlist_GenerateTable +// +//========================================================================== +procedure g_Serverlist_GenerateTable (SL: TNetServerList; var ST: TNetServerTable); var i, j: Integer; - function FindServerInTable(Name: string): Integer; + function FindServerInTable(Name: AnsiString; Port: Word): Integer; var i: Integer; begin @@ -687,7 +1652,7 @@ var begin if Length(ST[i].Indices) = 0 then continue; - if SL[ST[i].Indices[0]].Name = Name then + if (SL[ST[i].Indices[0]].Name = Name) and (SL[ST[i].Indices[0]].Port = Port) then begin Result := i; Exit; @@ -736,9 +1701,10 @@ begin ST := nil; if SL = nil then Exit; + for i := Low(SL) to High(SL) do begin - j := FindServerInTable(SL[i].Name); + j := FindServerInTable(SL[i].Name, SL[i].Port); if j = -1 then begin j := Length(ST); @@ -760,15 +1726,23 @@ begin SortRows(); end; -procedure g_Serverlist_Control(var SL: TNetServerList; var ST: TNetServerTable); + +//========================================================================== +// +// g_Serverlist_Control +// +//========================================================================== +procedure g_Serverlist_Control (var SL: TNetServerList; var ST: TNetServerTable); var qm: Boolean; Srv: TNetServer; begin + g_Net_Slist_Pulse(); + if gConsoleShow or gChatShow then Exit; - qm := g_ProcessMessages(); // this updates kbd + qm := sys_HandleInput(); // this updates kbd if qm or e_KeyPressed(IK_ESCAPE) or e_KeyPressed(VK_ESCAPE) or e_KeyPressed(JOY0_JUMP) or e_KeyPressed(JOY1_JUMP) or @@ -784,7 +1758,7 @@ begin Exit; end; - // if there's a message on the screen, + // if there's a message on the screen, if not slReadUrgent and (slUrgent <> '') then begin if e_KeyPressed(IK_RETURN) or e_KeyPressed(IK_KPRETURN) or e_KeyPressed(VK_FIRE) or e_KeyPressed(VK_OPEN) or @@ -800,8 +1774,8 @@ begin begin slWaitStr := _lc[I_NET_SLIST_WAIT]; - g_Game_Draw; - g_window.ReDrawWindow; + r_Game_Draw; + sys_Repaint; if g_Net_Slist_Fetch(SL) then begin @@ -915,4 +1889,5 @@ begin slDirPressed := False; end; + end.