mirrors/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2025-05-01 01:44:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix close pipe

Browse source
This commit is contained in:
世界 2022-05-30 19:45:20 +08:00
parent f0b58d9ee0
commit 91ce752405
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
4 changed files with 17 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

8
proxy/shadowsocks_2022/outbound.go
View file

@ -67,9 +67,6 @@ func (o *Outbound) Process(ctx context.Context, link *transport.Link, dialer int
if outbound == nil || !outbound.Target.IsValid() {
return newError("target not specified")
}
/*if statConn, ok := inboundConn.(*internet.StatCounterConn); ok {
inboundConn = statConn.Connection
}*/
destination := outbound.Target
network := destination.Network
@ -92,6 +89,7 @@ func (o *Outbound) Process(ctx context.Context, link *transport.Link, dialer int
}
_payload := B.StackNew()
payload := C.Dup(_payload)
defer payload.Release()
for {
payload.FullReset()
nb, n := buf.SplitBytes(mb, payload.FreeBytes())
@ -127,7 +125,7 @@ func (o *Outbound) Process(ctx context.Context, link *transport.Link, dialer int
conn.R = &buf.BufferedReader{Reader: link.Reader}
}
return bufio.CopyConn(ctx, conn, serverConn)
return returnError(bufio.CopyConn(ctx, conn, serverConn))
} else {
var packetConn N.PacketConn
if pc, isPacketConn := inboundConn.(N.PacketConn); isPacketConn {
@ -144,6 +142,6 @@ func (o *Outbound) Process(ctx context.Context, link *transport.Link, dialer int
}
serverConn := o.method.DialPacketConn(connection)
return bufio.CopyPacketConn(ctx, packetConn, serverConn)
return returnError(bufio.CopyPacketConn(ctx, packetConn, serverConn))
}
}