wip

qdm12 · Oct 19, 2024 · 7b8f9be · 7b8f9be
1 parent 3dfb43e
commit 7b8f9be
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 0 deletions.
diff --git a/internal/vpn/interfaces.go b/internal/vpn/interfaces.go
@@ -72,6 +72,7 @@ type Router interface {
 type Ruler interface {
 	RuleAdd(rule netlink.Rule) error
 	RuleDel(rule netlink.Rule) error
+	RuleList(family int) (rules []netlink.Rule, err error)
 }
 
 type Linker interface {

diff --git a/internal/wireguard/netlinker.go b/internal/wireguard/netlinker.go
@@ -20,6 +20,7 @@ type Router interface {
 type Ruler interface {
 	RuleAdd(rule netlink.Rule) error
 	RuleDel(rule netlink.Rule) error
+	RuleList(family int) ([]netlink.Rule, error)
 }
 
 type Linker interface {

diff --git a/internal/wireguard/netlinker_mock_test.go b/internal/wireguard/netlinker_mock_test.go
diff --git a/internal/wireguard/rule.go b/internal/wireguard/rule.go
@@ -2,6 +2,7 @@ package wireguard
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/qdm12/gluetun/internal/netlink"
 )
@@ -16,6 +17,18 @@ func (w *Wireguard) addRule(rulePriority int, firewallMark uint32,
 	rule.Table = int(firewallMark)
 	rule.Family = family
 	if err := w.netlink.RuleAdd(rule); err != nil {
+		if strings.Contains(err.Error(), "file exists") {
+			rules, listErr := w.netlink.RuleList(family)
+			if listErr != nil {
+				return nil, fmt.Errorf("listing rules for family %d due to %q: %w",
+					family, err, listErr)
+			}
+			ruleStrings := make([]string, len(rules))
+			for i := range rules {
+				ruleStrings[i] = rules[i].String()
+			}
+			w.logger.Info("existing rules are:\n" + strings.Join(ruleStrings, "\n"))
+		}
 		return nil, fmt.Errorf("adding rule %s: %w", rule, err)
 	}