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

Merge branch 'master' of https://github.com/v2ray/v2ray-core

pull/467/head v2.11.2
Darien Raymond 2016-12-21 10:47:15 +01:00
parent cdcccb4590 eddde847df
commit 68fe9d8007
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/dispatcher/impl/default.go
View File

@ -72,6 +72,7 @@ func (v *DefaultDispatcher) DispatchToOutbound(session *proxy.SessionInfo) ray.I
return direct return direct
} }
// FilterPacketAndDispatch waits for a payload from source and starts dispatching.
// Private: Visible for testing. // Private: Visible for testing.
func (v *DefaultDispatcher) FilterPacketAndDispatch(destination v2net.Destination, link ray.OutboundRay, dispatcher proxy.OutboundHandler) { func (v *DefaultDispatcher) FilterPacketAndDispatch(destination v2net.Destination, link ray.OutboundRay, dispatcher proxy.OutboundHandler) {
payload, err := link.OutboundInput().Read() payload, err := link.OutboundInput().Read()

2
proxy/shadowsocks/client.go
View File

@ -99,10 +99,12 @@ func (v *Client) Dispatch(destination v2net.Destination, payload *buf.Buffer, ra
return return
} }
if !payload.IsEmpty() {
if err := bodyWriter.Write(payload); err != nil { if err := bodyWriter.Write(payload); err != nil {
log.Info("Shadowsocks|Client: Failed to write payload: ", err) log.Info("Shadowsocks|Client: Failed to write payload: ", err)
return return
} }
}
var responseMutex sync.Mutex var responseMutex sync.Mutex
responseMutex.Lock() responseMutex.Lock()