personal_interest_mirrors/nebula
1
0
Fork 0
mirror of https://github.com/slackhq/nebula.git synced 2026-05-16 12:57:38 +02:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
JackDoan
2026-04-14 11:27:57 -05:00
parent 28d2b47164
commit f03f753baa
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
udp/udp_linux.go
View File

@@ -44,8 +44,12 @@ func NewListener(l *logrus.Logger, ip netip.Addr, port int, multi bool, batch in
if multi { if multi {
lc.Control = setReusePort lc.Control = setReusePort
} }
network := "udp"
if ip.Is4() { //todo I am not a fan of this, would prefer a default where we always bind dual-stack unless given a non-wildcard v4 addr
network = "udp4"
}
//this context is only used during the bind operation, you can't cancel it to kill the socket //this context is only used during the bind operation, you can't cancel it to kill the socket
pc, err := lc.ListenPacket(context.Background(), "udp", listen.String()) pc, err := lc.ListenPacket(context.Background(), network, listen.String())
if err != nil { if err != nil {
return nil, fmt.Errorf("unable to open socket: %s", err) return nil, fmt.Errorf("unable to open socket: %s", err)
} }
@@ -55,6 +59,7 @@ func NewListener(l *logrus.Logger, ip netip.Addr, port int, multi bool, batch in
_ = udpConn.Close() _ = udpConn.Close()
return nil, err return nil, err
} }
udpConn.LocalAddr().String()
return &StdConn{ return &StdConn{
udpConn: udpConn, udpConn: udpConn,
@@ -190,7 +195,7 @@ func (u *StdConn) listenOutBatch(r EncReader) {
return return
} }
if operr != nil { if operr != nil {
u.l.WithError(err).Debug("operr: udp socket is closed, exiting read loop") u.l.WithError(operr).Debug("operr: udp socket is closed, exiting read loop")
return return
} }
@@ -278,7 +283,10 @@ func (u *StdConn) getMemInfo(meminfo *[unix.SK_MEMINFO_VARS]uint32) error {
} }
var opErr error var opErr error
err := u.rawConn.Control(func(fd uintptr) { err := u.rawConn.Control(func(fd uintptr) {
_, _, opErr = unix.Syscall6(unix.SYS_GETSOCKOPT, fd, uintptr(unix.SOL_SOCKET), uintptr(unix.SO_MEMINFO), uintptr(unsafe.Pointer(meminfo)), uintptr(unsafe.Pointer(&vallen)), 0) _, _, syserr := unix.Syscall6(unix.SYS_GETSOCKOPT, fd, uintptr(unix.SOL_SOCKET), uintptr(unix.SO_MEMINFO), uintptr(unsafe.Pointer(meminfo)), uintptr(unsafe.Pointer(&vallen)), 0)
if syserr != 0 {
opErr = syserr
}
}) })
if err != nil { if err != nil {
return err return err