cyonjan/frp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: data race in client/service.go

Browse Source
This commit is contained in:
Colin Adler 2022-04-13 17:51:36 -04:00
parent a7a4ba270d
commit c89c1943e4
No known key found for this signature in database
GPG Key ID: 8DDC2A166C040630
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
client/service.go
View File

@ -174,7 +174,10 @@ func (svr *Service) keepControllerWorking() {
reconnectCounts := 1 reconnectCounts := 1
for { for {
<-svr.ctl.ClosedDoneCh() svr.ctlMu.RLock()
ctlCh := svr.ctl.ClosedDoneCh()
svr.ctlMu.RUnlock()
<-ctlCh
if atomic.LoadUint32(&svr.exit) != 0 { if atomic.LoadUint32(&svr.exit) != 0 {
return return
} }
@ -356,6 +359,8 @@ func (svr *Service) ReloadConf(pxyCfgs map[string]config.ProxyConf, visitorCfgs
svr.visitorCfgs = visitorCfgs svr.visitorCfgs = visitorCfgs
svr.cfgMu.Unlock() svr.cfgMu.Unlock()
svr.ctlMu.Lock()
defer svr.ctlMu.Unlock()
return svr.ctl.ReloadConf(pxyCfgs, visitorCfgs) return svr.ctl.ReloadConf(pxyCfgs, visitorCfgs)
} }
@ -365,8 +370,12 @@ func (svr *Service) Close() {
func (svr *Service) GracefulClose(d time.Duration) { func (svr *Service) GracefulClose(d time.Duration) {
atomic.StoreUint32(&svr.exit, 1) atomic.StoreUint32(&svr.exit, 1)
svr.ctlMu.Lock()
if svr.ctl != nil { if svr.ctl != nil {
svr.ctl.GracefulClose(d) svr.ctl.GracefulClose(d)
} }
svr.ctlMu.Unlock()
svr.cancel() svr.cancel()
} }