From 10b270f742316c09c2695c0c4f9230939f694a65 Mon Sep 17 00:00:00 2001 From: "Quentin McGaw (desktop)" Date: Mon, 26 Jul 2021 16:17:01 +0000 Subject: [PATCH] Maint: remove routing from firewall configurator --- cmd/gluetun/main.go | 2 +- internal/firewall/firewall.go | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cmd/gluetun/main.go b/cmd/gluetun/main.go index 75d979e8..f0aa2b83 100644 --- a/cmd/gluetun/main.go +++ b/cmd/gluetun/main.go @@ -248,7 +248,7 @@ func _main(ctx context.Context, buildInfo models.BuildInformation, Prefix: "firewall: ", Level: firewallLogLevel, }) - firewallConf := firewall.NewConfig(firewallLogger, cmder, routingConf, + firewallConf := firewall.NewConfig(firewallLogger, cmder, defaultInterface, defaultGateway, localNetworks, defaultIP) if err := routingConf.Setup(); err != nil { diff --git a/internal/firewall/firewall.go b/internal/firewall/firewall.go index 859cdac5..5eaafbd8 100644 --- a/internal/firewall/firewall.go +++ b/internal/firewall/firewall.go @@ -26,7 +26,6 @@ type Configurator interface { type Config struct { //nolint:maligned runner command.Runner logger logging.Logger - routing routing.Routing iptablesMutex sync.Mutex ip6tablesMutex sync.Mutex defaultInterface string @@ -48,12 +47,11 @@ type Config struct { //nolint:maligned // NewConfig creates a new Config instance. func NewConfig(logger logging.Logger, runner command.Runner, - routing routing.Routing, defaultInterface string, defaultGateway net.IP, + defaultInterface string, defaultGateway net.IP, localNetworks []routing.LocalNetwork, localIP net.IP) *Config { return &Config{ runner: runner, logger: logger, - routing: routing, allowedInputPorts: make(map[uint16]string), ip6Tables: ip6tablesSupported(context.Background(), runner), customRulesPath: "/iptables/post-rules.txt",