mirror of
https://github.com/v2fly/v2ray-core.git
synced 2025-01-03 07:56:42 -05:00
Merge branch 'master' of https://github.com/v2ray/v2ray-core
This commit is contained in:
commit
d10445d49a
@ -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 {
|
||||
m.access.Lock()
|
||||
defer m.access.Unlock()
|
||||
@ -233,6 +240,7 @@ func (m *Client) Dispatch(ctx context.Context, outboundRay ray.OutboundRay) bool
|
||||
}
|
||||
m.sessions[id] = s
|
||||
go fetchInput(ctx, s, m.inboundRay.InboundInput())
|
||||
go waitForDone(ctx, s)
|
||||
return true
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user