github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

simplify mux code

pull/432/head
Darien Raymond 2017-04-04 00:17:38 +02:00
parent 27009786e9
commit 55ecd92064
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,26 +35,26 @@ type session struct {
downlinkClosed bool downlinkClosed bool
} }
func (s *session) checkAndRemove() {
s.Lock()
if s.uplinkClosed && s.downlinkClosed {
s.parent.remove(s.id)
}
s.Unlock()
}
func (s *session) closeUplink() { func (s *session) closeUplink() {
var allDone bool
s.Lock() s.Lock()
s.uplinkClosed = true s.uplinkClosed = true
allDone = s.uplinkClosed && s.downlinkClosed
s.Unlock() s.Unlock()
s.checkAndRemove() if allDone {
s.parent.remove(s.id)
}
} }
func (s *session) closeDownlink() { func (s *session) closeDownlink() {
var allDone bool
s.Lock() s.Lock()
s.downlinkClosed = true s.downlinkClosed = true
allDone = s.uplinkClosed && s.downlinkClosed
s.Unlock() s.Unlock()
s.checkAndRemove() if allDone {
s.parent.remove(s.id)
}
} }
type ClientManager struct { type ClientManager struct {
@ -177,7 +177,7 @@ func fetchInput(ctx context.Context, s *session, output buf.Writer) {
return return
} }
} }
_, timer := signal.CancelAfterInactivity(ctx, time.Minute*5) _, timer := signal.CancelAfterInactivity(ctx, time.Minute*30)
if err := buf.PipeUntilEOF(timer, s.input, writer); err != nil { if err := buf.PipeUntilEOF(timer, s.input, writer); err != nil {
log.Info("Proxyman|Mux|Client: Failed to fetch all input: ", err) log.Info("Proxyman|Mux|Client: Failed to fetch all input: ", err)
} }