vikarti.anatra/safing-portmaster
1
0
Fork 0
mirror of https://github.com/safing/portmaster synced 2025-09-01 18:19:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Improve flags

Browse source
This commit is contained in:
Daniel 2021-05-05 00:23:48 +02:00
parent 168ef32c44
commit 48b55a88bc
5 changed files with 18 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/config.go
View file

@ -4,7 +4,6 @@ import (
"flag" "flag"
"github.com/safing/portbase/config" "github.com/safing/portbase/config"
"github.com/safing/portbase/log"
) )
// Configuration Keys. // Configuration Keys.
@ -19,13 +18,12 @@ var (
) )
func init() { func init() {
flag.BoolVar(&defaultNetworkServiceMode, "network-service", false, "force network service mode") flag.BoolVar(
} &defaultNetworkServiceMode,
"network-service",
func logFlagOverrides() { false,
if defaultNetworkServiceMode { "set default network service mode; configuration is stronger",
log.Warningf("core: %s config is being forced by the -network-service flag", CfgNetworkServiceKey) )
}
} }
func registerConfig() error { func registerConfig() error {

2
firewall/interception/interception.go
View file

@ -15,7 +15,7 @@ var (
) )
func init() { 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. // Start starts the interception.

2
firewall/interception/introspection.go
View file

@ -18,7 +18,7 @@ var (
) )
func init() { 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 ( type (

32
nameserver/config.go
View file

@ -5,7 +5,6 @@ import (
"runtime" "runtime"
"github.com/safing/portbase/config" "github.com/safing/portbase/config"
"github.com/safing/portbase/log"
"github.com/safing/portmaster/core" "github.com/safing/portmaster/core"
) )
@ -15,10 +14,9 @@ const (
) )
var ( var (
nameserverAddressFlag string
nameserverAddressConfig config.StringOption
defaultNameserverAddress = "localhost:53" defaultNameserverAddress = "localhost:53"
nameserverAddress string
nameserverAddressConfig config.StringOption
networkServiceMode config.BoolOption networkServiceMode config.BoolOption
) )
@ -29,22 +27,12 @@ func init() {
defaultNameserverAddress = "0.0.0.0:53" defaultNameserverAddress = "0.0.0.0:53"
} }
flag.StringVar(&nameserverAddressFlag, "nameserver-address", "", "override nameserver listen address") flag.StringVar(
} &nameserverAddress,
"nameserver-address",
func logFlagOverrides() { defaultNameserverAddress,
if nameserverAddressFlag != "" { "set default nameserver address; configuration is stronger",
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
} }
func registerConfig() error { func registerConfig() error {
@ -55,7 +43,7 @@ func registerConfig() error {
OptType: config.OptTypeString, OptType: config.OptTypeString,
ExpertiseLevel: config.ExpertiseLevelDeveloper, ExpertiseLevel: config.ExpertiseLevelDeveloper,
ReleaseLevel: config.ReleaseLevelStable, 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}$", 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, RequiresRestart: true,
Annotations: config.Annotations{ Annotations: config.Annotations{
@ -66,7 +54,7 @@ func registerConfig() error {
if err != nil { if err != nil {
return err return err
} }
nameserverAddressConfig = config.GetAsString(CfgDefaultNameserverAddressKey, getDefaultNameserverAddress()) nameserverAddressConfig = config.GetAsString(CfgDefaultNameserverAddressKey, nameserverAddress)
networkServiceMode = config.Concurrent.GetAsBool(core.CfgNetworkServiceKey, false) networkServiceMode = config.Concurrent.GetAsBool(core.CfgNetworkServiceKey, false)

2
nameserver/module.go
View file

@ -37,8 +37,6 @@ func prep() error {
} }
func start() error { func start() error {
logFlagOverrides()
if err := registerMetrics(); err != nil { if err := registerMetrics(); err != nil {
return err return err
} }