X-Git-Url: https://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fgame%2Fg_netmaster.pas;h=393c4e572fc5191271ce324832860541376bfb79;hp=660d0052bd928d29709b03488f482437fe9539f1;hb=3ef8e8c536c444b9e8a0adf38908d25082584e92;hpb=8640d90da9cfda68548c917739479a9bc05bea7c diff --git a/src/game/g_netmaster.pas b/src/game/g_netmaster.pas index 660d005..393c4e5 100644 --- a/src/game/g_netmaster.pas +++ b/src/game/g_netmaster.pas @@ -58,7 +58,6 @@ type TMasterHost = record public hostName: AnsiString; - hostPort: Word; public peer: pENetPeer; @@ -68,25 +67,27 @@ type NetHostConnected: Boolean; 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; 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 @@ -97,7 +98,7 @@ type // but try to call this at least once in 100 msecs procedure pulse (); - procedure disconnect (); + procedure disconnect (forced: Boolean); function connect (): Boolean; procedure update (); @@ -121,7 +122,7 @@ var slUrgent: AnsiString = ''; -procedure g_Net_Slist_Set (IP: AnsiString; Port: Word); +procedure g_Net_Slist_Set (IP: AnsiString; Port: Word; list: AnsiString=''); function g_Net_Slist_Fetch (var SL: TNetServerList): Boolean; // make this server private @@ -129,13 +130,27 @@ procedure g_Net_Slist_Private (); // make this server public procedure g_Net_Slist_Public (); -// called on network mode init -procedure g_Net_Slist_NetworkStarted (); -// called on network mode shutdown -procedure g_Net_Slist_NetworkStopped (); - +// 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); procedure g_Serverlist_Control (var SL: TNetServerList; var ST: TNetServerTable); @@ -148,31 +163,10 @@ 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; - -// make this server private -procedure g_Net_Slist_Private (); -begin -end; - - -// make this server public -procedure g_Net_Slist_Public (); -begin -end; - - -// called on network mode init -procedure g_Net_Slist_NetworkStarted (); -begin -end; - -// called on network mode shutdown -procedure g_Net_Slist_NetworkStopped (); -begin -end; + wadreader, g_system, utils, hashtable; +// ////////////////////////////////////////////////////////////////////////// // var NetMHost: pENetHost = nil; NetMEvent: ENetEvent; @@ -183,6 +177,8 @@ var slDirPressed: Boolean = False; slReadUrgent: Boolean = False; + reportsEnabled: Boolean = true; + //========================================================================== // @@ -209,27 +205,296 @@ begin 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; + + +//========================================================================== +// +// 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 (hostandport: AnsiString); +constructor TMasterHost.Create (var ea: ENetAddress); begin peer := nil; 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; @@ -241,15 +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; @@ -258,9 +523,7 @@ 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); @@ -269,41 +532,15 @@ begin 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; @@ -316,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; @@ -367,7 +604,8 @@ begin if not isAlive() then exit; if NetHostConnected then exit; NetHostConnected := true; - e_LogWritefln('connected to master at [%s:%u]', [hostName, hostPort], TMsgType.Notify); + 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; @@ -379,14 +617,9 @@ end; procedure TMasterHost.disconnectedEvent (); begin if not isAlive() then exit; - e_LogWritefln('disconnected from master at [%s:%u]', [hostName, hostPort], TMsgType.Notify); - enet_peer_reset(peer); - peer := nil; - NetHostConnected := False; - NetHostConReqTime := 0; - NetUpdatePending := false; - updateSent := false; - //if (spamConsole) then g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_DISC]); + 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; @@ -404,23 +637,13 @@ var Cnt: Byte; f: Integer; s: AnsiString; - { - I, RX: Integer; - T: Int64; - Sock: ENetSocket; - Buf: ENetBuffer; - InMsg: TMsg; - SvAddr: ENetAddress; - FromSL: Boolean; - MyVer, Str: AnsiString; - } begin - e_LogWritefln('received packed from master at [%s:%u]', [hostName, hostPort], TMsgType.Notify); + 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:%u]', [hostName, hostPort], TMsgType.Notify); + e_LogWritefln('received list packet from master at [%s]', [hostName], TMsgType.Notify); SetLength(srvAnswer, 0); if (srvAnswered > 0) then Inc(srvAnswered); slMOTD := ''; @@ -428,7 +651,8 @@ begin slReadUrgent := true; // number of items Cnt := msg.ReadByte(); - g_Console_Add(_lc[I_NET_MSG]+Format(_lc[I_NET_SLIST_RETRIEVED], [Cnt]), True); + //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); @@ -463,10 +687,12 @@ begin 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; @@ -482,23 +708,37 @@ end; 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 - ct := GetTimerMS(); if (ct < NetHostConReqTime) or (ct-NetHostConReqTime >= 3000) then begin - e_LogWritefln('failed to connect to master at [%s:%u]', [hostName, hostPort], TMsgType.Notify); + 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; + // 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 (lastUpdateTime = 0) or (ct < lastUpdateTime) or (ct-lastUpdateTime >= mrate) then + begin + lastUpdateTime := ct; + update(); + end; + end; end; @@ -507,19 +747,29 @@ end; // TMasterHost.disconnect // //========================================================================== -procedure TMasterHost.disconnect (); +procedure TMasterHost.disconnect (forced: Boolean); begin if not isAlive() then exit; - //if (NetMode = NET_SERVER) and isConnected() and updateSent then remove(); - enet_peer_disconnect_later(peer, 0); - // main pulse will take care of the rest + if (forced) then + begin + enet_peer_reset(peer); + peer := nil; + NetHostConReqTime := 0; + end + else + begin + enet_peer_disconnect_later(peer, 0); + // main pulse will take care of the rest + NetHostConReqTime := -1; + end; + NetHostConnected := false; - NetHostConReqTime := -1; NetUpdatePending := false; - updateSent := false; - - //if (spamConsole) then g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_DISC]); + //updateSent := false; + lastUpdateTime := 0; + //lastConnectTime := 0; + //if (spamConsole) then g_Console_Add(Format(_lc[I_NET_MSG]+_lc[I_NET_SLIST_DISC], [hostName])); end; @@ -531,28 +781,24 @@ end; function TMasterHost.connect (): Boolean; begin result := false; - if not isValid() or (NetHostConReqTime = -1) then exit; - if isAlive() then begin result := true; exit; end; + 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; - if (not NetInitDone) then exit; - - if (not addressInited) then - begin - if (enet_address_set_host(@enetAddr, PChar(Addr(hostName[1]))) <> 0) then - begin - hostName := ''; - hostPort := 0; - exit; - end; - enetAddr.Port := hostPort; - addressInited := true; - end; + lastUpdateTime := 0; peer := enet_host_connect(NetMHost, @enetAddr, NET_MCHANS, 0); if (peer = nil) then @@ -561,8 +807,8 @@ begin exit; end; - NetHostConReqTime := GetTimerMS(); - e_LogWritefln('connecting to master at [%s:%u]', [hostName, hostPort], TMsgType.Notify); + NetHostConReqTime := lastConnectTime; + e_LogWritefln('connecting to master at [%s]', [hostName], TMsgType.Notify); end; @@ -609,19 +855,33 @@ begin end; netmsg.Clear(); - try - 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); - 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 NetUpdatePending := false; + 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; - finally - netmsg.Clear(); + end + else + begin + NetUpdatePending := false; end; end; @@ -636,6 +896,8 @@ var pkt: pENetPacket; begin NetUpdatePending := false; + lastUpdateTime := 0; + updateSent := false; if not isAlive() then exit; if not isConnected() then exit; @@ -660,27 +922,151 @@ end; // other functions // //************************************************************************** +type + THashStrDWord = specialize THashBase; + +var + knownHosts: THashStrDWord = nil; + -procedure g_Net_Slist_Set (IP: AnsiString; Port: Word); +//========================================================================== +// +// parseAddressPort +// +//========================================================================== +function parseAddressPort (var ea: ENetAddress; hostandport: AnsiString): Boolean; +var + cp, port: Integer; + hostName: AnsiString; + ip: LongWord; begin - if (length(mlist) = 0) then + 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 - SetLength(mlist, 1); - mlist[0].Create(ip+':'+IntToStr(Port)); + ea.host := ip; end else begin - mlist[0].setAddress(ip+':'+IntToStr(Port)); + 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; - e_LogWritefln('Masterserver address set to [%s:%u]', [IP, Port], TMsgType.Notify); - { - if NetInitDone then + if (freeIdx < 0) 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); + 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 (IP: AnsiString; Port: Word; list: AnsiString=''); +var + f, dest: Integer; + sa: AnsiString; + ea: ENetAddress; + pp: Integer; +begin + 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 + 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 + 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; + + // 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; @@ -689,12 +1075,23 @@ end; // main 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 @@ -707,7 +1104,7 @@ begin if (NetMHost = nil) then begin - NetMHost := enet_host_create(nil, 1, NET_MCHANS, 0, 0); + 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); @@ -717,11 +1114,40 @@ begin end; end; - for f := 0 to High(mlist) do mlist[f].pulse(); + 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; - while true do + sres := enet_host_service(NetMHost, @NetMEvent, timeout); + while (sres <> 0) do begin - sres := enet_host_service(NetMHost, @NetMEvent, timeout); if (sres < 0) then begin g_Console_Add(_lc[I_NET_MSG_ERROR]+_lc[I_NET_ERR_CLIENT], True); @@ -732,28 +1158,29 @@ begin exit; end; - if (sres = 0) then break; 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); - continue; - end; - - 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 + else begin - mlist[idx].receivedEvent(NetMEvent.packet); - enet_packet_destroy(NetMEvent.packet); + 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; @@ -824,16 +1251,6 @@ var FromSL: Boolean; MyVer: AnsiString; - procedure DisconnectAll (); - var - f: Integer; - begin - for f := 0 to High(mlist) do - begin - if (mlist[f].isAlive()) then mlist[f].disconnect(); - end; - end; - procedure ProcessLocal (); begin I := Length(SL); @@ -902,8 +1319,16 @@ begin result := false; SL := nil; + if (not g_Net_IsNetworkAvailable()) then + begin + SetLength(SL, 0); + exit; + end; + g_Net_Slist_Pulse(); // this will create mhost + DisconnectAll(true); // forced disconnect + NetOut.Clear(); NetOut.Write(Byte(NET_MMSG_GET)); @@ -912,53 +1337,36 @@ begin NetOut.Write(MyVer); try - aliveCount := 0; - for f := 0 to High(mlist) do - begin - mlist[f].srvAnswered := 0; - if (not mlist[f].isValid()) then continue; - if (not mlist[f].isConnected()) then mlist[f].connect(); - if (not mlist[f].isAlive()) then continue; - if (mlist[f].isConnected()) 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 - Inc(aliveCount); - mlist[f].srvAnswered := 1; - end; - end; - end - else if (mlist[f].isConnecting()) then - begin - Inc(aliveCount); - end; - end; - - if (aliveCount = 0) then - begin - DisconnectAll(); - CheckLocalServers(); - exit; - end; - e_WriteLog('Fetching serverlist...', TMsgType.Notify); - g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_FETCH]); + g_Console_Add(_lc[I_NET_MSG]+_lc[I_NET_SLIST_FETCH]); // wait until all servers connected and answered stt := GetTimerMS(); while true do begin - g_Net_Slist_Pulse(300); 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 (mlist[f].isConnected()) then + 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)); @@ -968,6 +1376,7 @@ begin begin hasUnanswered := true; mlist[f].srvAnswered := 1; + stt := GetTimerMS(); end; end; end @@ -989,6 +1398,7 @@ begin // check for timeout ct := GetTimerMS(); if (ct < stt) or (ct-stt > 4000) then break; + g_Net_Slist_Pulse(300); end; if (aliveCount = 0) then @@ -1398,6 +1808,8 @@ var qm: Boolean; Srv: TNetServer; begin + g_Net_Slist_Pulse(); + if gConsoleShow or gChatShow then Exit;