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

fix #277

pull/362/head
Darien Raymond 2017-01-08 23:15:29 +01:00
parent c5d66a436c
commit 2e46e95536
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
proxy/socks/server.go
View File

@ -101,7 +101,7 @@ func (v *Server) handleConnection(connection internet.Connection) {
connection.SetReusable(false) connection.SetReusable(false)
timedReader := v2net.NewTimeOutReader(v.config.Timeout, connection) timedReader := v2net.NewTimeOutReader(16 /* seconds, for handshake */, connection)
reader := bufio.NewReader(timedReader) reader := bufio.NewReader(timedReader)
session := &ServerSession{ session := &ServerSession{
@ -128,6 +128,7 @@ func (v *Server) handleConnection(connection internet.Connection) {
log.Info("Socks|Server: TCP Connect request to ", dest) log.Info("Socks|Server: TCP Connect request to ", dest)
log.Access(clientAddr, dest, log.AccessAccepted, "") log.Access(clientAddr, dest, log.AccessAccepted, "")
timedReader.SetTimeOut(v.config.Timeout)
v.transport(reader, connection, session) v.transport(reader, connection, session)
return return
} }