sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-04-18 16:26:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reorder subsystem shutdown order so DNS goes last

Browse Source
This commit is contained in:
Viktor Liu
2025-11-15 14:41:56 +01:00
parent e4b41d0ad7
commit fae27656c2
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
client/internal/engine.go
View File

@@ -292,9 +292,6 @@ func (e *Engine) Stop() error {
} }
log.Info("Network monitor: stopped") log.Info("Network monitor: stopped")
// stop/restore DNS first so dbus and friends don't complain because of a missing interface
e.stopDNSServer()
if e.ingressGatewayMgr != nil { if e.ingressGatewayMgr != nil {
if err := e.ingressGatewayMgr.Close(); err != nil { if err := e.ingressGatewayMgr.Close(); err != nil {
log.Warnf("failed to cleanup forward rules: %v", err) log.Warnf("failed to cleanup forward rules: %v", err)
@@ -302,12 +299,6 @@ func (e *Engine) Stop() error {
e.ingressGatewayMgr = nil e.ingressGatewayMgr = nil
} }
e.stopDNSForwarder()
if e.routeManager != nil {
e.routeManager.Stop(e.stateManager)
}
if e.srWatcher != nil { if e.srWatcher != nil {
e.srWatcher.Close() e.srWatcher.Close()
} }
@@ -320,6 +311,16 @@ func (e *Engine) Stop() error {
return fmt.Errorf("failed to remove all peers: %s", err) return fmt.Errorf("failed to remove all peers: %s", err)
} }
if e.routeManager != nil {
e.routeManager.Stop(e.stateManager)
}
e.stopDNSForwarder()
// stop/restore DNS after peers are closed but before interface goes down
// so dbus and friends don't complain because of a missing interface
e.stopDNSServer()
if e.cancel != nil { if e.cancel != nil {
e.cancel() e.cancel()
} }