diff --git a/service/broadcasts/data.go b/service/broadcasts/data.go index e92ce84f..b9a1a453 100644 --- a/service/broadcasts/data.go +++ b/service/broadcasts/data.go @@ -5,6 +5,7 @@ import ( "time" "github.com/safing/portmaster/base/config" + "github.com/safing/portmaster/service/core" "github.com/safing/portmaster/service/intel/geoip" "github.com/safing/portmaster/service/netenv" "github.com/safing/portmaster/spn/access" @@ -17,19 +18,18 @@ var portmasterStarted = time.Now() func collectData() interface{} { data := make(map[string]interface{}) - // TODO(vladimir) // Get data about versions. - // versions := updates.GetSimpleVersions() - // data["Updates"] = versions - // data["Version"] = versions.Build.Version - // numericVersion, err := MakeNumericVersion(versions.Build.Version) - // if err != nil { - // data["NumericVersion"] = &DataError{ - // Error: err, - // } - // } else { - // data["NumericVersion"] = numericVersion - // } + versions := core.GetSimpleVersions() + data["Updates"] = versions + data["Version"] = versions.Build.Version + numericVersion, err := MakeNumericVersion(versions.Build.Version) + if err != nil { + data["NumericVersion"] = &DataError{ + Error: err, + } + } else { + data["NumericVersion"] = numericVersion + } // Get data about install. installInfo, err := GetInstallInfo() diff --git a/service/broadcasts/module.go b/service/broadcasts/module.go index a9a87074..08324ef6 100644 --- a/service/broadcasts/module.go +++ b/service/broadcasts/module.go @@ -43,10 +43,6 @@ var ( startOnce sync.Once ) -func init() { - // module = modules.Register("broadcasts", prep, start, nil, "updates", "netenv", "notifications") -} - func prep() error { // Register API endpoints. if err := registerAPIEndpoints(); err != nil { diff --git a/service/core/core.go b/service/core/core.go index 48f262a1..3b433491 100644 --- a/service/core/core.go +++ b/service/core/core.go @@ -11,7 +11,6 @@ import ( "github.com/safing/portmaster/base/log" "github.com/safing/portmaster/base/metrics" "github.com/safing/portmaster/base/utils/debug" - _ "github.com/safing/portmaster/service/broadcasts" "github.com/safing/portmaster/service/mgr" _ "github.com/safing/portmaster/service/netenv" _ "github.com/safing/portmaster/service/netquery" diff --git a/service/network/api.go b/service/network/api.go index 8af6eb26..5c18bcfd 100644 --- a/service/network/api.go +++ b/service/network/api.go @@ -93,7 +93,6 @@ func debugInfo(ar *api.Request) (data []byte, err error) { config.AddToDebugInfo(di) // Detailed information. - // TODO(vladimir): updates.AddToDebugInfo(di) // compat.AddToDebugInfo(di) // TODO: Cannot use due to interception import requirement which we don't want for SPN Hubs. di.AddGoroutineStack()