lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-12-30 05:55:20 -05:00
Code Issues Releases Wiki Activity

merge bufio into buf

Browse Source
This commit is contained in:
Darien Raymond
2017-02-15 22:51:01 +01:00
parent 7199ffcaa2
commit 020b436827
16 changed files with 54 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
proxy/socks/server.go
View File

@@ -11,7 +11,6 @@ import (
"v2ray.com/core/app/log"
"v2ray.com/core/common"
"v2ray.com/core/common/buf"
"v2ray.com/core/common/bufio"
"v2ray.com/core/common/errors"
"v2ray.com/core/common/net"
"v2ray.com/core/common/protocol"
@@ -63,7 +62,7 @@ func (s *Server) Process(ctx context.Context, network net.Network, conn internet
func (s *Server) processTCP(ctx context.Context, conn internet.Connection, dispatcher dispatcher.Interface) error {
conn.SetReadDeadline(time.Now().Add(time.Second * 8))
reader := bufio.NewReader(conn)
reader := buf.NewBufferedReader(conn)
inboundDest, ok := proxy.InboundEntryPointFromContext(ctx)
if !ok {