Change logging

netbirdio · Feb 2, 2025 · b9029e0 · b9029e0
1 parent 4db673c
commit b9029e0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/client/firewall/iptables/router_linux.go b/client/firewall/iptables/router_linux.go
@@ -251,7 +251,7 @@ func (r *router) AddNatRule(pair firewall.RouterPair) error {
 // RemoveNatRule removes an iptables rule pair from forwarding and nat chains
 func (r *router) RemoveNatRule(pair firewall.RouterPair) error {
 	if err := r.ipFwdState.ReleaseForwarding(); err != nil {
-		log.Errorf("failed to disable sysctl IP forwarding: %v", err)
+		log.Errorf("%v", err)
 	}
 
 	if err := r.removeNatRule(pair); err != nil {
@@ -685,7 +685,7 @@ func (r *router) rollbackRules(rules map[string]ruleInfo) error {
 
 func (r *router) DeleteDNATRule(rule firewall.Rule) error {
 	if err := r.ipFwdState.ReleaseForwarding(); err != nil {
-		log.Errorf("failed to disable sysctl IP forwarding: %v", err)
+		log.Errorf("%v", err)
 	}
 
 	ruleKey := rule.ID()

diff --git a/client/firewall/nftables/router_linux.go b/client/firewall/nftables/router_linux.go
@@ -898,7 +898,7 @@ func (r *router) removeAcceptForwardRulesIptables(ipt *iptables.IPTables) error
 // RemoveNatRule removes the prerouting mark rule
 func (r *router) RemoveNatRule(pair firewall.RouterPair) error {
 	if err := r.ipFwdState.ReleaseForwarding(); err != nil {
-		log.Errorf("failed to disable sysctl IP forwarding: %v", err)
+		log.Errorf("%v", err)
 	}
 
 	if err := r.refreshRulesMap(); err != nil {
@@ -1190,7 +1190,7 @@ func (r *router) addDnatMasq(rule firewall.ForwardRule, protoNum uint8, ruleKey
 
 func (r *router) DeleteDNATRule(rule firewall.Rule) error {
 	if err := r.ipFwdState.ReleaseForwarding(); err != nil {
-		log.Errorf("failed to disable sysctl IP forwarding: %v", err)
+		log.Errorf("%v", err)
 	}
 
 	ruleKey := rule.ID()

diff --git a/client/internal/routemanager/ipfwdstate/ipfwdstate.go b/client/internal/routemanager/ipfwdstate/ipfwdstate.go
@@ -1,6 +1,7 @@
 package ipfwdstate
 
 import (
+	"fmt"
 	"github.com/netbirdio/netbird/client/internal/routemanager/systemops"
 )
 
@@ -19,7 +20,7 @@ func (f *IPForwardingState) RequestForwarding() error {
 	}
 
 	if err := systemops.EnableIPForwarding(); err != nil {
-		return err
+		return fmt.Errorf("failed to enable IP forwarding with sysctl: %w", err)
 	}
 	f.enabledCounter = 1
 
@@ -40,7 +41,7 @@ func (f *IPForwardingState) ReleaseForwarding() error {
 	f.enabledCounter = 0
 
 	if err := systemops.DisableIPForwarding(); err != nil {
-		return err
+		return fmt.Errorf("failed to disable IP forwarding with sysctl: %w", err)
 	}
 	return nil
 }