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/432/head
Darien Raymond 2017-04-05 14:13:28 +02:00
parent 4d682c01e0 2a3facab5a
commit d10445d49a
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/proxyman/mux/mux.go
View File

@ -205,6 +205,13 @@ func fetchInput(ctx context.Context, s *session, output buf.Writer) {
} }
} }
func waitForDone(ctx context.Context, s *session) {
<-ctx.Done()
s.closeUplink()
s.closeDownlink()
s.output.Close()
}
func (m *Client) Dispatch(ctx context.Context, outboundRay ray.OutboundRay) bool { func (m *Client) Dispatch(ctx context.Context, outboundRay ray.OutboundRay) bool {
m.access.Lock() m.access.Lock()
defer m.access.Unlock() defer m.access.Unlock()
@ -233,6 +240,7 @@ func (m *Client) Dispatch(ctx context.Context, outboundRay ray.OutboundRay) bool
} }
m.sessions[id] = s m.sessions[id] = s
go fetchInput(ctx, s, m.inboundRay.InboundInput()) go fetchInput(ctx, s, m.inboundRay.InboundInput())
go waitForDone(ctx, s)
return true return true
} }