fix, socket bind should be only used in passive mode, and don't close…

… fd for EINPROGRESS error when connecting
panjf2000 · May 22, 2022 · 483cff9 · 483cff9
1 parent 73d9480
commit 483cff9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/internal/socket/tcp_socket.go b/internal/socket/tcp_socket.go
@@ -123,6 +123,10 @@ func tcpSocket(proto, addr string, passive bool, sockOpts ...Option) (fd int, ne
 		return
 	}
 	defer func() {
+		// ignore EINPROGRESS for non-blocking socket connect, should be processed by caller
+		if t, ok := err.(*os.SyscallError); ok && t.Err == unix.EINPROGRESS {
+			return
+		}
 		if err != nil {
 			_ = unix.Close(fd)
 		}
@@ -140,11 +144,10 @@ func tcpSocket(proto, addr string, passive bool, sockOpts ...Option) (fd int, ne
 		}
 	}
 
-	if err = os.NewSyscallError("bind", unix.Bind(fd, sa)); err != nil {
-		return
-	}
-
 	if passive {
+		if err = os.NewSyscallError("bind", unix.Bind(fd, sa)); err != nil {
+			return
+		}
 		// Set backlog size to the maximum.
 		err = os.NewSyscallError("listen", unix.Listen(fd, listenerBacklogMaxSize))
 	} else {

diff --git a/internal/socket/udp_socket.go b/internal/socket/udp_socket.go
@@ -121,6 +121,10 @@ func udpSocket(proto, addr string, connect bool, sockOpts ...Option) (fd int, ne
 		return
 	}
 	defer func() {
+		// ignore EINPROGRESS for non-blocking socket connect, should be processed by caller
+		if t, ok := err.(*os.SyscallError); ok && t.Err == unix.EINPROGRESS {
+			return
+		}
 		if err != nil {
 			_ = unix.Close(fd)
 		}
@@ -143,10 +147,10 @@ func udpSocket(proto, addr string, connect bool, sockOpts ...Option) (fd int, ne
 		}
 	}
 
-	err = os.NewSyscallError("bind", unix.Bind(fd, sa))
-
 	if connect {
 		err = os.NewSyscallError("connect", unix.Connect(fd, sa))
+	} else {
+		err = os.NewSyscallError("bind", unix.Bind(fd, sa))
 	}
 
 	return

diff --git a/internal/socket/unix_socket.go b/internal/socket/unix_socket.go
@@ -60,6 +60,11 @@ func udsSocket(proto, addr string, passive bool, sockOpts ...Option) (fd int, ne
 		return
 	}
 	defer func() {
+		// ignore EINPROGRESS for non-blocking socket connect, should be processed by caller
+		// though there is less situation for EINPROGRESS when using unix socket
+		if t, ok := err.(*os.SyscallError); ok && t.Err == unix.EINPROGRESS {
+			return
+		}
 		if err != nil {
 			_ = unix.Close(fd)
 		}