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

release connection after all data read in freedom

pull/2034/head
v2ray 2016-08-15 14:31:46 +02:00
parent 66bb7879e0
commit 956b47f6ae
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
proxy/freedom/freedom.go
View File

@ -2,7 +2,6 @@ package freedom
import ( import (
"io" "io"
"sync"
"github.com/v2ray/v2ray-core/app" "github.com/v2ray/v2ray-core/app"
"github.com/v2ray/v2ray-core/app/dns" "github.com/v2ray/v2ray-core/app/dns"
@ -95,9 +94,6 @@ func (this *FreedomConnection) Dispatch(destination v2net.Destination, payload *
input := ray.OutboundInput() input := ray.OutboundInput()
output := ray.OutboundOutput() output := ray.OutboundOutput()
var readMutex, writeMutex sync.Mutex
readMutex.Lock()
writeMutex.Lock()
if !payload.IsEmpty() { if !payload.IsEmpty() {
conn.Write(payload.Value) conn.Write(payload.Value)
@ -108,12 +104,11 @@ func (this *FreedomConnection) Dispatch(destination v2net.Destination, payload *
defer v2writer.Release() defer v2writer.Release()
v2io.Pipe(input, v2writer) v2io.Pipe(input, v2writer)
writeMutex.Unlock() if tcpConn, ok := conn.(*tcp.RawConnection); ok {
tcpConn.CloseWrite()
}
}() }()
go func() {
defer readMutex.Unlock()
var reader io.Reader = conn var reader io.Reader = conn
timeout := this.timeout timeout := this.timeout
@ -125,17 +120,9 @@ func (this *FreedomConnection) Dispatch(destination v2net.Destination, payload *
} }
v2reader := v2io.NewAdaptiveReader(reader) v2reader := v2io.NewAdaptiveReader(reader)
defer v2reader.Release()
v2io.Pipe(v2reader, output) v2io.Pipe(v2reader, output)
v2reader.Release()
ray.OutboundOutput().Close() ray.OutboundOutput().Close()
}()
writeMutex.Lock()
if tcpConn, ok := conn.(*tcp.RawConnection); ok {
tcpConn.CloseWrite()
}
readMutex.Lock()
return nil return nil
} }