lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-02-09 01:35:23 -05:00
Code Issues Releases Wiki Activity

mutex protected close

Browse Source
This commit is contained in:
Darien Raymond
2017-04-13 20:14:07 +02:00
parent c9f661f018
commit 81d840699a
3 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,13 +121,12 @@ func (m *Client) monitor() {
for {
select {
case <-m.ctx.Done():
m.sessionManager.Close()
m.inboundRay.InboundInput().Close()
m.inboundRay.InboundOutput().CloseError()
return
case <-time.After(time.Second * 6):
size := m.sessionManager.Size()
if size == 0 {
if size == 0 && m.sessionManager.CloseIfNoSession() {
m.cancel()
}
}
@@ -169,12 +168,12 @@ func (m *Client) Dispatch(ctx context.Context, outboundRay ray.OutboundRay) bool
default:
}
s := &Session{
input: outboundRay.OutboundInput(),
output: outboundRay.OutboundOutput(),
parent: m.sessionManager,
s := m.sessionManager.Allocate()
if s == nil {
return false
}
m.sessionManager.Allocate(s)
s.input = outboundRay.OutboundInput()
s.output = outboundRay.OutboundOutput()
go fetchInput(ctx, s, m.inboundRay.InboundInput())
return true
}