sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-07-18 20:49:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix context cancellation

Browse Source
This commit is contained in:
Zoltán Papp
2025-02-27 12:37:59 +01:00
parent fcca194c8d
commit 4f668fdf5f
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/internal/conn_mgr.go
View File

@@ -27,6 +27,8 @@ type ConnMgr struct {
peerStore *peerstore.Store
excludes map[string]struct{}
ctxCancel context.CancelFunc
}
func NewConnMgr(peerStore *peerstore.Store, iface lazyconn.WGIface) *ConnMgr {
@@ -42,12 +44,15 @@ func NewConnMgr(peerStore *peerstore.Store, iface lazyconn.WGIface) *ConnMgr {
return e
}
func (e *ConnMgr) Start(ctx context.Context) {
func (e *ConnMgr) Start(parentCtx context.Context) {
if e.lazyConnMgr == nil {
log.Infof("lazy connection manager is disabled")
return
}
ctx, cancel := context.WithCancel(parentCtx)
e.ctxCancel = cancel
e.lazyConnMgr.Start(ctx)
go e.receiveLazyConnEvents(ctx)
}
@@ -120,6 +125,8 @@ func (e *ConnMgr) Close() {
if e.lazyConnMgr == nil {
return
}
e.ctxCancel()
// todo wait for receiveLazyConnEvents to finish
e.lazyConnMgr.Close()
e.lazyConnMgr = nil