hook connect

Author: loongs-zhang

core/src/syscall/windows/connect.rs

@@ -50,6 +50,7 @@ impl<I: ConnectSyscall> ConnectSyscall for NioConnectSyscall<I> {
             set_non_blocking(fd);
         }
         let mut r = self.inner.connect(fn_ptr, fd, address, len);
+        eprintln!("connect {r} error:{}", Error::last_os_error());
         loop {
             if r == 0 {
                 reset_errno();
@@ -75,6 +76,7 @@ impl<I: ConnectSyscall> ConnectSyscall for NioConnectSyscall<I> {
                         &mut len,
                     );
                 }
+                eprintln!("connect getsockopt {r} error:{}", Error::last_os_error());
                 if r != 0 {
                     r = -1;
                     break;
@@ -89,6 +91,7 @@ impl<I: ConnectSyscall> ConnectSyscall for NioConnectSyscall<I> {
                     let mut address_len = std::mem::zeroed();
                     r = getpeername(fd, &mut address, &mut address_len);
                 }
+                eprintln!("getpeername {r} error:{}", Error::last_os_error());
             } else if errno != Some(WSAEINTR) {
                 break;
             }

hook/src/syscall/windows.rs

@@ -69,6 +69,11 @@ unsafe fn attach() -> std::io::Result<()> {
         address: *mut SOCKADDR,
         address_len: *mut c_int
     ) -> SOCKET);
+    impl_hook!("ws2_32.dll", CONNECT, connect(
+        fd: SOCKET,
+        address: *const SOCKADDR,
+        len: c_int
+    ) -> c_int);
     impl_hook!("ws2_32.dll", IOCTLSOCKET, ioctlsocket(
         fd: SOCKET,
         cmd: c_int,
@@ -154,18 +159,13 @@ unsafe fn attach() -> std::io::Result<()> {
         lpnewfilepointer : *mut c_longlong,
         dwmovemethod : SET_FILE_POINTER_MOVE_METHOD
     ) -> BOOL);
-    // NOTE: unhook WaitOnAddress/connect due to stack overflow or bug
+    // NOTE: unhook WaitOnAddress due to stack overflow or bug
     // impl_hook!("api-ms-win-core-synch-l1-2-0.dll", WAITONADDRESS, WaitOnAddress(
     //     address: *const c_void,
     //     compareaddress: *const c_void,
     //     addresssize: usize,
     //     dwmilliseconds: c_uint
     // ) -> BOOL);
-    impl_hook!("ws2_32.dll", CONNECT, connect(
-        fd: SOCKET,
-        address: *const SOCKADDR,
-        len: c_int
-    ) -> c_int);
     // Enable the hook
     minhook::MinHook::enable_all_hooks()
         .map_err(|_| Error::new(ErrorKind::Other, "init all hooks failed !"))