Feat: location data at /v1/publicip/ip

internal/publicip/state/publicip.go

@@ -1,29 +1,26 @@
 package state
 
 import (
-	"net"
+	"github.com/qdm12/gluetun/internal/publicip/models"
 )
 
-type PublicIPGetSetter interface {
-	PublicIPGetter
-	SetPublicIP(publicIP net.IP)
+type DataGetSetter interface {
+	DataGetter
+	SetData(data models.IPInfoData)
 }
 
-type PublicIPGetter interface {
-	GetPublicIP() (publicIP net.IP)
+type DataGetter interface {
+	GetData() (data models.IPInfoData)
 }
 
-func (s *State) GetPublicIP() (publicIP net.IP) {
-	s.publicIPMu.RLock()
-	defer s.publicIPMu.RUnlock()
-	publicIP = make(net.IP, len(s.publicIP))
-	copy(publicIP, s.publicIP)
-	return publicIP
+func (s *State) GetData() (data models.IPInfoData) {
+	s.ipDataMu.RLock()
+	defer s.ipDataMu.RUnlock()
+	return s.ipData.Copy()
 }
 
-func (s *State) SetPublicIP(publicIP net.IP) {
-	s.settingsMu.Lock()
-	defer s.settingsMu.Unlock()
-	s.publicIP = make(net.IP, len(publicIP))
-	copy(s.publicIP, publicIP)
+func (s *State) SetData(data models.IPInfoData) {
+	s.ipDataMu.Lock()
+	defer s.ipDataMu.Unlock()
+	s.ipData = data.Copy()
 }

internal/publicip/state/state.go

@@ -1,18 +1,18 @@
 package state
 
 import (
-	"net"
 	"sync"
 
 	"github.com/qdm12/gluetun/internal/configuration"
 	"github.com/qdm12/gluetun/internal/loopstate"
+	"github.com/qdm12/gluetun/internal/publicip/models"
 )
 
 var _ Manager = (*State)(nil)
 
 type Manager interface {
 	SettingsGetSetter
-	PublicIPGetSetter
+	DataGetSetter
 }
 
 func New(statusApplier loopstate.Applier,
@@ -31,8 +31,8 @@ type State struct {
 	settings   configuration.PublicIP
 	settingsMu sync.RWMutex
 
-	publicIP   net.IP
-	publicIPMu sync.RWMutex
+	ipData   models.IPInfoData
+	ipDataMu sync.RWMutex
 
 	updateTicker chan<- struct{}
 }