hook connect

Author: loongs-zhang

core/src/syscall/unix/connect.rs

@@ -68,7 +68,7 @@ impl<I: ConnectSyscall> ConnectSyscall for NioConnectSyscall<I> {
                 break;
             }
             let errno = Error::last_os_error().raw_os_error();
-            if errno == Some(libc::EINPROGRESS) || errno == Some(libc::EALREADY) {
+            if errno == Some(libc::EINPROGRESS) || errno == Some(libc::EALREADY) || errno == Some(libc::EWOULDBLOCK) {
                 //阻塞，直到写事件发生
                 if EventLoops::wait_write_event(fd, Some(crate::common::constants::SLICE)).is_err()
                 {

core/src/syscall/windows/connect.rs

@@ -3,7 +3,7 @@ use crate::syscall::common::{is_blocking, reset_errno, set_blocking, set_errno,
 use once_cell::sync::Lazy;
 use std::ffi::c_int;
 use std::io::Error;
-use windows_sys::Win32::Networking::WinSock::{getpeername, getsockopt, SO_ERROR, SOCKADDR, SOCKET, SOL_SOCKET, WSAEALREADY, WSAEINPROGRESS, WSAEINTR, WSAETIMEDOUT};
+use windows_sys::Win32::Networking::WinSock::{getpeername, getsockopt, SO_ERROR, SOCKADDR, SOCKET, SOL_SOCKET, WSAEALREADY, WSAEINPROGRESS, WSAEINTR, WSAETIMEDOUT, WSAEWOULDBLOCK};
 
 #[must_use]
 pub extern "system" fn connect(
@@ -56,7 +56,7 @@ impl<I: ConnectSyscall> ConnectSyscall for NioConnectSyscall<I> {
                 break;
             }
             let errno = Error::last_os_error().raw_os_error();
-            if errno == Some(WSAEINPROGRESS) || errno == Some(WSAEALREADY) {
+            if errno == Some(WSAEINPROGRESS) || errno == Some(WSAEALREADY) || errno == Some(WSAEWOULDBLOCK) {
                 //阻塞，直到写事件发生
                 if EventLoops::wait_write_event(
                     fd as _,

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 !"))