gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-09-08 14:15:25 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3503 from gravitl/collect-location-from-netdesk

Browse source 
collect location from netdesk
This commit is contained in:
Abhishek K 2025-06-12 19:02:44 +05:30 • committed by GitHub
commit 3625067080
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
controllers/ext_client.go
View file

@ -780,6 +780,7 @@ func createExtClient(w http.ResponseWriter, r *http.Request) {
}
extclient.PublicEndpoint = customExtClient.PublicEndpoint
extclient.Country = customExtClient.Country
extclient.Location = customExtClient.Location
if err = logic.CreateExtClient(&extclient); err != nil {
slog.Error(

6
logic/extpeers.go
View file

@ -427,6 +427,12 @@ func UpdateExtClient(old *models.ExtClient, update *models.CustomExtClient) mode
new.PostUp = strings.Replace(update.PostUp, "\r\n", "\n", -1)
new.PostDown = strings.Replace(update.PostDown, "\r\n", "\n", -1)
new.Tags = update.Tags
if update.Location != "" && update.Location != old.Location {
new.Location = update.Location
}
if update.Country != "" && update.Country != old.Country {
new.Country = update.Country
}
return new
}

2
models/extclient.go
View file

@ -27,6 +27,7 @@ type ExtClient struct {
DeviceName string `json:"device_name"`
PublicEndpoint string `json:"public_endpoint"`
Country string `json:"country"`
Location string `json:"location"` //format: lat,long
Mutex *sync.Mutex `json:"-"`
}
@ -47,6 +48,7 @@ type CustomExtClient struct {
IsAlreadyConnectedToInetGw bool `json:"is_already_connected_to_inet_gw"`
PublicEndpoint string `json:"public_endpoint"`
Country string `json:"country"`
Location string `json:"location"` //format: lat,long
}
func (ext *ExtClient) ConvertToStaticNode() Node {