net: mostly restored master-comm logic

diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index a580b32bd703d8161937143602452e9b19513335..30e6993bcc6f746d57eaba21cc2931be4b531a60 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
@@ -4273,6 +4273,7 @@ begin
     end;
     Exit;
   end;
+  g_Net_Slist_ServerPlayerLeaves();
 end;
 
 procedure g_Game_Spectate();

diff --git a/src/game/g_net.pas b/src/game/g_net.pas
index 8e76d85e898358ccc56403e5f15977edc1a7b774..2518bede333e6272e934a02050124f2dbf992a9a 100644 (file)
--- a/src/game/g_net.pas
+++ b/src/game/g_net.pas
@@ -358,6 +358,7 @@ begin
   e_LogWritefln('disconnected client #%d due to file transfer error', [nc.ID], TMsgType.Warning);
   enet_peer_disconnect(nc.Peer, NET_DISC_FILE_TIMEOUT);
   clearNetClientTransfers(nc);
+  g_Net_Slist_ServerPlayerLeaves();
 end;
 
 

diff --git a/src/game/g_netmaster.pas b/src/game/g_netmaster.pas
index 0b9e546f8100966a36906c5af11c36c986a6e41b..bc940cf0f7b55ef4eb21beb2a84203b146b2d0e0 100644 (file)
--- a/src/game/g_netmaster.pas
+++ b/src/game/g_netmaster.pas
@@ -68,6 +68,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
@@ -148,6 +149,8 @@ procedure g_Net_Slist_ServerRenamed ();
 
 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);
@@ -162,91 +165,312 @@ uses
   g_map, g_game, g_sound, g_gui, g_menu, g_options, g_language, g_basic,
   wadreader, g_system, utils;
 
-// if g_Game_IsServer and g_Game_IsNet and NetUseMaster then
+// ////////////////////////////////////////////////////////////////////////// //
+var
+  NetMHost: pENetHost = nil;
+  NetMEvent: ENetEvent;
+  mlist: array of TMasterHost = nil;
 
-// make this server private
-procedure g_Net_Slist_Private ();
+  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 ', f);
+        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 ();
+var
+  f: Integer;
 begin
+  for f := 0 to High(mlist) do
+  begin
+    if (mlist[f].isAlive()) then mlist[f].disconnect(false);
+  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
@@ -258,7 +482,9 @@ begin
   NetHostConnected := false;
   NetHostConReqTime := 0;
   NetUpdatePending := false;
+  lastConnectTime := 0;
   updateSent := false;
+  lastUpdateTime := 0;
   hostName := '';
   hostPort := 25665;
   SetLength(srvAnswer, 0);
@@ -544,13 +770,14 @@ 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);
@@ -561,6 +788,18 @@ begin
     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 +811,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,7 +827,9 @@ begin
 
   NetHostConnected := false;
   NetUpdatePending := false;
-  updateSent := false;
+  //updateSent := false;
+  lastUpdateTime := 0;
+  //lastConnectTime := 0;
   //if (spamConsole) then g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_DISC]);
 end;
 
@@ -612,12 +852,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,7 +868,7 @@ begin
     exit;
   end;
 
-  NetHostConReqTime := GetTimerMS();
+  NetHostConReqTime := lastConnectTime;
   e_LogWritefln('connecting to master at [%s:%u]', [hostName, hostPort], TMsgType.Notify);
 end;
 
@@ -674,19 +916,31 @@ 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);
 
-    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
+          NetUpdatePending := false;
+          updateSent := true;
+        end;
+      end;
+    finally
+      netmsg.Clear();
     end;
-  finally
-    netmsg.Clear();
+  end
+  else
+  begin
+    NetUpdatePending := false;
   end;
 end;
 
@@ -701,6 +955,8 @@ var
   pkt: pENetPacket;
 begin
   NetUpdatePending := false;
+  lastUpdateTime := 0;
+  updateSent := false;
   if not isAlive() then exit;
   if not isConnected() then exit;
 
@@ -753,6 +1009,7 @@ var
   f: Integer;
   sres: Integer;
   idx: Integer;
+  ct: Int64;
 begin
   if (not g_Net_IsNetworkAvailable()) then exit;
 
@@ -778,7 +1035,30 @@ 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 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
+          mlist[f].connect();
+        end;
+      end;
+    end
+    else
+    begin
+      if 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 mlist[f].remove();
+        mlist[f].disconnect(false);
+      end;
+    end;
+    mlist[f].pulse();
+  end;
 
   while true do
   begin
@@ -885,34 +1165,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);

diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas
index 6133b001e2d5fd2df4777195d2bfe433b232db3c..aec47c7ff524d3c16de2bc4da6f2e9ea350f2172 100644 (file)
--- a/src/game/g_netmsg.pas
+++ b/src/game/g_netmsg.pas
@@ -491,6 +491,7 @@ begin
   if not C.WaitForFirstSpawn then exit;
   plr := g_Player_Get(C^.Player);
   if not assigned(plr) then exit;
+  g_Net_Slist_ServerPlayerComes();
   e_LogWritefln('*** client #%u (cid #%u) first spawn', [C.ID, C.Player]);
   C.WaitForFirstSpawn := false;
   plr.FNoRespawn := false;

diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index 6491048c5f94e6406461aea3bdc99c8403fa4671..8e6bbe80de9c9ed2f53fd5b3191ee183fa5757ae 100644 (file)
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
@@ -44,7 +44,7 @@ uses
   g_console, e_input, g_options, g_game,
   g_basic, g_textures, e_sound, g_sound, g_menu, ENet, g_net,
   g_map, g_gfx, g_monsters, xprofiler,
-  g_touch, g_gui, g_system;
+  g_touch, g_gui, g_system, g_netmaster;
 
 
 const
@@ -349,6 +349,8 @@ begin
   // main loop
   while not ProcessMessage() do begin end;
 
+  g_Net_Slist_ShutdownAll();
+
   Release();
 
   g_Net_DeinitLowLevel();