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 13:46:13 +02:00
parent 55328921b5 0a15bceb55
commit 2a3facab5a
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,7 @@ func (s *session) closeUplink() {
allDone = s.uplinkClosed && s.downlinkClosed allDone = s.uplinkClosed && s.downlinkClosed
s.Unlock() s.Unlock()
if allDone { if allDone {
s.parent.remove(s.id) go s.parent.remove(s.id)
} }
} }
@ -53,7 +53,7 @@ func (s *session) closeDownlink() {
allDone = s.uplinkClosed && s.downlinkClosed allDone = s.uplinkClosed && s.downlinkClosed
s.Unlock() s.Unlock()
if allDone { if allDone {
s.parent.remove(s.id) go s.parent.remove(s.id)
} }
} }
@ -279,6 +279,15 @@ func (m *Client) fetchOutput() {
break break
} }
} }
// Close all downlinks
m.access.RLock()
for _, s := range m.sessions {
s.closeUplink()
s.closeDownlink()
s.output.CloseError()
}
m.access.RUnlock()
} }
type Server struct { type Server struct {