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

Always remove invalid-routed block rules in DisableRouting

Browse Source
This commit is contained in:
Viktor Liu
2026-05-04 13:39:13 +02:00
parent 3ce048ebe7
commit 14ef880fc1
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
client/firewall/uspfilter/filter.go
View File

@@ -1552,16 +1552,6 @@ func (m *Manager) DisableRouting() error {
m.routingEnabled.Store(false)
m.nativeRouter.Store(false)
// don't stop forwarder if in use by netstack
if m.netstack && m.localForwarding {
return nil
}
fwder.Stop()
m.forwarder.Store(nil)
log.Debug("forwarder stopped")
var merr *multierror.Error
for _, rule := range m.blockRules {
if err := m.deleteRouteRule(rule); err != nil {
@@ -1570,6 +1560,15 @@ func (m *Manager) DisableRouting() error {
}
m.blockRules = nil
if m.netstack && m.localForwarding {
return nberrors.FormatErrorOrNil(merr)
}
fwder.Stop()
m.forwarder.Store(nil)
log.Debug("forwarder stopped")
return nberrors.FormatErrorOrNil(merr)
}