Skip to content

Commit 6d8fe73

Browse files
maskedekenyuhan6665
authored andcommitted
XRV should work without rawConn
1 parent 828a632 commit 6d8fe73

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

proxy/vless/encoding/encoding.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,11 @@ func XtlsRead(reader buf.Reader, writer buf.Writer, timer signal.ActivityUpdater
247247
}
248248
}
249249
}
250-
reader = buf.NewReadVReader(conn, rawConn, nil)
250+
if rawConn != nil {
251+
reader = buf.NewReadVReader(conn, rawConn, nil)
252+
} else {
253+
reader = buf.NewReader(conn)
254+
}
251255
ct = counter
252256
newError("XtlsRead readV").WriteToLog(session.ExportIDToError(ctx))
253257
}

proxy/vless/inbound/inbound.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ func (h *Handler) Process(ctx context.Context, network net.Network, connection s
539539

540540
var err error
541541

542-
if rawConn != nil {
542+
if requestAddons.Flow == vless.XRV {
543543
var counter stats.Counter
544544
if statConn != nil {
545545
counter = statConn.ReadCounter
@@ -591,7 +591,7 @@ func (h *Handler) Process(ctx context.Context, network net.Network, connection s
591591
}
592592

593593
var err error
594-
if rawConn != nil && requestAddons.Flow == vless.XRV {
594+
if requestAddons.Flow == vless.XRV {
595595
var counter stats.Counter
596596
if statConn != nil {
597597
counter = statConn.WriteCounter

proxy/vless/outbound/outbound.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ func (h *Handler) Process(ctx context.Context, link *transport.Link, dialer inte
247247
}
248248

249249
var err error
250-
if rawConn != nil && requestAddons.Flow == vless.XRV {
250+
if requestAddons.Flow == vless.XRV {
251251
if tlsConn, ok := iConn.(*tls.Conn); ok {
252252
if tlsConn.ConnectionState().Version != gotls.VersionTLS13 {
253253
return newError(`failed to use `+requestAddons.Flow+`, found outer tls version `, tlsConn.ConnectionState().Version).AtWarning()
@@ -292,7 +292,7 @@ func (h *Handler) Process(ctx context.Context, link *transport.Link, dialer inte
292292
serverReader = xudp.NewPacketReader(conn)
293293
}
294294

295-
if rawConn != nil {
295+
if requestAddons.Flow == vless.XRV {
296296
var counter stats.Counter
297297
if statConn != nil {
298298
counter = statConn.ReadCounter

0 commit comments

Comments
 (0)