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

XTLS Vision supports acceptProxyProtocol (test needed)

Browse Source 
Fixes https://github.com/XTLS/Xray-core/issues/1339
This commit is contained in:
RPRX 2023-01-07 11:01:53 +00:00 committed by GitHub
parent 9bc1564b0a
commit 8c0d3c0257
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
proxy/vless/inbound/inbound.go
View File

@ -13,6 +13,7 @@ import (
"time" "time"
"unsafe" "unsafe"
"github.com/pires/go-proxyproto"
"github.com/xtls/xray-core/common" "github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/buf" "github.com/xtls/xray-core/common/buf"
"github.com/xtls/xray-core/common/errors" "github.com/xtls/xray-core/common/errors"
@ -471,6 +472,10 @@ func (h *Handler) Process(ctx context.Context, network net.Network, connection s
var p uintptr var p uintptr
if tlsConn, ok := iConn.(*tls.Conn); ok { if tlsConn, ok := iConn.(*tls.Conn); ok {
netConn = tlsConn.NetConn() netConn = tlsConn.NetConn()
if pc, ok := netConn.(*proxyproto.Conn); ok {
netConn = pc.Raw()
// 8192 > 4096, there is no need to process pc's bufReader
}
if sc, ok := netConn.(syscall.Conn); ok { if sc, ok := netConn.(syscall.Conn); ok {
rawConn, _ = sc.SyscallConn() rawConn, _ = sc.SyscallConn()
} }