hesoyam/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2026-07-04 18:58:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid panic

Browse Source 
https://github.com/XTLS/Xray-core/pull/5270#issuecomment-3483155727
This commit is contained in:
RPRX
2025-11-04 02:06:58 +00:00
committed by GitHub
parent 2dc9729864
commit e8aecbc9af
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/proxyman/outbound/handler.go
+6 -2
View File
@@ -317,8 +317,12 @@ func (h *Handler) Dial(ctx context.Context, dest net.Destination) (stat.Connecti
conn, err := internet.Dial(ctx, dest, h.streamSettings) conn, err := internet.Dial(ctx, dest, h.streamSettings)
conn = h.getStatCouterConnection(conn) conn = h.getStatCouterConnection(conn)
outbounds := session.OutboundsFromContext(ctx) outbounds := session.OutboundsFromContext(ctx)
ob := outbounds[len(outbounds)-1] if outbounds != nil {
ob.Conn = conn ob := outbounds[len(outbounds)-1]
ob.Conn = conn
} else {
// for Vision's pre-connect
}
return conn, err return conn, err
} }
proxy/vless/outbound/outbound.go
+2
View File
@@ -176,6 +176,8 @@ func (h *Handler) Process(ctx context.Context, link *transport.Link, dialer inte
} }
defer conn.Close() defer conn.Close()
ob.Conn = conn // for Vision's pre-connect
iConn := conn iConn := conn
if statConn, ok := iConn.(*stat.CounterConnection); ok { if statConn, ok := iConn.(*stat.CounterConnection); ok {
iConn = statConn.Connection iConn = statConn.Connection