Maint: loopstate package used in Openvpn state

internal/openvpn/state/portforwarded.go

@@ -0,0 +1,22 @@
+package state
+
+type PortForwardedGetterSetter interface {
+	GetPortForwarded() (port uint16)
+	SetPortForwarded(port uint16)
+}
+
+// GetPortForwarded is used by the control HTTP server
+// to obtain the port currently forwarded.
+func (s *State) GetPortForwarded() (port uint16) {
+	s.portForwardedMu.RLock()
+	defer s.portForwardedMu.RUnlock()
+	return s.portForwarded
+}
+
+// SetPortForwarded is only used from within the OpenVPN loop
+// to set the port forwarded.
+func (s *State) SetPortForwarded(port uint16) {
+	s.portForwardedMu.Lock()
+	defer s.portForwardedMu.Unlock()
+	s.portForwarded = port
+}

internal/openvpn/state/servers.go

@@ -0,0 +1,20 @@
+package state
+
+import "github.com/qdm12/gluetun/internal/models"
+
+type ServersGetterSetter interface {
+	GetServers() (servers models.AllServers)
+	SetServers(servers models.AllServers)
+}
+
+func (s *State) GetServers() (servers models.AllServers) {
+	s.allServersMu.RLock()
+	defer s.allServersMu.RUnlock()
+	return s.allServers
+}
+
+func (s *State) SetServers(servers models.AllServers) {
+	s.allServersMu.Lock()
+	defer s.allServersMu.Unlock()
+	s.allServers = servers
+}

internal/openvpn/state/settings.go

@@ -0,0 +1,35 @@
+package state
+
+import (
+	"context"
+	"reflect"
+
+	"github.com/qdm12/gluetun/internal/configuration"
+	"github.com/qdm12/gluetun/internal/constants"
+)
+
+type SettingsGetterSetter interface {
+	GetSettings() (settings configuration.OpenVPN)
+	SetSettings(ctx context.Context, settings configuration.OpenVPN) (
+		outcome string)
+}
+
+func (s *State) GetSettings() (settings configuration.OpenVPN) {
+	s.settingsMu.RLock()
+	defer s.settingsMu.RUnlock()
+	return s.settings
+}
+
+func (s *State) SetSettings(ctx context.Context, settings configuration.OpenVPN) (
+	outcome string) {
+	s.settingsMu.Lock()
+	defer s.settingsMu.Unlock()
+	settingsUnchanged := reflect.DeepEqual(s.settings, settings)
+	if settingsUnchanged {
+		return "settings left unchanged"
+	}
+	s.settings = settings
+	_, _ = s.statusApplier.ApplyStatus(ctx, constants.Stopped)
+	outcome, _ = s.statusApplier.ApplyStatus(ctx, constants.Running)
+	return outcome
+}

internal/openvpn/state/state.go

@@ -0,0 +1,53 @@
+package state
+
+import (
+	"sync"
+
+	"github.com/qdm12/gluetun/internal/configuration"
+	"github.com/qdm12/gluetun/internal/loopstate"
+	"github.com/qdm12/gluetun/internal/models"
+)
+
+var _ Manager = (*State)(nil)
+
+type Manager interface {
+	SettingsGetterSetter
+	ServersGetterSetter
+	PortForwardedGetterSetter
+	GetSettingsAndServers() (settings configuration.OpenVPN,
+		allServers models.AllServers)
+}
+
+func New(statusApplier loopstate.Applier,
+	settings configuration.OpenVPN,
+	allServers models.AllServers) *State {
+	return &State{
+		statusApplier: statusApplier,
+		settings:      settings,
+		allServers:    allServers,
+	}
+}
+
+type State struct {
+	statusApplier loopstate.Applier
+
+	settings   configuration.OpenVPN
+	settingsMu sync.RWMutex
+
+	allServers   models.AllServers
+	allServersMu sync.RWMutex
+
+	portForwarded   uint16
+	portForwardedMu sync.RWMutex
+}
+
+func (s *State) GetSettingsAndServers() (settings configuration.OpenVPN,
+	allServers models.AllServers) {
+	s.settingsMu.RLock()
+	s.allServersMu.RLock()
+	settings = s.settings
+	allServers = s.allServers
+	s.settingsMu.RUnlock()
+	s.allServersMu.RUnlock()
+	return settings, allServers
+}