github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

remove BufferedReader.Direct

pull/1269/head
Darien Raymond 2018-08-17 20:45:23 +02:00
parent 1b39199adf
commit 2e11653694
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
5 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/buf/reader.go
View File

@ -90,8 +90,6 @@ type BufferedReader struct {
Reader Reader Reader Reader
// Buffer is the internal buffer to be read from first // Buffer is the internal buffer to be read from first
Buffer MultiBuffer Buffer MultiBuffer
// Direct indicates whether or not to use the internal buffer
Direct bool
} }
// BufferedBytes returns the number of bytes that is cached in this reader. // BufferedBytes returns the number of bytes that is cached in this reader.
@ -118,12 +116,6 @@ func (r *BufferedReader) Read(b []byte) (int, error) {
return nBytes, nil return nBytes, nil
} }
if r.Direct {
if reader, ok := r.Reader.(io.Reader); ok {
return reader.Read(b)
}
}
mb, err := r.Reader.ReadMultiBuffer() mb, err := r.Reader.ReadMultiBuffer()
if err != nil { if err != nil {
return 0, err return 0, err

1
common/crypto/auth.go
View File

@ -104,7 +104,6 @@ func NewAuthenticationReader(auth Authenticator, sizeParser ChunkSizeDecoder, re
sizeBytes: make([]byte, sizeParser.SizeBytes()), sizeBytes: make([]byte, sizeParser.SizeBytes()),
} }
if breader, ok := reader.(*buf.BufferedReader); ok { if breader, ok := reader.(*buf.BufferedReader); ok {
breader.Direct = false
r.reader = breader r.reader = breader
} else { } else {
r.reader = &buf.BufferedReader{Reader: buf.NewReader(reader)} r.reader = &buf.BufferedReader{Reader: buf.NewReader(reader)}

2
proxy/shadowsocks/protocol.go
View File

@ -103,8 +103,6 @@ func ReadTCPSession(user *protocol.User, reader io.Reader) (*protocol.RequestHea
return nil, nil, newError("invalid remote address.") return nil, nil, newError("invalid remote address.")
} }
br.Direct = true
var chunkReader buf.Reader var chunkReader buf.Reader
if request.Option.Has(RequestOptionOneTimeAuth) { if request.Option.Has(RequestOptionOneTimeAuth) {
chunkReader = NewChunkReader(br, NewAuthenticator(ChunkKeyGenerator(iv))) chunkReader = NewChunkReader(br, NewAuthenticator(ChunkKeyGenerator(iv)))

2
proxy/shadowsocks/server.go
View File

@ -171,8 +171,6 @@ func (s *Server) handleConnection(ctx context.Context, conn internet.Connection,
} }
conn.SetReadDeadline(time.Time{}) conn.SetReadDeadline(time.Time{})
bufferedReader.Direct = true
dest := request.Destination() dest := request.Destination()
log.Record(&log.AccessMessage{ log.Record(&log.AccessMessage{
From: conn.RemoteAddr(), From: conn.RemoteAddr(),

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

@ -160,7 +160,6 @@ func (v *Handler) Process(ctx context.Context, link *core.Link, dialer proxy.Dia
} }
v.handleCommand(rec.Destination(), header.Command) v.handleCommand(rec.Destination(), header.Command)
reader.Direct = true
bodyReader := session.DecodeResponseBody(request, reader) bodyReader := session.DecodeResponseBody(request, reader)
return buf.Copy(bodyReader, output, buf.UpdateActivity(timer)) return buf.Copy(bodyReader, output, buf.UpdateActivity(timer))