Switch to flag based cache validation

netenv/environment_linux.go

@@ -7,7 +7,6 @@ import (
 	"os"
 	"strings"
 	"sync"
-	"time"
 
 	"github.com/miekg/dns"
 
@@ -15,35 +14,25 @@ import (
 	"github.com/safing/portmaster/network/netutils"
 )
 
-const (
-	gatewaysRecheck    = 2 * time.Second
-	nameserversRecheck = 2 * time.Second
-)
-
 var (
-	gateways        = make([]net.IP, 0)
+	gateways                   = make([]net.IP, 0)
-	gatewaysLock    sync.Mutex
+	gatewaysLock               sync.Mutex
-	gatewaysExpires = time.Now()
+	gatewaysNetworkChangedFlag = GetNetworkChangedFlag()
 
-	nameservers        = make([]Nameserver, 0)
+	nameservers                   = make([]Nameserver, 0)
-	nameserversLock    sync.Mutex
+	nameserversLock               sync.Mutex
-	nameserversExpires = time.Now()
+	nameserversNetworkChangedFlag = GetNetworkChangedFlag()
 )
 
 // Gateways returns the currently active gateways.
 func Gateways() []net.IP {
-	// locking
 	gatewaysLock.Lock()
 	defer gatewaysLock.Unlock()
-	// cache
+	// Check if the network changed, if not, return cache.
-	if gatewaysExpires.After(time.Now()) {
+	if !gatewaysNetworkChangedFlag.IsSet() {
 		return gateways
 	}
-	// update cache expiry when finished
+	gatewaysNetworkChangedFlag.Refresh()
-	defer func() {
-		gatewaysExpires = time.Now().Add(gatewaysRecheck)
-	}()
-	// logic
 
 	gateways = make([]net.IP, 0)
 	var decoded []byte
@@ -119,17 +108,13 @@ func Gateways() []net.IP {
 
 // Nameservers returns the currently active nameservers.
 func Nameservers() []Nameserver {
-	// locking
 	nameserversLock.Lock()
 	defer nameserversLock.Unlock()
-	// cache
+	// Check if the network changed, if not, return cache.
-	if nameserversExpires.After(time.Now()) {
+	if !nameserversNetworkChangedFlag.IsSet() {
 		return nameservers
 	}
-	// update cache expiry when finished
+	nameserversNetworkChangedFlag.Refresh()
-	defer func() {
-		nameserversExpires = time.Now().Add(nameserversRecheck)
-	}()
 
 	// logic
 	// TODO: try:

netenv/network-change.go

@@ -9,12 +9,23 @@ import (
 	"time"
 
 	"github.com/safing/portbase/log"
+	"github.com/safing/portbase/utils"
 )
 
 var (
-	networkChangeCheckTrigger = make(chan struct{}, 1)
+	networkChangeCheckTrigger    = make(chan struct{}, 1)
+	networkChangedFlagController = utils.NewFlagController()
 )
 
+func GetNetworkChangedFlag() *utils.Flag {
+	return networkChangedFlagController.NewFlag()
+}
+
+func notifyOfNetworkChange() {
+	networkChangedFlagController.NotifyAndReset()
+	module.TriggerEvent(NetworkChangedEvent, nil)
+}
+
 func triggerNetworkChangeCheck() {
 	select {
 	case networkChangeCheckTrigger <- struct{}{}:
@@ -82,7 +93,7 @@ serviceLoop:
 			if trigger {
 				triggerOnlineStatusInvestigation()
 			}
-			module.TriggerEvent(NetworkChangedEvent, nil)
+			notifyOfNetworkChange()
 		}
 
 	}