From 0d58e280c29c8b5f6314b4b86aa3ea96e2b3684a Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Thu, 27 Mar 2025 10:20:06 +0100
Subject: [PATCH] wip

---
 ntex-net/src/helpers.rs            |  2 +-
 ntex-net/src/rt_polling/connect.rs | 10 ++++------
 ntex-server/src/net/accept.rs      |  5 ++++-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ntex-net/src/helpers.rs b/ntex-net/src/helpers.rs
index c8adeab1..588acf65 100644
--- a/ntex-net/src/helpers.rs
+++ b/ntex-net/src/helpers.rs
@@ -49,7 +49,7 @@ async fn connect_inner(
 
     let (sender, rx) = channel();
 
-    crate::rt_impl::connect::ConnectOps::current().connect("-", fd, addr, sender)?;
+    crate::rt_impl::connect::ConnectOps::current().connect(fd, addr, sender)?;
 
     rx.await
         .map_err(|_| io::Error::new(io::ErrorKind::Other, "IO Driver is gone"))
diff --git a/ntex-net/src/rt_polling/connect.rs b/ntex-net/src/rt_polling/connect.rs
index d88adcb5..00053cbc 100644
--- a/ntex-net/src/rt_polling/connect.rs
+++ b/ntex-net/src/rt_polling/connect.rs
@@ -22,7 +22,6 @@ struct ConnectOpsBatcher {
 
 struct Item {
     fd: RawFd,
-    tag: &'static str,
     sender: Sender<io::Result<()>>,
 }
 
@@ -50,7 +49,6 @@ impl ConnectOps {
 
     pub(crate) fn connect(
         &self,
-        tag: &'static str,
         fd: RawFd,
         addr: SockAddr,
         sender: Sender<io::Result<()>>,
@@ -61,12 +59,12 @@ impl ConnectOps {
             res?;
         }
 
-        let item = Item { tag, fd, sender };
+        let item = Item { fd, sender };
         let id = self.0.connects.borrow_mut().insert(item);
 
         self.0
             .api
-            .attach(tag, fd, id as u32, Some(Event::writable(0)));
+            .attach("-", fd, id as u32, Some(Event::writable(0)));
         Ok(id)
     }
 }
@@ -97,7 +95,7 @@ impl Handler for ConnectOpsBatcher {
                     Err(io::Error::from_raw_os_error(err))
                 };
 
-                self.inner.api.detach(item.tag, item.fd, id as u32);
+                self.inner.api.detach("-", item.fd, id as u32);
                 let _ = item.sender.send(res);
             }
         }
@@ -109,7 +107,7 @@ impl Handler for ConnectOpsBatcher {
         if connects.contains(id) {
             let item = connects.remove(id);
             let _ = item.sender.send(Err(err));
-            self.inner.api.detach(item.tag, item.fd, id as u32);
+            self.inner.api.detach("-", item.fd, id as u32);
         }
     }
 }
diff --git a/ntex-server/src/net/accept.rs b/ntex-server/src/net/accept.rs
index 86a4bbfd..fd900f12 100644
--- a/ntex-server/src/net/accept.rs
+++ b/ntex-server/src/net/accept.rs
@@ -380,7 +380,10 @@ impl Accept {
     fn accept(&mut self, token: usize) -> bool {
         loop {
             if let Some(info) = self.sockets.get_mut(token) {
-                match info.sock.accept() {
+                let item = info.sock.accept();
+                println!("------- ACCEPTING {:?}", item);
+                //match info.sock.accept() {
+                match item {
                     Ok(Some(io)) => {
                         let msg = Connection {
                             io,