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 17:36:18 +02:00
parent babf7476ff 7682929c11
commit 8acde086c3
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -158,6 +158,8 @@ func (m *Client) Closed() bool {
} }
func (m *Client) monitor() { func (m *Client) monitor() {
defer m.manager.onClientFinish()
for { for {
select { select {
case <-m.ctx.Done(): case <-m.ctx.Done():
@ -166,17 +168,21 @@ func (m *Client) monitor() {
case id := <-m.session2Remove: case id := <-m.session2Remove:
m.access.Lock() m.access.Lock()
delete(m.sessions, id) delete(m.sessions, id)
if len(m.sessions) == 0 {
m.cancel()
}
m.access.Unlock() m.access.Unlock()
} }
} }
} }
func (m *Client) cleanup() { func (m *Client) cleanup() {
defer m.manager.onClientFinish()
m.access.Lock() m.access.Lock()
defer m.access.Unlock() defer m.access.Unlock()
m.inboundRay.InboundInput().Close()
m.inboundRay.InboundOutput().CloseError()
for _, s := range m.sessions { for _, s := range m.sessions {
s.closeUplink() s.closeUplink()
s.closeDownlink() s.closeDownlink()