X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_netmaster.pas;h=d9c62c9efb78ea8821016e803d929bfac3e7a4c2;hb=a8d974b1564603bd91bd7663bf108c0a05fb7947;hp=e24bed7accc9c70301965d3614103043016e528e;hpb=b6ecb2b61416583271dd444965bacb2688fef370;p=d2df-sdl.git

diff --git a/src/game/g_netmaster.pas b/src/game/g_netmaster.pas
index e24bed7..d9c62c9 100644
--- a/src/game/g_netmaster.pas
+++ b/src/game/g_netmaster.pas
@@ -30,6 +30,14 @@ 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;
@@ -58,7 +66,6 @@ type
   TMasterHost = record
   public
     hostName: AnsiString;
-    hostPort: Word;
 
   public
     peer: pENetPeer;
@@ -68,8 +75,8 @@ 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;
+    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;
@@ -77,18 +84,19 @@ type
     slMOTD: AnsiString;
     slUrgent: AnsiString;
     slReadUrgent: Boolean;
+    // temporary mark
+    justAdded: Boolean;
+    connectCount: Integer;
 
   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,8 +130,10 @@ var
   slMOTD: AnsiString = '';
   slUrgent: AnsiString = '';
 
+  NMASTER_FORCE_UPDATE_TIMEOUT: Integer = 0; // fuck you, fpc, and your idiotic "diagnostics"
 
-procedure g_Net_Slist_Set (IP: AnsiString; Port: Word);
+
+procedure g_Net_Slist_Set (list: AnsiString);
 function g_Net_Slist_Fetch (var SL: TNetServerList): Boolean;
 
 // make this server private
@@ -147,23 +157,29 @@ 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);
 
+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,
-  wadreader, g_system, utils;
+  g_map, g_game, g_sound, g_gui, g_menu, g_options, g_language, g_basic, r_game,
+  wadreader, g_system, utils, hashtable;
+
 
 // ////////////////////////////////////////////////////////////////////////// //
 var
@@ -171,10 +187,8 @@ var
   NetMEvent: ENetEvent;
   mlist: array of TMasterHost = nil;
 
-  slSelection: Byte = 0;
   slFetched: Boolean = False;
   slDirPressed: Boolean = False;
-  slReadUrgent: Boolean = False;
 
   reportsEnabled: Boolean = true;
 
@@ -223,7 +237,7 @@ begin
       Inc(activeCount);
       if (mlist[f].isConnected() and mlist[f].updateSent) then
       begin
-        writeln('unregistering from ', f);
+        writeln('unregistering from [', mlist[f].hostName, ']');
         mlist[f].remove();
       end;
       //mlist[f].disconnect(false);
@@ -237,9 +251,12 @@ 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;
+    // if (sres < 0) then break;
+    if (sres <= 0) then continue;
 
     idx := findByPeer(NetMEvent.peer);
     if (idx < 0) then
@@ -275,13 +292,13 @@ end;
 //  DisconnectAll
 //
 //==========================================================================
-procedure 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(false);
+    if (mlist[f].isAlive()) then mlist[f].disconnect(forced);
   end;
 end;
 
@@ -295,11 +312,11 @@ 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].lastConnectTime := 0;
-    //if (not mlist[f].isAlive()) then continue;
+    mlist[f].lastDisconnectTime := 0;
     // force updating
     if (sendUpdate) then
     begin
@@ -319,6 +336,7 @@ 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;
@@ -476,24 +494,26 @@ end;
 //  TMasterHost.Create
 //
 //==========================================================================
-constructor TMasterHost.Create (hostandport: AnsiString);
+constructor TMasterHost.Create (var ea: ENetAddress);
 begin
   peer := nil;
   NetHostConnected := false;
   NetHostConReqTime := 0;
   NetUpdatePending := false;
-  lastConnectTime := 0;
+  lastDisconnectTime := 0;
   updateSent := false;
   lastUpdateTime := 0;
   hostName := '';
-  hostPort := 25665;
+  ZeroMemory(@enetAddr, sizeof(enetAddr));
   SetLength(srvAnswer, 0);
   srvAnswered := 0;
   slMOTD := '';
   slUrgent := '';
   slReadUrgent := true;
+  justAdded := false;
+  connectCount := 0;
   netmsg.Alloc(NET_BUFSIZE);
-  setAddress(hostandport);
+  setAddress(ea, '');
 end;
 
 
@@ -507,50 +527,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;
 
 
@@ -559,9 +542,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);
@@ -572,43 +553,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;
 
 
@@ -619,7 +572,7 @@ end;
 //==========================================================================
 function TMasterHost.isValid (): Boolean;
 begin
-  result := (length(hostName) > 0) and (hostPort > 0);
+  result := (enetAddr.host <> 0) and (enetAddr.port <> 0);
 end;
 
 
@@ -670,7 +623,9 @@ begin
   if not isAlive() then exit;
   if NetHostConnected then exit;
   NetHostConnected := true;
-  e_LogWritefln('connected to master at [%s:%u]', [hostName, hostPort], TMsgType.Notify);
+  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;
 
 
@@ -682,9 +637,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;
 
 
@@ -703,12 +658,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 := '';
@@ -716,7 +671,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);
@@ -751,10 +707,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;
@@ -762,75 +720,39 @@ end;
 
 //==========================================================================
 //
-//  TMasterHost.pulse
-//
-//  this performs various scheduled tasks, if necessary
+//  TMasterHost.disconnect
 //
 //==========================================================================
-procedure TMasterHost.pulse ();
-var
-  ct: Int64;
-  mrate: Cardinal;
+procedure TMasterHost.disconnect (forced: Boolean);
 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
+  if isAlive() then
   begin
-    if (ct < NetHostConReqTime) or (ct-NetHostConReqTime >= 3000) then
+    lastDisconnectTime := GetTimerMS();
+    if forced or (not NetHostConnected) or (NetHostConReqTime = -1) then
     begin
-      e_LogWritefln('failed to connect to master at [%s:%u]', [hostName, hostPort], 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
-    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
+      enet_peer_reset(peer);
+      peer := nil;
+      NetHostConReqTime := 0;
+      updateSent := false;
+    end
+    else
     begin
-      lastUpdateTime := ct;
-      update();
+      enet_peer_disconnect_later(peer, 0);
+      // main pulse will take care of the rest
+      NetHostConReqTime := -1;
     end;
-  end;
-end;
-
-
-//==========================================================================
-//
-//  TMasterHost.disconnect
-//
-//==========================================================================
-procedure TMasterHost.disconnect (forced: Boolean);
-begin
-  if not isAlive() then exit;
-
-  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;
+    // just in case
+    NetHostConReqTime := 0;
+    updateSent := false;
   end;
 
   NetHostConnected := false;
   NetUpdatePending := false;
-  //updateSent := false;
   lastUpdateTime := 0;
-  //lastConnectTime := 0;
-  //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;
 
 
@@ -846,13 +768,15 @@ begin
   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;
 
-  lastConnectTime := GetTimerMS();
+  lastDisconnectTime := GetTimerMS(); // why not?
   SetLength(srvAnswer, 0);
   srvAnswered := 0;
   NetHostConnected := false;
@@ -860,6 +784,7 @@ begin
   NetUpdatePending := false;
   updateSent := false;
   lastUpdateTime := 0;
+  Inc(connectCount);
 
   peer := enet_host_connect(NetMHost, @enetAddr, NET_MCHANS, 0);
   if (peer = nil) then
@@ -868,8 +793,8 @@ begin
     exit;
   end;
 
-  NetHostConReqTime := lastConnectTime;
-  e_LogWritefln('connecting to master at [%s:%u]', [hostName, hostPort], TMsgType.Notify);
+  NetHostConReqTime := lastDisconnectTime;
+  e_LogWritefln('connecting to master at [%s]', [hostName], TMsgType.Notify);
 end;
 
 
@@ -922,6 +847,7 @@ begin
     try
       netmsg.Write(Byte(NET_MMSG_UPD));
       netmsg.Write(NetAddr.port);
+      //writeln(formatstrf('%08x', [NetAddr.host]), ' : ', NetAddr.host);
 
       writeInfo(netmsg);
 
@@ -930,7 +856,7 @@ begin
       begin
         if (enet_peer_send(peer, NET_MCHAN_UPD, pkt) = 0) then
         begin
-          e_LogWritefln('sent update to master at [%s:%u]', [hostName, hostPort], TMsgType.Notify);
+          e_LogWritefln('sent update to master at [%s]', [hostName], TMsgType.Notify);
           NetUpdatePending := false;
           updateSent := true;
         end;
@@ -977,26 +903,193 @@ begin
 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<AnsiString, LongWord, THashKeyStrAnsiCI>;
+
+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
+  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
+  f, dest: Integer;
   sa: AnsiString;
+  ea: ENetAddress;
+  pp: Integer;
 begin
   if (not g_Net_IsNetworkAvailable()) then exit;
-  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);
+
+  for f := 0 to High(mlist) do mlist[f].justAdded := false;
+
+  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;
 
 
@@ -1005,12 +1098,33 @@ end;
 // main pulse
 //
 //**************************************************************************
+
+//==========================================================================
+//
+//  isMasterReportsEnabled
+//
+//==========================================================================
+function isMasterReportsEnabled (): Boolean;
+begin
+  result := (reportsEnabled and g_Game_IsServer() and g_Game_IsNet() and NetUseMaster);
+end;
+
+
+//==========================================================================
+//
+//  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
   if (not g_Net_IsNetworkAvailable()) then exit;
 
@@ -1026,76 +1140,100 @@ 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);
+      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
-      if reportsEnabled and g_Game_IsServer() and g_Game_IsNet() and NetUseMaster then
+      // 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].lastConnectTime = 0) or (ct < mlist[f].lastConnectTime) or (ct-mlist[f].lastConnectTime >= 1000*60*5) then
+        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 not reportsEnabled or not g_Game_IsServer() or not g_Game_IsNet() or not NetUseMaster then
+      // 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 mlist[f].remove();
+        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
+  // 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
-    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);
+      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;
+    }
 
-    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;
+
+    Dec(count);
+    if (count = 0) then break;
+    sres := enet_host_service(NetMHost, @NetMEvent, 0);
   end;
 end;
 
@@ -1230,6 +1368,7 @@ var
   aliveCount: Integer;
   hasUnanswered: Boolean;
   stt, ct: Int64;
+  tmpsv: TNetServer;
 begin
   result := false;
   SL := nil;
@@ -1242,6 +1381,14 @@ begin
 
   g_Net_Slist_Pulse(); // this will create mhost
 
+  DisconnectAll(true); // forced disconnect
+
+  for f := 0 to High(mlist) do
+  begin
+    mlist[f].connectCount := 0;
+    mlist[f].srvAnswered := 0;
+  end;
+
   NetOut.Clear();
   NetOut.Write(Byte(NET_MMSG_GET));
 
@@ -1251,34 +1398,42 @@ 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;
         if (not mlist[f].isAlive()) then
         begin
-          mlist[f].connect();
-          if (mlist[f].isAlive()) then
+          if (mlist[f].connectCount = 0) then
           begin
-            hasUnanswered := true;
-            stt := GetTimerMS();
+            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
+          //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));
@@ -1299,6 +1454,7 @@ begin
           else if (mlist[f].srvAnswered > 1) then
           begin
             Inc(aliveCount);
+            mlist[f].disconnect(false); // not forced
           end;
         end
         else if (mlist[f].isConnecting()) then
@@ -1310,6 +1466,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,32 +1555,44 @@ begin
       if InMsg.ReadChar() <> 'D' then continue;
       if InMsg.ReadChar() <> 'F' then continue;
 
+      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;
+
       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
+           (SL[I].PingAddr.port = SvAddr.port) and
+           (SL[I].Port = tmpsv.Port) and
+           (SL[I].Name = tmpsv.Name) then
         begin
-          with SL[I] do
-          begin
-            Port := InMsg.ReadWord();
-            Ping := InMsg.ReadInt64();
-            Ping := GetTimerMS() - Ping;
-            Name := InMsg.ReadString();
-            Map := InMsg.ReadString();
-            GameMode := InMsg.ReadByte();
-            Players := InMsg.ReadByte();
-            MaxPlayers := InMsg.ReadByte();
-            Protocol := InMsg.ReadByte();
-            Password := InMsg.ReadByte() = 1;
-            LocalPl := InMsg.ReadByte();
-            Bots := InMsg.ReadWord();
-          end;
+          tmpsv.IP := SL[I].IP;
+          SL[I] := tmpsv;
           FromSL := True;
           Inc(Cnt);
           break;
         end;
+
       if not FromSL then
-        ProcessLocal();
+      begin
+        I := Length(SL);
+        SetLength(SL, I + 1);
+        tmpsv.IP := DecodeIPV4(SvAddr.host);
+        SL[I] := tmpsv;
+      end;
     end;
 
     InMsg.Free();
@@ -1463,158 +1632,6 @@ begin
 end;
 
 
-//==========================================================================
-//
-//  g_Serverlist_Draw
-//
-//==========================================================================
-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: AnsiString;
-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;
-
-
 //==========================================================================
 //
 //  g_Serverlist_GenerateTable
@@ -1624,7 +1641,7 @@ procedure g_Serverlist_GenerateTable (SL: TNetServerList; var ST: TNetServerTabl
 var
   i, j: Integer;
 
-  function FindServerInTable(Name: AnsiString): Integer;
+  function FindServerInTable(Name: AnsiString; Port: Word): Integer;
   var
     i: Integer;
   begin
@@ -1635,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;
@@ -1684,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);
@@ -1756,7 +1774,7 @@ begin
     begin
       slWaitStr := _lc[I_NET_SLIST_WAIT];
 
-      g_Game_Draw;
+      r_Game_Draw;
       sys_Repaint;
 
       if g_Net_Slist_Fetch(SL) then