lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-04-23 05:59:11 -04:00
Code Issues Releases Wiki Activity

rename cached to buffered

Browse Source
This commit is contained in:
Darien Raymond
2016-12-27 21:41:44 +01:00
parent 7d1426ff7f
commit c347e50c28
9 changed files with 43 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proxy/shadowsocks/client.go
View File

@@ -126,7 +126,7 @@ func (v *Client) Dispatch(destination v2net.Destination, payload *buf.Buffer, ra
}
}()
bufferedWriter.SetCached(false)
bufferedWriter.SetBuffered(false)
if err := buf.PipeUntilEOF(ray.OutboundInput(), bodyWriter); err != nil {
log.Info("Shadowsocks|Client: Failed to trasnport all TCP request: ", err)
}

4
proxy/shadowsocks/server.go
View File

@@ -161,7 +161,7 @@ func (v *Server) handleConnection(conn internet.Connection) {
}
defer bodyReader.Release()
bufferedReader.SetCached(false)
bufferedReader.SetBuffered(false)
userSettings := v.user.GetSettings()
timedReader.SetTimeOut(userSettings.PayloadReadTimeout)
@@ -195,7 +195,7 @@ func (v *Server) handleConnection(conn internet.Connection) {
if payload, err := ray.InboundOutput().Read(); err == nil {
responseWriter.Write(payload)
bufferedWriter.SetCached(false)
bufferedWriter.SetBuffered(false)
if err := buf.PipeUntilEOF(ray.InboundOutput(), responseWriter); err != nil {
log.Info("Shadowsocks|Server: Failed to transport all TCP response: ", err)

8
proxy/socks/server.go
View File

@@ -216,8 +216,8 @@ func (v *Server) handleSocks5(clientAddr v2net.Destination, reader *bufio.Buffer
return err
}
reader.SetCached(false)
writer.SetCached(false)
reader.SetBuffered(false)
writer.SetBuffered(false)
dest := request.Destination()
session := &proxy.SessionInfo{
@@ -279,8 +279,8 @@ func (v *Server) handleSocks4(clientAddr v2net.Destination, reader *bufio.Buffer
return ErrUnsupportedSocksCommand
}
reader.SetCached(false)
writer.SetCached(false)
reader.SetBuffered(false)
writer.SetBuffered(false)
dest := v2net.TCPDestination(v2net.IPAddress(auth.IP[:]), auth.Port)
session := &proxy.SessionInfo{

4
proxy/vmess/inbound/inbound.go
View File

@@ -181,7 +181,7 @@ func (v *VMessInboundHandler) HandleConnection(connection internet.Connection) {
userSettings := request.User.GetSettings()
connReader.SetTimeOut(userSettings.PayloadReadTimeout)
reader.SetCached(false)
reader.SetBuffered(false)
go func() {
bodyReader := session.DecodeRequestBody(request, reader)
@@ -216,7 +216,7 @@ func (v *VMessInboundHandler) HandleConnection(connection internet.Connection) {
connection.SetReusable(false)
}
writer.SetCached(false)
writer.SetBuffered(false)
if err := buf.PipeUntilEOF(output, bodyWriter); err != nil {
log.Debug("VMess|Inbound: Error when sending data to downstream: ", err)

4
proxy/vmess/outbound/outbound.go
View File

@@ -110,7 +110,7 @@ func (v *VMessOutboundHandler) handleRequest(session *encoding.ClientSession, co
}
payload.Release()
}
writer.SetCached(false)
writer.SetBuffered(false)
if err := buf.PipeUntilEOF(input, bodyWriter); err != nil {
conn.SetReusable(false)
@@ -141,7 +141,7 @@ func (v *VMessOutboundHandler) handleResponse(session *encoding.ClientSession, c
conn.SetReusable(header.Option.Has(protocol.ResponseOptionConnectionReuse))
reader.SetCached(false)
reader.SetBuffered(false)
bodyReader := session.DecodeResponseBody(request, reader)
defer bodyReader.Release()