mirror of
https://github.com/qdm12/gluetun.git
synced 2026-07-24 11:26:25 +02:00
Quentin McGaw
d9cc7dcffb
- new directory structure containing manifest.json and one json file per provider, by default. - the manifest.json file can specify a filepath for each vpn provider - each vpn provider json data file can contain the `"preferred": true` field to enforce it is used even if outdated, unless there is a version mismatch - `STORAGE_SERVERS_DIRECTORY_PATH` replaces `STORAGE_FILEPATH` (which is now a migration source only). It sets the directory where server manifest and per-provider JSON files are stored (default: `/gluetun/servers/`). - First-run migration: On startup, gluetun checks for the old /gluetun/servers.json file; if found and no new manifest exists, it automatically migrates all data to /gluetun/servers/ directory structure - Silent fallback: If legacy file isn't found, uses the new directory path normally - Legacy cleanup: After successful migration, attempts to remove the old fat JSON file (logs warning only if removal fails, e.g., read-only bind mounts)
33 lines
559 B
Go
33 lines
559 B
Go
package mullvad
|
|
|
|
import (
|
|
"net/netip"
|
|
"sort"
|
|
)
|
|
|
|
func uniqueSortedIPs(ips []netip.Addr) []netip.Addr {
|
|
uniqueIPs := make(map[string]struct{}, len(ips))
|
|
for _, ip := range ips {
|
|
key := ip.String()
|
|
uniqueIPs[key] = struct{}{}
|
|
}
|
|
|
|
ips = make([]netip.Addr, 0, len(uniqueIPs))
|
|
for key := range uniqueIPs {
|
|
ip, err := netip.ParseAddr(key)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
if ip.Is4In6() {
|
|
ip = netip.AddrFrom4(ip.As4())
|
|
}
|
|
ips = append(ips, ip)
|
|
}
|
|
|
|
sort.Slice(ips, func(i, j int) bool {
|
|
return ips[i].Compare(ips[j]) < 0
|
|
})
|
|
|
|
return ips
|
|
}
|