Move network/environment to netenv

netenv/addresses.go

@@ -1,4 +1,4 @@
-package environment
+package netenv
 
 import (
 	"net"

netenv/addresses_test.go

@@ -1,4 +1,4 @@
-package environment
+package netenv
 
 import (
 	"fmt"

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

netenv/dbus_linux_mock.go

@@ -1,6 +1,6 @@
 // +build !linux
 
-package environment
+package netenv
 
 func getNameserversFromDbus() ([]Nameserver, error) {
 	var nameservers []Nameserver

netenv/dbus_linux_test.go

@@ -1,4 +1,4 @@
-package environment
+package netenv
 
 import (
 	"os"

netenv/dialing.go

@@ -1,4 +1,4 @@
-package environment
+package netenv
 
 import "net"
 

netenv/environment.go

@@ -1,4 +1,4 @@
-package environment
+package netenv
 
 import (
 	"net"

netenv/environment_darwin.go

@@ -1,4 +1,4 @@
-package environment
+package netenv
 
 import "net"
 

netenv/environment_linux.go

@@ -1,4 +1,4 @@
-package environment
+package netenv
 
 import (
 	"bufio"

netenv/environment_test.go

@@ -1,6 +1,6 @@
 // +build linux
 
-package environment
+package netenv
 
 import "testing"
 

netenv/environment_windows.go

@@ -1,4 +1,4 @@
-package environment
+package netenv
 
 import "net"
 

netenv/location.go

@@ -1,4 +1,4 @@
-package environment
+package netenv
 
 import (
 	"fmt"

netenv/location_test.go

@@ -1,6 +1,6 @@
 // +build root
 
-package environment
+package netenv
 
 import "testing"
 

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 init() {
-func InitSubModule(m *modules.Module) {
+	module = modules.Register("netenv", nil, start, nil)
-	module = m
 	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 start() error {
-func StartSubModule() error {
-	if module == nil {
-		return errors.New("not initialized")
-	}
-
 	module.StartServiceWorker(
 		"monitor network changes",
 		0,

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)
+}

netenv/network-change.go

@@ -1,4 +1,4 @@
-package environment
+package netenv
 
 import (
 	"bytes"

netenv/online-status.go

@@ -1,4 +1,4 @@
-package environment
+package netenv
 
 import (
 	"context"

netenv/online-status_test.go

@@ -1,4 +1,4 @@
-package environment
+package netenv
 
 import (
 	"context"

network/environment/main_test.go

@@ -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)
-}

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")
+	module = modules.Register("network", nil, start, nil, "core", "processes")
-	environment.InitSubModule(module)
 }
 
 func start() error {
@@ -22,5 +20,5 @@ func start() error {
 
 	go cleaner()
 
-	return environment.StartSubModule()
+	return nil
 }