From dc32e72b3ad657f343880350b499de0bd2dd6ada Mon Sep 17 00:00:00 2001 From: Daniel Date: Thu, 2 Apr 2020 17:08:02 +0200 Subject: [PATCH] Move network/environment to netenv --- {network/environment => netenv}/addresses.go | 2 +- .../environment => netenv}/addresses_test.go | 2 +- {network/environment => netenv}/dbus_linux.go | 4 +-- .../environment => netenv}/dbus_linux_mock.go | 2 +- .../environment => netenv}/dbus_linux_test.go | 2 +- {network/environment => netenv}/dialing.go | 2 +- .../environment => netenv}/environment.go | 2 +- .../environment_darwin.go | 2 +- .../environment_linux.go | 2 +- .../environment_test.go | 2 +- .../environment_windows.go | 2 +- {network/environment => netenv}/location.go | 2 +- .../environment => netenv}/location_test.go | 2 +- {network/environment => netenv}/main.go | 16 +++------ netenv/main_test.go | 11 ++++++ .../environment => netenv}/network-change.go | 2 +- {network/environment => netenv}/notes.md | 0 .../environment => netenv}/online-status.go | 2 +- .../online-status_test.go | 2 +- network/environment/main_test.go | 35 ------------------- network/module.go | 6 ++-- 21 files changed, 34 insertions(+), 68 deletions(-) rename {network/environment => netenv}/addresses.go (98%) rename {network/environment => netenv}/addresses_test.go (96%) rename {network/environment => netenv}/dbus_linux.go (98%) rename {network/environment => netenv}/dbus_linux_mock.go (91%) rename {network/environment => netenv}/dbus_linux_test.go (96%) rename {network/environment => netenv}/dialing.go (95%) rename {network/environment => netenv}/environment.go (97%) rename {network/environment => netenv}/environment_darwin.go (97%) rename {network/environment => netenv}/environment_linux.go (99%) rename {network/environment => netenv}/environment_test.go (95%) rename {network/environment => netenv}/environment_windows.go (84%) rename {network/environment => netenv}/location.go (99%) rename {network/environment => netenv}/location_test.go (93%) rename {network/environment => netenv}/main.go (52%) create mode 100644 netenv/main_test.go rename {network/environment => netenv}/network-change.go (99%) rename {network/environment => netenv}/notes.md (100%) rename {network/environment => netenv}/online-status.go (99%) rename {network/environment => netenv}/online-status_test.go (91%) delete mode 100644 network/environment/main_test.go diff --git a/network/environment/addresses.go b/netenv/addresses.go similarity index 98% rename from network/environment/addresses.go rename to netenv/addresses.go index 53ac900a..19e2893d 100644 --- a/network/environment/addresses.go +++ b/netenv/addresses.go @@ -1,4 +1,4 @@ -package environment +package netenv import ( "net" diff --git a/network/environment/addresses_test.go b/netenv/addresses_test.go similarity index 96% rename from network/environment/addresses_test.go rename to netenv/addresses_test.go index 52a4e99a..14bc2cbe 100644 --- a/network/environment/addresses_test.go +++ b/netenv/addresses_test.go @@ -1,4 +1,4 @@ -package environment +package netenv import ( "fmt" diff --git a/network/environment/dbus_linux.go b/netenv/dbus_linux.go similarity index 98% rename from network/environment/dbus_linux.go rename to netenv/dbus_linux.go index d967e82c..150f964f 100644 --- a/network/environment/dbus_linux.go +++ b/netenv/dbus_linux.go @@ -1,6 +1,6 @@ // +build !server -package environment +package netenv import ( "errors" @@ -16,7 +16,7 @@ var ( dbusConnLock sync.Mutex ) -func getNameserversFromDbus() ([]Nameserver, error) { +func getNameserversFromDbus() ([]Nameserver, error) { //nolint:gocognit // TODO // cmdline tool for exploring: gdbus introspect --system --dest org.freedesktop.NetworkManager --object-path /org/freedesktop/NetworkManager var nameservers []Nameserver diff --git a/network/environment/dbus_linux_mock.go b/netenv/dbus_linux_mock.go similarity index 91% rename from network/environment/dbus_linux_mock.go rename to netenv/dbus_linux_mock.go index c5f326ef..1c3a7ebe 100644 --- a/network/environment/dbus_linux_mock.go +++ b/netenv/dbus_linux_mock.go @@ -1,6 +1,6 @@ // +build !linux -package environment +package netenv func getNameserversFromDbus() ([]Nameserver, error) { var nameservers []Nameserver diff --git a/network/environment/dbus_linux_test.go b/netenv/dbus_linux_test.go similarity index 96% rename from network/environment/dbus_linux_test.go rename to netenv/dbus_linux_test.go index cd2dbdb4..c9e4369f 100644 --- a/network/environment/dbus_linux_test.go +++ b/netenv/dbus_linux_test.go @@ -1,4 +1,4 @@ -package environment +package netenv import ( "os" diff --git a/network/environment/dialing.go b/netenv/dialing.go similarity index 95% rename from network/environment/dialing.go rename to netenv/dialing.go index 14293414..dc1023d7 100644 --- a/network/environment/dialing.go +++ b/netenv/dialing.go @@ -1,4 +1,4 @@ -package environment +package netenv import "net" diff --git a/network/environment/environment.go b/netenv/environment.go similarity index 97% rename from network/environment/environment.go rename to netenv/environment.go index 2828297f..59fb3f83 100644 --- a/network/environment/environment.go +++ b/netenv/environment.go @@ -1,4 +1,4 @@ -package environment +package netenv import ( "net" diff --git a/network/environment/environment_darwin.go b/netenv/environment_darwin.go similarity index 97% rename from network/environment/environment_darwin.go rename to netenv/environment_darwin.go index 40cd6ee8..a6eb794b 100644 --- a/network/environment/environment_darwin.go +++ b/netenv/environment_darwin.go @@ -1,4 +1,4 @@ -package environment +package netenv import "net" diff --git a/network/environment/environment_linux.go b/netenv/environment_linux.go similarity index 99% rename from network/environment/environment_linux.go rename to netenv/environment_linux.go index 6aa89653..363443f2 100644 --- a/network/environment/environment_linux.go +++ b/netenv/environment_linux.go @@ -1,4 +1,4 @@ -package environment +package netenv import ( "bufio" diff --git a/network/environment/environment_test.go b/netenv/environment_test.go similarity index 95% rename from network/environment/environment_test.go rename to netenv/environment_test.go index da918e9b..a8facf7c 100644 --- a/network/environment/environment_test.go +++ b/netenv/environment_test.go @@ -1,6 +1,6 @@ // +build linux -package environment +package netenv import "testing" diff --git a/network/environment/environment_windows.go b/netenv/environment_windows.go similarity index 84% rename from network/environment/environment_windows.go rename to netenv/environment_windows.go index 7b2225e0..4f40e3e5 100644 --- a/network/environment/environment_windows.go +++ b/netenv/environment_windows.go @@ -1,4 +1,4 @@ -package environment +package netenv import "net" diff --git a/network/environment/location.go b/netenv/location.go similarity index 99% rename from network/environment/location.go rename to netenv/location.go index 959768c2..4e1cea24 100644 --- a/network/environment/location.go +++ b/netenv/location.go @@ -1,4 +1,4 @@ -package environment +package netenv import ( "fmt" diff --git a/network/environment/location_test.go b/netenv/location_test.go similarity index 93% rename from network/environment/location_test.go rename to netenv/location_test.go index 44f9f51f..5ba2bb28 100644 --- a/network/environment/location_test.go +++ b/netenv/location_test.go @@ -1,6 +1,6 @@ // +build root -package environment +package netenv import "testing" diff --git a/network/environment/main.go b/netenv/main.go similarity index 52% rename from network/environment/main.go rename to netenv/main.go index 7a18d0db..d8d07b3c 100644 --- a/network/environment/main.go +++ b/netenv/main.go @@ -1,8 +1,6 @@ -package environment +package netenv import ( - "errors" - "github.com/safing/portbase/modules" ) @@ -15,19 +13,13 @@ var ( module *modules.Module ) -// InitSubModule initializes module specific things with the given module. Intended to be used as part of the "network" module. -func InitSubModule(m *modules.Module) { - module = m +func init() { + module = modules.Register("netenv", nil, start, nil) module.RegisterEvent(networkChangedEvent) module.RegisterEvent(onlineStatusChangedEvent) } -// StartSubModule starts module specific things with the given module. Intended to be used as part of the "network" module. -func StartSubModule() error { - if module == nil { - return errors.New("not initialized") - } - +func start() error { module.StartServiceWorker( "monitor network changes", 0, diff --git a/netenv/main_test.go b/netenv/main_test.go new file mode 100644 index 00000000..1ee7b730 --- /dev/null +++ b/netenv/main_test.go @@ -0,0 +1,11 @@ +package netenv + +import ( + "testing" + + "github.com/safing/portmaster/core/pmtesting" +) + +func TestMain(m *testing.M) { + pmtesting.TestMain(m, module) +} diff --git a/network/environment/network-change.go b/netenv/network-change.go similarity index 99% rename from network/environment/network-change.go rename to netenv/network-change.go index 808c66fb..8e1a9f68 100644 --- a/network/environment/network-change.go +++ b/netenv/network-change.go @@ -1,4 +1,4 @@ -package environment +package netenv import ( "bytes" diff --git a/network/environment/notes.md b/netenv/notes.md similarity index 100% rename from network/environment/notes.md rename to netenv/notes.md diff --git a/network/environment/online-status.go b/netenv/online-status.go similarity index 99% rename from network/environment/online-status.go rename to netenv/online-status.go index e1393f7a..c1773cb7 100644 --- a/network/environment/online-status.go +++ b/netenv/online-status.go @@ -1,4 +1,4 @@ -package environment +package netenv import ( "context" diff --git a/network/environment/online-status_test.go b/netenv/online-status_test.go similarity index 91% rename from network/environment/online-status_test.go rename to netenv/online-status_test.go index afb72d7c..8c860720 100644 --- a/network/environment/online-status_test.go +++ b/netenv/online-status_test.go @@ -1,4 +1,4 @@ -package environment +package netenv import ( "context" diff --git a/network/environment/main_test.go b/network/environment/main_test.go deleted file mode 100644 index 010c1e11..00000000 --- a/network/environment/main_test.go +++ /dev/null @@ -1,35 +0,0 @@ -package environment - -import ( - "os" - "testing" - - "github.com/safing/portbase/modules" - "github.com/safing/portmaster/core" -) - -func TestMain(m *testing.M) { - // setup - tmpDir, err := core.InitForTesting() - if err != nil { - panic(err) - } - - // setup package - netModule := modules.Register("network", nil, nil, nil, "core") - InitSubModule(netModule) - err = StartSubModule() - if err != nil { - panic(err) - } - - // run tests - rv := m.Run() - - // teardown - core.StopTesting() - _ = os.RemoveAll(tmpDir) - - // exit with test run return value - os.Exit(rv) -} diff --git a/network/module.go b/network/module.go index ab4d46f3..ed905d91 100644 --- a/network/module.go +++ b/network/module.go @@ -2,7 +2,6 @@ package network import ( "github.com/safing/portbase/modules" - "github.com/safing/portmaster/network/environment" ) var ( @@ -10,8 +9,7 @@ var ( ) func init() { - module = modules.Register("network", nil, start, nil, "core") - environment.InitSubModule(module) + module = modules.Register("network", nil, start, nil, "core", "processes") } func start() error { @@ -22,5 +20,5 @@ func start() error { go cleaner() - return environment.StartSubModule() + return nil }