eburet-oss/sing-tun-lx
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ping: Do not use connected socket on macOS

Browse source
This commit is contained in:
世界 2025-08-26 23:16:58 +08:00
parent a24ab73aca
commit e8d7fc1bb2
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
2 changed files with 29 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

32
ping/socket_unix.go
View file

@ -9,6 +9,7 @@ import (
"runtime"
"syscall"
"github.com/sagernet/sing/common/bufio"
"github.com/sagernet/sing/common/control"
E "github.com/sagernet/sing/common/exceptions"
M "github.com/sagernet/sing/common/metadata"
@ -76,23 +77,34 @@ func connect(privileged bool, controlFunc control.Func, destination netip.Addr)
var bindAddress netip.Addr
if !destination.Is6() {
bindAddress = netip.AddrFrom4([4]byte{0, 0, 0, 0})
bindAddress = netip.AddrFrom4([4]byte{})
} else {
bindAddress = netip.AddrFrom16([16]byte{})
}
err = unix.Bind(fd, M.AddrPortToSockaddr(netip.AddrPortFrom(bindAddress, 0)))
if err != nil {
return nil, err
}
err = unix.Connect(fd, M.AddrPortToSockaddr(netip.AddrPortFrom(destination, 0)))
if err != nil {
return nil, E.Cause(err, "connect()")
if runtime.GOOS == "darwin" && !privileged {
// When running in NetworkExtension on macOS, write to connected socket results in EPIPE.
var packetConn net.PacketConn
packetConn, err = net.FilePacketConn(file)
if err != nil {
return nil, err
}
return bufio.NewBindPacketConn(packetConn, M.SocksaddrFrom(destination, 0).UDPAddr()), nil
} else {
err = unix.Connect(fd, M.AddrPortToSockaddr(netip.AddrPortFrom(destination, 0)))
if err != nil {
return nil, err
}
var conn net.Conn
conn, err = net.FileConn(file)
if err != nil {
return nil, err
}
return conn, nil
}
conn, err := net.FileConn(file)
if err != nil {
return nil, err
}
return conn, nil
}