lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-01-17 23:06:30 -05:00
Code Issues Releases Wiki Activity

prevent deadlock in shadowsocks

Browse Source
This commit is contained in:
Darien Raymond 2016-11-05 01:00:09 +01:00
parent bae0de7d95
commit 3a15f799c2
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
proxy/shadowsocks/client.go
View File

@ -101,9 +101,6 @@ func (this *Client) Dispatch(destination v2net.Destination, payload *alloc.Buffe
return errors.New("Shadowsocks|Client: Failed to write payload: " + err.Error()) return errors.New("Shadowsocks|Client: Failed to write payload: " + err.Error())
} }
bufferedWriter.SetCached(false)
v2io.Pipe(ray.OutboundInput(), bodyWriter)
var responseMutex sync.Mutex var responseMutex sync.Mutex
responseMutex.Lock() responseMutex.Lock()
@ -119,19 +116,13 @@ func (this *Client) Dispatch(destination v2net.Destination, payload *alloc.Buffe
v2io.Pipe(responseReader, ray.OutboundOutput()) v2io.Pipe(responseReader, ray.OutboundOutput())
}() }()
bufferedWriter.SetCached(false)
v2io.Pipe(ray.OutboundInput(), bodyWriter)
responseMutex.Lock() responseMutex.Lock()
} }
if request.Command == protocol.RequestCommandUDP { if request.Command == protocol.RequestCommandUDP {
writer := &UDPWriter{
Writer: conn,
Request: request,
}
if err := writer.Write(payload); err != nil {
return errors.New("Shadowsocks|Client: Failed to write payload: " + err.Error())
}
v2io.Pipe(ray.OutboundInput(), writer)
timedReader := v2net.NewTimeOutReader(16, conn) timedReader := v2net.NewTimeOutReader(16, conn)
var responseMutex sync.Mutex var responseMutex sync.Mutex
responseMutex.Lock() responseMutex.Lock()
@ -147,6 +138,15 @@ func (this *Client) Dispatch(destination v2net.Destination, payload *alloc.Buffe
v2io.Pipe(reader, ray.OutboundOutput()) v2io.Pipe(reader, ray.OutboundOutput())
}() }()
writer := &UDPWriter{
Writer: conn,
Request: request,
}
if err := writer.Write(payload); err != nil {
return errors.New("Shadowsocks|Client: Failed to write payload: " + err.Error())
}
v2io.Pipe(ray.OutboundInput(), writer)
responseMutex.Lock() responseMutex.Lock()
} }