mirrors/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2025-04-03 04:06:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dialer: Do not use ListenSystemPacket() when dialing UDP

Browse Source 
https://github.com/XTLS/Xray-core/pull/4530#issuecomment-2765744961
This commit is contained in:
RPRX 2025-03-31 10:09:33 +00:00 committed by GitHub
parent 17207fc5e4
commit 8284a0ef8f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
transport/internet/system_dialer.go
View File

@ -59,7 +59,17 @@ func (d *DefaultSystemDialer) Dial(ctx context.Context, src net.Address, dest ne
Port: 0, Port: 0,
} }
} }
packetConn, err := ListenSystemPacket(ctx, srcAddr, sockopt) var lc net.ListenConfig
lc.Control = func(network, address string, c syscall.RawConn) error {
return c.Control(func(fd uintptr) {
if sockopt != nil {
if err := applyOutboundSocketOptions(network, "", fd, sockopt); err != nil {
errors.LogInfo(ctx, err, "failed to apply socket options")
}
}
})
}
packetConn, err := lc.ListenPacket(ctx, srcAddr.Network(), srcAddr.String())
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -67,23 +77,6 @@ func (d *DefaultSystemDialer) Dial(ctx context.Context, src net.Address, dest ne
if err != nil { if err != nil {
return nil, err return nil, err
} }
if sockopt != nil {
sys, err := packetConn.(*net.UDPConn).SyscallConn()
if err != nil {
return nil, err
}
sys.Control(func(fd uintptr) {
var network string
if destAddr.IP.To4() != nil {
network = "udp4"
} else {
network = "udp6"
}
if err := applyOutboundSocketOptions(network, dest.NetAddr(), fd, sockopt); err != nil {
errors.LogInfo(ctx, err, "failed to apply socket options")
}
})
}
return &PacketConnWrapper{ return &PacketConnWrapper{
Conn: packetConn, Conn: packetConn,
Dest: destAddr, Dest: destAddr,