purgatory/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-11-24 22:26:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix SplitHTTP H3 crash on v2rayNG (#3559)

Browse Source 
Fixes https://github.com/XTLS/Xray-core/issues/3556
This commit is contained in:
ll11l1lIllIl1lll 2024-07-19 17:52:34 +00:00 committed by GitHub
parent b277bacdf6
commit d8994b7603
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
transport/internet/splithttp/dialer.go
View File

@ -101,11 +101,32 @@ func getHTTPClient(ctx context.Context, dest net.Destination, streamSettings *in
if err != nil {
return nil, err
}
udpAddr, err := net.ResolveUDPAddr("udp", conn.RemoteAddr().String())
if err != nil {
return nil, err
var udpConn *net.UDPConn
var udpAddr *net.UDPAddr
switch c := conn.(type) {
case *internet.PacketConnWrapper:
var ok bool
udpConn, ok = c.Conn.(*net.UDPConn)
if !ok {
return nil, errors.New("PacketConnWrapper does not contain a UDP connection")
}
udpAddr, err = net.ResolveUDPAddr("udp", c.Dest.String())
if err != nil {
return nil, err
}
case *net.UDPConn:
udpConn = c
udpAddr, err = net.ResolveUDPAddr("udp", c.RemoteAddr().String())
if err != nil {
return nil, err
}
default:
return nil, errors.New("unsupported connection type: %T", conn)
}
return quic.DialEarly(ctx, conn.(*internet.PacketConnWrapper).Conn.(*net.UDPConn), udpAddr, tlsCfg, cfg)
return quic.DialEarly(ctx, udpConn, udpAddr, tlsCfg, cfg)
},
}
downloadTransport = roundTripper