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

handle empty payload

pull/314/head
Darien Raymond 2016-11-19 22:40:14 +01:00
parent f64c79e239
commit 84740b676a
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
proxy/shadowsocks/client.go
View File

@ -142,8 +142,10 @@ func (this *Client) Dispatch(destination v2net.Destination, payload *alloc.Buffe
Writer: conn, Writer: conn,
Request: request, Request: request,
} }
if err := writer.Write(payload); err != nil { if !payload.IsEmpty() {
return errors.New("Shadowsocks|Client: Failed to write payload: " + err.Error()) if err := writer.Write(payload); err != nil {
return errors.New("Shadowsocks|Client: Failed to write payload: " + err.Error())
}
} }
v2io.Pipe(ray.OutboundInput(), writer) v2io.Pipe(ray.OutboundInput(), writer)

4
proxy/testing/mocks/outboundhandler.go
View File

@ -23,7 +23,9 @@ func (this *OutboundConnectionHandler) Dispatch(destination v2net.Destination, p
output := ray.OutboundOutput() output := ray.OutboundOutput()
this.Destination = destination this.Destination = destination
this.ConnOutput.Write(payload.Value) if !payload.IsEmpty() {
this.ConnOutput.Write(payload.Value)
}
payload.Release() payload.Release()
writeFinish := &sync.Mutex{} writeFinish := &sync.Mutex{}