guoswork
/
frp
mirror of https://gitee.com/IrisVega/frp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix control delete error

This commit is contained in:
fatedier 2019-01-26 21:36:24 +08:00
parent 385c4d3dd5
commit 70ac7d3d11
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/control.go
View File

@ -62,10 +62,13 @@ func (cm *ControlManager) Add(runId string, ctl *Control) (oldCtl *Control) {
return return
} }
func (cm *ControlManager) Del(runId string) { // we should make sure if it's the same control to prevent delete a new one
func (cm *ControlManager) Del(runId string, ctl *Control) {
cm.mu.Lock() cm.mu.Lock()
defer cm.mu.Unlock() defer cm.mu.Unlock()
delete(cm.ctlsByRunId, runId) if c, ok := cm.ctlsByRunId[runId]; ok && c == ctl {
delete(cm.ctlsByRunId, runId)
}
} }
func (cm *ControlManager) GetById(runId string) (ctl *Control, ok bool) { func (cm *ControlManager) GetById(runId string) (ctl *Control, ok bool) {

2
server/service.go
View File

@ -353,7 +353,7 @@ func (svr *Service) RegisterControl(ctlConn frpNet.Conn, loginMsg *msg.Login) (e
go func() { go func() {
// block until control closed // block until control closed
ctl.WaitClosed() ctl.WaitClosed()
svr.ctlManager.Del(loginMsg.RunId) svr.ctlManager.Del(loginMsg.RunId, ctl)
}() }()
return return
} }