Merge pull request #22 from HeatXD/fix-disconnection-bug

fix disconnection bug stated in #2
HeatXD · Oct 28, 2024 · 34c1c46 · 34c1c46
2 parents fd133e6 + fe87a7c
commit 34c1c46
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/Examples/OnlineSession/OnlineSession.cpp b/Examples/OnlineSession/OnlineSession.cpp
@@ -255,10 +255,16 @@ int main(int argc, char* args[])
             auto event = events[i];
 
             printf("EV: %d\n", event->type);
+
             if (event->type == DesyncDetected) {
                 auto desync = event->data.desynced;
                 printf("desync detected, f:%d, rh:%d, lc:%u, rc:%u\n", desync.frame, desync.remote_handle, desync.local_checksum, desync.remote_checksum);
             }
+
+            if (event->type == PlayerDisconnected) {
+                auto disco = event->data.disconnected;
+                printf("disconnect detected, player: %d\n", disco.handle);
+            }
         }
 
         count = 0;

diff --git a/GekkoLib/include/net.h b/GekkoLib/include/net.h
@@ -127,6 +127,7 @@ namespace Gekko {
         Frame last_acked_frame;
         u64 last_sent_sync_message;
         u64 last_received_message = -1;
+        u64 last_received_frame = 0;
     };
 
     struct NetInputData {

diff --git a/GekkoLib/src/backend.cpp b/GekkoLib/src/backend.cpp
@@ -311,10 +311,24 @@ void Gekko::MessageSystem::HandleTooFarBehindActors(bool spectator)
 
 	for (auto& player : spectator ? spectators : remotes) {
 		if (player->GetStatus() == Connected) {
-			const u32 diff = last_added - player->stats.last_acked_frame;
+            const u64 input_diff = now - player->stats.last_received_frame;
+
+            if (!spectator && input_diff > NetStats::DISCONNECT_TIMEOUT) {
+                // give them one chance to redeem themselves
+                if (player->stats.last_received_frame == 0) {
+                    player->stats.last_received_frame = now;
+                    return;
+                }
+                session_events.AddPlayerDisconnectedEvent(player->handle);
+                player->SetStatus(Disconnected);
+                player->sync_num = 0;
+                return;
+            }
+
+			const u32 ack_diff = last_added - player->stats.last_acked_frame;
             const u64 msg_diff = now - player->stats.last_received_message;
 
-			if (diff > max_diff || msg_diff > NetStats::DISCONNECT_TIMEOUT) {
+			if (ack_diff > max_diff || msg_diff > NetStats::DISCONNECT_TIMEOUT) {
                 session_events.AddPlayerDisconnectedEvent(player->handle);
                 player->SetStatus(Disconnected);
                 player->sync_num = 0;
@@ -538,6 +552,13 @@ void Gekko::MessageSystem::OnInputs(NetAddress& addr, NetPacket& pkt)
     net_input->input.start_frame = body->start_frame;
     net_input->input.total_size = (u16)net_input->input.inputs.size();
 
+    for (auto handle : net_input->handles) {
+        auto player = GetPlayerByHandle(handle);
+        if (player) {
+            player->stats.last_received_frame = TimeSinceEpoch();
+        }
+    }
+
     _received_inputs.push(std::move(net_input));
 }