Fix rebind to not put the socket in blocking mode (#972)

slackhq · Sep 7, 2023 · f7e3929 · f7e3929
1 parent d271df8
commit f7e3929
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/udp/udp_darwin.go b/udp/udp_darwin.go
@@ -43,10 +43,15 @@ func NewListenConfig(multi bool) net.ListenConfig {
 }
 
 func (u *GenericConn) Rebind() error {
-	file, err := u.File()
+	rc, err := u.UDPConn.SyscallConn()
 	if err != nil {
 		return err
 	}
 
-	return syscall.SetsockoptInt(int(file.Fd()), unix.IPPROTO_IPV6, unix.IPV6_BOUND_IF, 0)
+	return rc.Control(func(fd uintptr) {
+		err := syscall.SetsockoptInt(int(fd), unix.IPPROTO_IPV6, unix.IPV6_BOUND_IF, 0)
+		if err != nil {
+			u.l.WithError(err).Error("Failed to rebind udp socket")
+		}
+	})
 }