From 30c60d84df195e3e7e724961d71abe57e53f30ce Mon Sep 17 00:00:00 2001
From: Francesco Cozzuto <francesco.cozzuto@gmail.com>
Date: Fri, 23 Jan 2026 19:17:20 +0100
Subject: [PATCH] Bug fix

---
 src/client.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/client.c b/src/client.c
index 262db6a..183bda6 100644
--- a/src/client.c
+++ b/src/client.c
@@ -2233,9 +2233,20 @@ int toasty_process_events(ToastyFS *toasty, void **contexts, struct pollfd *poll
 
                 RequestQueue *reqs = NULL;
 
-                int tag = tcp_get_tag(&toasty->tcp, conn_idx);
+                int tag = events[i].tag;
                 CLIENT_TRACE("TCP EVENT: DISCONNECT (tag=%d)", tag);
 
+#ifdef MAIN_SIMULATION
+                if (toasty->metadata_server.used) {
+                    int conn_idx = tcp_index_from_tag(&toasty->tcp, TAG_METADATA_SERVER);
+                    if (tag == TAG_METADATA_SERVER) {
+                        assert(conn_idx == -1);
+                    } else {
+                        assert(conn_idx > -1);
+                    }
+                }
+#endif
+
                 if (tag == TAG_METADATA_SERVER) {
                     reqs = &toasty->metadata_server.reqs;
                     toasty->metadata_server.used = false;