chore(models): streamline all server models IPs (#942)

- Use `IPs []net.IP` for all server models
- Use `ips` JSON field for all server models
- Merge IPv4 and IPv6 addresses together for Mullvad
This commit is contained in:
Quentin McGaw
2022-04-16 21:58:42 +02:00
parent 54b7e23974
commit aa729515b9
18 changed files with 26277 additions and 12234 deletions

View File

@@ -6,7 +6,6 @@ import (
"context"
"errors"
"fmt"
"net"
"strings"
"github.com/qdm12/gluetun/internal/constants"
@@ -60,7 +59,7 @@ func GetServers(ctx context.Context, unzipper unzip.Unzipper,
continue
}
ip, warning, extractIPErr := openvpn.ExtractIP(content)
ips, extractIPErr := openvpn.ExtractIPs(content)
if warning != "" {
warnings = append(warnings, warning)
}
@@ -73,7 +72,7 @@ func GetServers(ctx context.Context, unzipper unzip.Unzipper,
server := models.PrivatevpnServer{
Country: country,
City: city,
IPs: []net.IP{ip},
IPs: ips,
}
noHostnameServers = append(noHostnameServers, server)
}