black-internet-days-ahead/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-11-25 10:01:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix and simplify SockOpt in UDP

Browse source 
https://github.com/golang/go/issues/29277
This commit is contained in:
yuhan6665 2024-02-21 13:58:50 -05:00
parent a0f1e1f377
commit 3778a367c8
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
transport/internet/system_dialer.go
View file

@ -2,7 +2,6 @@ package internet
import ( import (
"context" "context"
"runtime"
"syscall" "syscall"
"time" "time"
@ -67,17 +66,16 @@ 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 runtime.GOOS != "windows" && (sockopt != nil || len(d.controllers) > 0) { if sockopt != nil {
file, err := packetConn.(*net.UDPConn).File() sys, err := packetConn.(*net.UDPConn).SyscallConn()
if err != nil { if err != nil {
return nil, err return nil, err
} }
fd := file.Fd() sys.Control(func(fd uintptr) {
if sockopt != nil {
if err := applyOutboundSocketOptions("udp", dest.NetAddr(), fd, sockopt); err != nil { if err := applyOutboundSocketOptions("udp", dest.NetAddr(), fd, sockopt); err != nil {
newError("failed to apply socket options").Base(err).WriteToLog(session.ExportIDToError(ctx)) newError("failed to apply socket options").Base(err).WriteToLog(session.ExportIDToError(ctx))
} }
} })
} }
return &PacketConnWrapper{ return &PacketConnWrapper{
Conn: packetConn, Conn: packetConn,