Reevaluate and update firewall core logic

updates/main.go

@@ -7,7 +7,11 @@ import (
 	"runtime"
 
 	"github.com/Safing/portbase/database"
+	"github.com/Safing/portbase/info"
 	"github.com/Safing/portbase/modules"
+
+	// module dependencies
+	_ "github.com/Safing/portmaster/core"
 )
 
 var (
@@ -15,10 +19,11 @@ var (
 )
 
 func init() {
-	modules.Register("updates", prep, start, nil, "global", "database")
+	modules.Register("updates", prep, start, nil, "core")
 }
 
 func prep() error {
+	status.Core = info.GetInfo()
 	updateStoragePath = filepath.Join(database.GetDatabaseRoot(), "updates")
 
 	err := checkUpdateDirs()

updates/status.go

@@ -7,6 +7,7 @@ import (
 	"github.com/Safing/portbase/database"
 	"github.com/Safing/portbase/database/query"
 	"github.com/Safing/portbase/database/record"
+	"github.com/Safing/portbase/info"
 	"github.com/Safing/portbase/log"
 	"github.com/tevino/abool"
 )
@@ -36,7 +37,7 @@ var (
 
 func init() {
 	status = &versionStatus{
-		Versions: make(map[string]*versionStatusEntry),
+		Modules: make(map[string]*versionStatusEntry),
 	}
 	status.SetKey(statusDBKey)
 }
@@ -45,7 +46,9 @@ func init() {
 type versionStatus struct {
 	record.Base
 	sync.Mutex
-	Versions map[string]*versionStatusEntry
+
+	Core    *info.Info
+	Modules map[string]*versionStatusEntry
 }
 
 func (vs *versionStatus) save() {
@@ -68,10 +71,10 @@ func updateUsedStatus(identifier string, version string) {
 	status.Lock()
 	defer status.Unlock()
 
-	entry, ok := status.Versions[identifier]
+	entry, ok := status.Modules[identifier]
 	if !ok {
 		entry = &versionStatusEntry{}
-		status.Versions[identifier] = entry
+		status.Modules[identifier] = entry
 	}
 
 	entry.LastVersionUsed = version
@@ -87,10 +90,10 @@ func updateStatus(vClass versionClass, state map[string]string) {
 
 	for identifier, version := range state {
 
-		entry, ok := status.Versions[identifier]
+		entry, ok := status.Modules[identifier]
 		if !ok {
 			entry = &versionStatusEntry{}
-			status.Versions[identifier] = entry
+			status.Modules[identifier] = entry
 		}
 
 		switch vClass {