Pull request: 3444 reuse port
Merge in DNS/adguard-home from 3444-dhcp-again to master
Closes #3444.
Squashed commit of the following:
commit 5459ded7d58f219ab5417977e0df17c177c73a4a
Merge: d6559090 8e667d3c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Aug 16 15:35:30 2021 +0300
Merge branch 'master' into 3444-dhcp-again
commit d6559090a21b6b13be6970a3839db1106fb539b8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Aug 16 15:28:38 2021 +0300
aghnet: fix linux
commit 262f729224d73a70d61a4b29d5a4d34502b7b094
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Aug 16 14:30:09 2021 +0300
aghnet: rm debug
commit c54b107264f792ec7f17f8d790908408070307d3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Aug 16 14:21:07 2021 +0300
aghnet: imp bsd compat, fix openbsd static ip
commit f9871a4c51d1f5d2c799a8d1308a4d30a47485f6
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Sat Aug 14 00:17:46 2021 +0300
aghnet: setsockopt
This commit is contained in:
51
internal/aghnet/interfaces_unix.go
Normal file
51
internal/aghnet/interfaces_unix.go
Normal file
@@ -0,0 +1,51 @@
|
||||
//go:build aix || darwin || dragonfly || freebsd || netbsd || openbsd || solaris
|
||||
// +build aix darwin dragonfly freebsd netbsd openbsd solaris
|
||||
|
||||
package aghnet
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"net"
|
||||
"os"
|
||||
"syscall"
|
||||
|
||||
"github.com/AdguardTeam/golibs/errors"
|
||||
"golang.org/x/sys/unix"
|
||||
)
|
||||
|
||||
// reuseAddrCtrl is the function to be set to net.ListenConfig.Control. It
|
||||
// configures the socket to have a reusable port binding.
|
||||
func reuseAddrCtrl(_, _ string, c syscall.RawConn) (err error) {
|
||||
cerr := c.Control(func(fd uintptr) {
|
||||
// TODO(e.burkov): Consider using SO_REUSEPORT.
|
||||
err = unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_REUSEADDR, 1)
|
||||
if err != nil {
|
||||
err = os.NewSyscallError("setsockopt", err)
|
||||
}
|
||||
})
|
||||
|
||||
const (
|
||||
errMsg = "setting control options"
|
||||
errMsgFmt = errMsg + ": %w"
|
||||
)
|
||||
|
||||
if err != nil && cerr != nil {
|
||||
err = errors.List(errMsg, err, cerr)
|
||||
} else if err != nil {
|
||||
err = fmt.Errorf(errMsgFmt, err)
|
||||
} else if cerr != nil {
|
||||
err = fmt.Errorf(errMsgFmt, cerr)
|
||||
}
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
// listenPacketReusable announces on the local network address additionally
|
||||
// configuring the socket to have a reusable binding.
|
||||
func listenPacketReusable(_, network, address string) (c net.PacketConn, err error) {
|
||||
var lc net.ListenConfig
|
||||
lc.Control = reuseAddrCtrl
|
||||
|
||||
return lc.ListenPacket(context.Background(), network, address)
|
||||
}
|
||||
Reference in New Issue
Block a user