github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Move all filter/interception config to interception module

Browse Source
This commit is contained in:
Daniel
2022-09-27 14:52:09 +02:00
parent 084a1a2654
commit 59392e41c6
3 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
firewall/interception.go
View File

@@ -13,12 +13,9 @@ import (
"github.com/tevino/abool"
"golang.org/x/sync/singleflight"
"github.com/safing/portbase/api"
"github.com/safing/portbase/config"
"github.com/safing/portbase/log"
"github.com/safing/portbase/modules"
"github.com/safing/portmaster/compat"
"github.com/safing/portmaster/core"
_ "github.com/safing/portmaster/core/base"
"github.com/safing/portmaster/firewall/inspection"
"github.com/safing/portmaster/firewall/interception"
@@ -46,12 +43,6 @@ var (
ownPID = os.Getpid()
)
// Config variables for interception module.
var (
devMode config.BoolOption
apiListenAddress config.StringOption
)
func init() {
// TODO: Move interception module to own package (dir).
interceptionModule = modules.Register("interception", interceptionPrep, interceptionStart, interceptionStop, "base", "updates", "network", "notifications")
@@ -60,12 +51,15 @@ func init() {
}
func interceptionPrep() error {
if err := registerConfig(); err != nil {
return err
}
return prepAPIAuth()
}
func interceptionStart() error {
devMode = config.Concurrent.GetAsBool(core.CfgDevModeKey, false)
apiListenAddress = config.GetAsString(api.CfgDefaultListenAddressKey, "")
getConfig()
if err := registerMetrics(); err != nil {
return err