X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_netmaster.pas;h=393c4e572fc5191271ce324832860541376bfb79;hb=3ef8e8c536c444b9e8a0adf38908d25082584e92;hp=0b9e546f8100966a36906c5af11c36c986a6e41b;hpb=66647a58f13c9697541ec72248cbf95b10f8524f;p=d2df-sdl.git

diff --git a/src/game/g_netmaster.pas b/src/game/g_netmaster.pas
index 0b9e546..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,6 +67,7 @@ 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;
     // server list request working flags
@@ -76,18 +76,18 @@ type
     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 isSameAddress (hostandport: AnsiString): Boolean;
+    function setAddress (var ea: ENetAddress; hostStr: AnsiString): Boolean;
 
     function isValid (): Boolean;
     function isAlive (): Boolean; // not disconnected
@@ -122,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
@@ -146,8 +146,11 @@ 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);
@@ -160,114 +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;
 
-// if g_Game_IsServer and g_Game_IsNet and NetUseMaster then
 
-// make this server private
-procedure g_Net_Slist_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;
 
-// make this server public
-procedure g_Net_Slist_Public ();
+
+//==========================================================================
+//
+//  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;
 
-// called while the server is running
-procedure g_Net_Slist_ServerUpdate ();
+
+//==========================================================================
+//
+//  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;
 
-// called when the server is started
-procedure g_Net_Slist_ServerStarted ();
+
+//==========================================================================
+//
+//  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;
 
-// called when the server is stopped
-procedure g_Net_Slist_ServerClosed ();
+
+//==========================================================================
+//
+//  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;
 
-// called when new netword player comes
-procedure g_Net_Slist_ServerPlayerComes ();
+
+//==========================================================================
+//
+//  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;
 
-// called when new netword player comes
-procedure g_Net_Slist_ServerPlayerLeaves ();
+
+//**************************************************************************
+//
+// public api
+//
+//**************************************************************************
+
+//==========================================================================
+//
+//  g_Net_Slist_Private
+//
+//  make this server private
+//
+//==========================================================================
+procedure g_Net_Slist_Private ();
 begin
+  DisconnectAll();
+  reportsEnabled := false;
 end;
 
-// started new map
-procedure g_Net_Slist_ServerMapStarted ();
+
+//==========================================================================
+//
+//  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;
 
-// this server renamed (or password mode changed, or other params changed)
-procedure g_Net_Slist_ServerRenamed ();
+
+//==========================================================================
+//
+//  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;
-  NetMEvent: ENetEvent;
-  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;
+
+//==========================================================================
+//
+//  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;
 
 
 //==========================================================================
 //
-//  findByPeer
+//  g_Net_Slist_ServerMapStarted
+//
+//  started new map
 //
 //==========================================================================
-function findByPeer (peer: pENetPeer): Integer;
-var
-  f: Integer;
+procedure g_Net_Slist_ServerMapStarted ();
 begin
-  for f := 0 to High(mlist) do if (mlist[f].peer = peer) then begin result := f; exit; end;
-  result := -1;
+  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;
 
 
@@ -281,50 +508,13 @@ begin
   updateSent := false; // do not send 'remove'
   disconnect(true);
   hostName := '';
-  hostPort := 25665;
   netmsg.Free();
   SetLength(srvAnswer, 0);
   srvAnswered := 0;
   slMOTD := '';
   slUrgent := '';
   slReadUrgent := true;
-end;
-
-
-//==========================================================================
-//
-//  TMasterHost.isSameAddress
-//
-//==========================================================================
-function TMasterHost.isSameAddress (hostandport: AnsiString): Boolean;
-var
-  cp, pp: Integer;
-  hn: AnsiString;
-begin
-  result := false;
-  if not isValid() then exit;
-  hostandport := Trim(hostandport);
-  if (length(hostandport) = 0) then exit;
-  hn := hostandport;
-  cp := Pos(':', hostandport);
-  if (cp > 0) then
-  begin
-    hn := Copy(hostandport, 1, cp-1);
-    Delete(hostandport, 1, cp);
-    if (length(hostandport) > 0) then
-    begin
-      try
-        pp := StrToInt(hostandport);
-      except
-        pp := -1;
-      end;
-    end;
-  end
-  else
-  begin
-    pp := 25665;
-  end;
-  result := strEquCI1251(hn, hostName) and (hostPort = pp);
+  ZeroMemory(@enetAddr, sizeof(enetAddr));
 end;
 
 
@@ -333,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);
@@ -346,43 +534,15 @@ begin
   updateSent := false; // do not send 'remove'
   disconnect(true);
   hostName := '';
-  hostPort := 25665;
 
   if (not g_Net_IsNetworkAvailable()) then exit;
 
-  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;
+  enetAddr := ea;
+  if (enetAddr.host = 0) or (enetAddr.port = 0) then exit;
 
-  if not isValid() then exit;
-
-  if (enet_address_set_host(@enetAddr, PChar(Addr(hostName[1]))) <> 0) then
-  begin
-    writeln('SHIT!');
-    hostName := '';
-    hostPort := 0;
-  end;
-  enetAddr.Port := hostPort;
+  if (length(hostStr) > 0) then hostName := hostStr else hostName := IntToStr(enetAddr.host)+':'+IntToStr(ea.port);
 
   result := isValid();
-  //writeln('*********************: ', hostandport, ' [', hostName, ':', hostPort, '] ', result);
 end;
 
 
@@ -393,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;
 
 
@@ -444,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;
 
 
@@ -456,9 +617,9 @@ end;
 procedure TMasterHost.disconnectedEvent ();
 begin
   if not isAlive() then exit;
-  e_LogWritefln('disconnected from master at [%s:%u]', [hostName, hostPort], TMsgType.Notify);
+  e_LogWritefln('disconnected from master at [%s]', [hostName], TMsgType.Notify);
   disconnect(true);
-  //if (spamConsole) then g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_DISC]);
+  //if (spamConsole) then g_Console_Add(Format(_lc[I_NET_MSG]+_lc[I_NET_SLIST_DISC], [hostName]));
 end;
 
 
@@ -477,12 +638,12 @@ var
   f: Integer;
   s: 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 := '';
@@ -490,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);
@@ -525,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;
@@ -544,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;
 
 
@@ -572,7 +750,6 @@ end;
 procedure TMasterHost.disconnect (forced: Boolean);
 begin
   if not isAlive() then exit;
-  //if (NetMode = NET_SERVER) and isConnected() and updateSent then remove();
 
   if (forced) then
   begin
@@ -589,8 +766,10 @@ begin
 
   NetHostConnected := false;
   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;
 
 
@@ -612,12 +791,14 @@ 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
@@ -626,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;
 
 
@@ -674,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;
 
@@ -701,6 +896,8 @@ var
   pkt: pENetPacket;
 begin
   NetUpdatePending := false;
+  lastUpdateTime := 0;
+  updateSent := false;
   if not isAlive() then exit;
   if not isConnected() then exit;
 
@@ -725,21 +922,151 @@ end;
 // other functions
 //
 //**************************************************************************
+type
+  THashStrDWord = specialize THashBase<AnsiString, LongWord, THashKeyStrAnsiCI>;
+
+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;
 
-procedure g_Net_Slist_Set (IP: AnsiString; Port: Word);
+  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 (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) or (Port = 0) then exit;
-  sa := IP+':'+IntToStr(Port);
-  for f := 0 to High(mlist) do if (mlist[f].isSameAddress(sa)) then exit;
-  SetLength(mlist, length(mlist)+1);
-  mlist[High(mlist)].Create(sa);
-  mlist[High(mlist)].setAddress(sa);
-  e_LogWritefln('Masterserver address set to [%s:%u]', [IP, Port], TMsgType.Notify);
+  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;
 
 
@@ -748,11 +1075,20 @@ 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;
 
@@ -768,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);
@@ -778,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);
@@ -793,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;
 
@@ -885,34 +1251,6 @@ var
   FromSL: Boolean;
   MyVer: AnsiString;
 
-  procedure DisconnectAll ();
-  var
-    f: Integer;
-    hasAlive: Boolean;
-    //stt, ct: Int64;
-  begin
-    //stt := GetTimerMS();
-    while (length(mlist) > 0) do
-    begin
-      hasAlive := false;
-      for f := 0 to High(mlist) do
-      begin
-        if (mlist[f].isAlive()) then
-        begin
-          hasAlive := true;
-          mlist[f].disconnect(false);
-        end;
-      end;
-      if not hasAlive then break;
-      break;
-      {
-      g_Net_Slist_Pulse(100);
-      ct := GetTimerMS();
-      if (ct < stt) or (ct-stt > 800) then break;
-      }
-    end;
-  end;
-
   procedure ProcessLocal ();
   begin
     I := Length(SL);
@@ -989,6 +1327,8 @@ begin
 
   g_Net_Slist_Pulse(); // this will create mhost
 
+  DisconnectAll(true); // forced disconnect
+
   NetOut.Clear();
   NetOut.Write(Byte(NET_MMSG_GET));
 
@@ -998,20 +1338,19 @@ begin
 
   try
     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:%u] valid=%d; alive=%d; connected=%d; connecting=%d',
-          [f, mlist[f].hostName, mlist[f].hostPort, Integer(mlist[f].isValid()), Integer(mlist[f].isAlive()),
+        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;
@@ -1020,12 +1359,14 @@ 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));
@@ -1057,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