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

discard bad connections

pull/168/head
v2ray 2016-06-01 22:09:34 +02:00
parent 4ec96efe84
commit 43f6998d31
3 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,7 +169,11 @@ func (this *VMessInboundHandler) HandleConnection(connection *hub.Connection) {
} else {
requestReader = v2io.NewAdaptiveReader(bodyReader)
}
v2io.Pipe(requestReader, input)
err := v2io.Pipe(requestReader, input)
if err != vmessio.ErrorStreamCompleted {
connection.SetReusable(false)
}
requestReader.Release()
input.Close()
readFinish.Unlock()
@ -197,7 +201,11 @@ func (this *VMessInboundHandler) HandleConnection(connection *hub.Connection) {
writer.SetCached(false)
v2io.Pipe(output, v2writer)
err = v2io.Pipe(output, v2writer)
if err != vmessio.ErrorStreamCompleted {
connection.SetReusable(false)
}
output.Release()
if request.Option.IsChunkStream() {
v2writer.Write(alloc.NewSmallBuffer().Clear())

7
proxy/vmess/io/reader.go
View File

@ -1,6 +1,7 @@
package io
import (
"errors"
"hash"
"hash/fnv"
"io"
@ -10,6 +11,10 @@ import (
"github.com/v2ray/v2ray-core/transport"
)
var (
ErrorStreamCompleted = errors.New("Stream completed.")
)
// @Private
type Validator struct {
actualAuth hash.Hash32
@ -76,7 +81,7 @@ func (this *AuthChunkReader) Read() (*alloc.Buffer, error) {
if this.chunkLength == 0 {
buffer.Release()
return nil, io.EOF
return nil, ErrorStreamCompleted
}
if buffer.Len() < this.chunkLength {

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

@ -1,7 +1,6 @@
package outbound
import (
"net"
"sync"
"github.com/v2ray/v2ray-core/app"
@ -70,7 +69,7 @@ func (this *VMessOutboundHandler) Dispatch(target v2net.Destination, payload *al
return nil
}
func (this *VMessOutboundHandler) handleRequest(session *raw.ClientSession, conn net.Conn, request *protocol.RequestHeader, payload *alloc.Buffer, input v2io.Reader, finish *sync.Mutex) {
func (this *VMessOutboundHandler) handleRequest(session *raw.ClientSession, conn *hub.Connection, request *protocol.RequestHeader, payload *alloc.Buffer, input v2io.Reader, finish *sync.Mutex) {
defer finish.Unlock()
writer := v2io.NewBufferedWriter(conn)
@ -85,7 +84,11 @@ func (this *VMessOutboundHandler) handleRequest(session *raw.ClientSession, conn
streamWriter.Write(payload)
writer.SetCached(false)
v2io.Pipe(input, streamWriter)
err := v2io.Pipe(input, streamWriter)
if err != vmessio.ErrorStreamCompleted {
conn.SetReusable(false)
}
if request.Option.IsChunkStream() {
streamWriter.Write(alloc.NewSmallBuffer().Clear())
}
@ -93,7 +96,7 @@ func (this *VMessOutboundHandler) handleRequest(session *raw.ClientSession, conn
return
}
func (this *VMessOutboundHandler) handleResponse(session *raw.ClientSession, conn net.Conn, request *protocol.RequestHeader, dest v2net.Destination, output v2io.Writer, finish *sync.Mutex) {
func (this *VMessOutboundHandler) handleResponse(session *raw.ClientSession, conn *hub.Connection, request *protocol.RequestHeader, dest v2net.Destination, output v2io.Writer, finish *sync.Mutex) {
defer finish.Unlock()
reader := v2io.NewBufferedReader(conn)
@ -116,7 +119,11 @@ func (this *VMessOutboundHandler) handleResponse(session *raw.ClientSession, con
bodyReader = v2io.NewAdaptiveReader(decryptReader)
}
v2io.Pipe(bodyReader, output)
err = v2io.Pipe(bodyReader, output)
if err != vmessio.ErrorStreamCompleted {
conn.SetReusable(false)
}
bodyReader.Release()
return