InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50669 from akerouanton/dont-reuseaddr-for-UDP

Browse Source 
libnet/pa: don't set SO_REUSEADDR on UDP sockets
This commit is contained in:
Albin Kerouanton
2025-08-08 15:31:09 +02:00
committed by GitHub
parent 846cf4b56b c6be4ad999
commit 5cb7e19528
2 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
daemon/libnetwork/portallocator/osallocator_linux.go
View File

@@ -122,8 +122,10 @@ func bindTCPOrUDP(addr netip.AddrPort, typ int, proto types.Protocol) (_ *os.Fil
}
}()
if err := syscall.SetsockoptInt(sd, syscall.SOL_SOCKET, syscall.SO_REUSEADDR, 1); err != nil {
return nil, fmt.Errorf("failed to setsockopt(SO_REUSEADDR) for %s/%s: %w", addr, proto, err)
if proto == syscall.IPPROTO_TCP {
if err := syscall.SetsockoptInt(sd, syscall.SOL_SOCKET, syscall.SO_REUSEADDR, 1); err != nil {
return nil, fmt.Errorf("failed to setsockopt(SO_REUSEADDR) for %s/%s: %w", addr, proto, err)
}
}
if domain == syscall.AF_INET6 {

21
daemon/libnetwork/portallocator/osallocator_linux_test.go
View File

@@ -3,7 +3,9 @@ package portallocator
import (
"io"
"net"
"net/netip"
"os"
"syscall"
"testing"
"github.com/ishidawataru/sctp"
@@ -207,3 +209,22 @@ func TestRepeatAllocation(t *testing.T) {
})
}
}
func TestOnlyOneSocketBindsUDPPort(t *testing.T) {
const port = 5000
addr := netip.MustParseAddr("127.0.0.1")
// Simulate another process binding to the same UDP port.
f, err := bindTCPOrUDP(netip.AddrPortFrom(addr, port), syscall.SOCK_DGRAM, syscall.IPPROTO_UDP)
assert.NilError(t, err)
defer f.Close()
// Then try to allocate that port using the OSAllocator.
alloc := OSAllocator{allocator: newInstance()}
_, socks, err := alloc.RequestPortsInRange([]net.IP{addr.AsSlice()}, syscall.IPPROTO_UDP, port, port)
// In case RequestPortsInRange succeeded, close the sockets to not affect subsequent tests
defer closeSocks(t, socks)
assert.ErrorContains(t, err, "failed to bind host port")
assert.Equal(t, len(socks), 0)
}