mirrors/XTLS_REALITY
0
0
Fork 0
mirror of https://github.com/XTLS/REALITY.git synced 2025-08-23 06:58:39 +00:00
Code

Call underlying.CloseWrite() once io.Copy() returned (#7)

Browse Source 
Co-authored-by: Fangliding <Fangliding.fshxy@outlook.com>
This commit is contained in:
RPRX 2024-07-12 05:55:06 +00:00 committed by GitHub
parent ecc4401070
commit 48f0b2d5ed
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tls.go
View File

@ -40,6 +40,11 @@ import (
"golang.org/x/crypto/hkdf" "golang.org/x/crypto/hkdf"
) )
type CloseWriteConn interface {
net.Conn
CloseWrite() error
}
type MirrorConn struct { type MirrorConn struct {
*sync.Mutex *sync.Mutex
net.Conn net.Conn
@ -125,10 +130,11 @@ func Server(ctx context.Context, conn net.Conn, config *Config) (*Conn, error) {
} }
} }
underlying := conn raw := conn
if pc, ok := underlying.(*proxyproto.Conn); ok { if pc, ok := conn.(*proxyproto.Conn); ok {
underlying = pc.Raw() // for TCP splicing in io.Copy() raw = pc.Raw() // for TCP splicing in io.Copy()
} }
underlying := raw.(CloseWriteConn) // *net.TCPConn or *net.UnixConn
mutex := new(sync.Mutex) mutex := new(sync.Mutex)
@ -334,6 +340,10 @@ func Server(ctx context.Context, conn net.Conn, config *Config) (*Conn, error) {
} }
conn.Write(s2cSaved) conn.Write(s2cSaved)
io.Copy(underlying, target) io.Copy(underlying, target)
// Here is bidirectional direct forwarding:
// client ---underlying--- server ---target--- dest
// Call `underlying.CloseWrite()` once `io.Copy()` returned
underlying.CloseWrite()
} }
waitGroup.Done() waitGroup.Done()
}() }()