sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-05-03 07:36:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wait DisableWgWatcher to exit from periodic check loop

Browse Source
This commit is contained in:
Zoltán Papp
2025-01-30 14:06:42 +01:00
parent ef5e417cb7
commit b7cf77d324
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client/internal/peer/wg_watcher.go
View File

@@ -28,9 +28,9 @@ type WGWatcher struct {
wgIfaceStater WGInterfaceStater wgIfaceStater WGInterfaceStater
peerKey string peerKey string
ctx context.Context
ctxCancel context.CancelFunc ctxCancel context.CancelFunc
ctxLock sync.Mutex ctxLock sync.Mutex
waitGroup sync.WaitGroup
} }
func NewWGWatcher(log *log.Entry, wgIfaceStater WGInterfaceStater, peerKey string) *WGWatcher { func NewWGWatcher(log *log.Entry, wgIfaceStater WGInterfaceStater, peerKey string) *WGWatcher {
@@ -41,25 +41,30 @@ func NewWGWatcher(log *log.Entry, wgIfaceStater WGInterfaceStater, peerKey strin
} }
} }
// EnableWgWatcher starts the WireGuard watcher. If it is already enabled, it will return immediately and do nothing.
func (w *WGWatcher) EnableWgWatcher(parentCtx context.Context, onDisconnectedFn func()) { func (w *WGWatcher) EnableWgWatcher(parentCtx context.Context, onDisconnectedFn func()) {
w.log.Debugf("enable WireGuard watcher") w.log.Debugf("enable WireGuard watcher")
w.ctxLock.Lock() w.ctxLock.Lock()
defer w.ctxLock.Unlock() defer w.ctxLock.Unlock()
if w.ctx != nil && w.ctx.Err() == nil { if w.ctxCancel != nil {
w.log.Errorf("WireGuard watcher already enabled")
return return
} }
w.ctx, w.ctxCancel = context.WithCancel(parentCtx) ctx, ctxCancel := context.WithCancel(parentCtx)
w.ctxCancel = ctxCancel
initialHandshake, err := w.wgState() initialHandshake, err := w.wgState()
if err != nil { if err != nil {
w.log.Warnf("failed to read wg stats: %v", err) w.log.Warnf("failed to read wg stats: %v", err)
} }
go w.periodicHandshakeCheck(w.ctx, w.ctxCancel, onDisconnectedFn, initialHandshake) w.waitGroup.Add(1)
go w.periodicHandshakeCheck(ctx, w.ctxCancel, onDisconnectedFn, initialHandshake)
} }
// DisableWgWatcher stops the WireGuard watcher and wait for the watcher to exit
func (w *WGWatcher) DisableWgWatcher() { func (w *WGWatcher) DisableWgWatcher() {
w.ctxLock.Lock() w.ctxLock.Lock()
defer w.ctxLock.Unlock() defer w.ctxLock.Unlock()
@@ -71,11 +76,14 @@ func (w *WGWatcher) DisableWgWatcher() {
w.log.Debugf("disable WireGuard watcher") w.log.Debugf("disable WireGuard watcher")
w.ctxCancel() w.ctxCancel()
w.ctxCancel = nil
w.waitGroup.Wait()
} }
// wgStateCheck help to check the state of the WireGuard handshake and relay connection // wgStateCheck help to check the state of the WireGuard handshake and relay connection
func (w *WGWatcher) periodicHandshakeCheck(ctx context.Context, ctxCancel context.CancelFunc, onDisconnectedFn func(), initialHandshake time.Time) { func (w *WGWatcher) periodicHandshakeCheck(ctx context.Context, ctxCancel context.CancelFunc, onDisconnectedFn func(), initialHandshake time.Time) {
w.log.Debugf("WireGuard watcher started") w.log.Debugf("WireGuard watcher started")
defer w.waitGroup.Done()
timer := time.NewTimer(wgHandshakeOvertime) timer := time.NewTimer(wgHandshakeOvertime)
defer timer.Stop() defer timer.Stop()