diff --git a/core/config.go b/core/config.go index 25578ed4..f0ebd939 100644 --- a/core/config.go +++ b/core/config.go @@ -4,7 +4,6 @@ import ( "flag" "github.com/safing/portbase/config" - "github.com/safing/portbase/log" ) // Configuration Keys. @@ -19,13 +18,12 @@ var ( ) func init() { - flag.BoolVar(&defaultNetworkServiceMode, "network-service", false, "force network service mode") -} - -func logFlagOverrides() { - if defaultNetworkServiceMode { - log.Warningf("core: %s config is being forced by the -network-service flag", CfgNetworkServiceKey) - } + flag.BoolVar( + &defaultNetworkServiceMode, + "network-service", + false, + "set default network service mode; configuration is stronger", + ) } func registerConfig() error { diff --git a/firewall/interception/interception.go b/firewall/interception/interception.go index 3c4bb5b1..4846f943 100644 --- a/firewall/interception/interception.go +++ b/firewall/interception/interception.go @@ -15,7 +15,7 @@ var ( ) func init() { - flag.BoolVar(&disableInterception, "disable-interception", false, "disable packet interception - this breaks a lot of functionality") + flag.BoolVar(&disableInterception, "disable-interception", false, "disable packet interception; this breaks a lot of functionality") } // Start starts the interception. diff --git a/firewall/interception/introspection.go b/firewall/interception/introspection.go index b8e949eb..6bb0019e 100644 --- a/firewall/interception/introspection.go +++ b/firewall/interception/introspection.go @@ -18,7 +18,7 @@ var ( ) func init() { - flag.StringVar(&packetMetricsDestination, "write-packet-metrics", "", "Write packet metrics to the specified file") + flag.StringVar(&packetMetricsDestination, "write-packet-metrics", "", "write packet metrics to the specified file") } type ( diff --git a/nameserver/config.go b/nameserver/config.go index 94579949..9d73f5b4 100644 --- a/nameserver/config.go +++ b/nameserver/config.go @@ -5,7 +5,6 @@ import ( "runtime" "github.com/safing/portbase/config" - "github.com/safing/portbase/log" "github.com/safing/portmaster/core" ) @@ -15,10 +14,9 @@ const ( ) var ( - nameserverAddressFlag string - nameserverAddressConfig config.StringOption - defaultNameserverAddress = "localhost:53" + nameserverAddress string + nameserverAddressConfig config.StringOption networkServiceMode config.BoolOption ) @@ -29,22 +27,12 @@ func init() { defaultNameserverAddress = "0.0.0.0:53" } - flag.StringVar(&nameserverAddressFlag, "nameserver-address", "", "override nameserver listen address") -} - -func logFlagOverrides() { - if nameserverAddressFlag != "" { - log.Warning("nameserver: dns/listenAddress default config is being overridden by the -nameserver-address flag") - } -} - -func getDefaultNameserverAddress() string { - // check if overridden - if nameserverAddressFlag != "" { - return nameserverAddressFlag - } - // return internal default - return defaultNameserverAddress + flag.StringVar( + &nameserverAddress, + "nameserver-address", + defaultNameserverAddress, + "set default nameserver address; configuration is stronger", + ) } func registerConfig() error { @@ -55,7 +43,7 @@ func registerConfig() error { OptType: config.OptTypeString, ExpertiseLevel: config.ExpertiseLevelDeveloper, ReleaseLevel: config.ReleaseLevelStable, - DefaultValue: getDefaultNameserverAddress(), + DefaultValue: nameserverAddress, ValidationRegex: "^(localhost|[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}|\\[[:0-9A-Fa-f]+\\]):[0-9]{1,5}$", RequiresRestart: true, Annotations: config.Annotations{ @@ -66,7 +54,7 @@ func registerConfig() error { if err != nil { return err } - nameserverAddressConfig = config.GetAsString(CfgDefaultNameserverAddressKey, getDefaultNameserverAddress()) + nameserverAddressConfig = config.GetAsString(CfgDefaultNameserverAddressKey, nameserverAddress) networkServiceMode = config.Concurrent.GetAsBool(core.CfgNetworkServiceKey, false) diff --git a/nameserver/module.go b/nameserver/module.go index 79a4dcf0..e85443fd 100644 --- a/nameserver/module.go +++ b/nameserver/module.go @@ -37,8 +37,6 @@ func prep() error { } func start() error { - logFlagOverrides() - if err := registerMetrics(); err != nil { return err }