zishuo/libp2p
1
0
Fork 0
mirror of https://github.com/libp2p/go-reuseport.git synced 2025-09-26 19:01:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix error handling when setting socket options (#102)

Browse Source 
Both sockopt and control errors can't exist at the same time, but control errors should occur first, and so are given precedence.

Fixes #101
This commit is contained in:
Matt Joiner
2023-04-25 22:20:04 +10:00
committed by GitHub
parent 194b8a8db9
commit 28dc0654fa
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
control_unix.go
View File

@@ -8,18 +8,16 @@ import (
"golang.org/x/sys/unix"
)
func Control(network, address string, c syscall.RawConn) error {
var err error
c.Control(func(fd uintptr) {
func Control(network, address string, c syscall.RawConn) (err error) {
controlErr := c.Control(func(fd uintptr) {
err = unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_REUSEADDR, 1)
if err != nil {
return
}
err = unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_REUSEPORT, 1)
if err != nil {
return
}
})
return err
if controlErr != nil {
err = controlErr
}
return
}

6
control_windows.go
View File

@@ -7,7 +7,11 @@ import (
)
func Control(network, address string, c syscall.RawConn) (err error) {
return c.Control(func(fd uintptr) {
controlErr := c.Control(func(fd uintptr) {
err = windows.SetsockoptInt(windows.Handle(fd), windows.SOL_SOCKET, windows.SO_REUSEADDR, 1)
})
if controlErr != nil {
err = controlErr
}
return
}