chore(storage): tcp and udp fields for all servers
- Updater code sets UDP and TCP compatibility for all providers - Increase servers.json model versions for affected providers (mullvad, windscribe, privado, protonvpn, privatevpn) - Remove retro-compatibility server defaults - Update all affected providers servers data (mullvad, windscribe, privado, protonvpn, privatevpn)
This commit is contained in:
@@ -35,14 +35,4 @@ func (s *Server) setDefaults() {
|
|||||||
// If the VPN protocol isn't specified, assume it is OpenVPN.
|
// If the VPN protocol isn't specified, assume it is OpenVPN.
|
||||||
s.VPN = vpn.OpenVPN
|
s.VPN = vpn.OpenVPN
|
||||||
}
|
}
|
||||||
|
|
||||||
if !s.UDP && !s.TCP {
|
|
||||||
// If UDP and TCP are not precised:
|
|
||||||
// For OpenVPN, assume TCP and UDP are supported
|
|
||||||
// For Wireguard, UDP must be supported.
|
|
||||||
s.UDP = true
|
|
||||||
if s.VPN == vpn.OpenVPN {
|
|
||||||
s.TCP = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -36,8 +36,11 @@ func (hts hostToServer) add(data serverData) (err error) {
|
|||||||
switch data.Type {
|
switch data.Type {
|
||||||
case "openvpn":
|
case "openvpn":
|
||||||
server.VPN = vpn.OpenVPN
|
server.VPN = vpn.OpenVPN
|
||||||
|
server.UDP = true
|
||||||
|
server.TCP = true
|
||||||
case "wireguard":
|
case "wireguard":
|
||||||
server.VPN = vpn.Wireguard
|
server.VPN = vpn.Wireguard
|
||||||
|
server.UDP = true
|
||||||
case "bridge":
|
case "bridge":
|
||||||
// ignore bridge servers
|
// ignore bridge servers
|
||||||
return nil
|
return nil
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ func (hts hostToServer) add(host string) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
server.Hostname = host
|
server.Hostname = host
|
||||||
|
server.UDP = true
|
||||||
hts[host] = server
|
hts[host] = server
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -17,6 +17,8 @@ func (hts hostToServer) add(host, country, city string) {
|
|||||||
server.Hostname = host
|
server.Hostname = host
|
||||||
server.Country = country
|
server.Country = country
|
||||||
server.City = city
|
server.City = city
|
||||||
|
server.UDP = true
|
||||||
|
server.TCP = true
|
||||||
hts[host] = server
|
hts[host] = server
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -73,6 +73,8 @@ func GetServers(ctx context.Context, unzipper unzip.Unzipper,
|
|||||||
Country: country,
|
Country: country,
|
||||||
City: city,
|
City: city,
|
||||||
IPs: ips,
|
IPs: ips,
|
||||||
|
UDP: true,
|
||||||
|
TCP: true,
|
||||||
}
|
}
|
||||||
noHostnameServers = append(noHostnameServers, server)
|
noHostnameServers = append(noHostnameServers, server)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,6 +19,8 @@ func (its ipToServer) add(country, region, city, name, hostname string,
|
|||||||
server.City = city
|
server.City = city
|
||||||
server.ServerName = name
|
server.ServerName = name
|
||||||
server.Hostname = hostname
|
server.Hostname = hostname
|
||||||
|
server.UDP = true
|
||||||
|
server.TCP = true
|
||||||
server.IPs = []net.IP{entryIP}
|
server.IPs = []net.IP{entryIP}
|
||||||
} else {
|
} else {
|
||||||
server.IPs = append(server.IPs, entryIP)
|
server.IPs = append(server.IPs, entryIP)
|
||||||
|
|||||||
@@ -41,6 +41,8 @@ func GetServers(ctx context.Context, client *http.Client, minServers int) (
|
|||||||
}
|
}
|
||||||
server := models.Server{
|
server := models.Server{
|
||||||
VPN: vpn.OpenVPN,
|
VPN: vpn.OpenVPN,
|
||||||
|
TCP: true,
|
||||||
|
UDP: true,
|
||||||
Region: region,
|
Region: region,
|
||||||
City: city,
|
City: city,
|
||||||
Hostname: node.Hostname,
|
Hostname: node.Hostname,
|
||||||
@@ -56,6 +58,8 @@ func GetServers(ctx context.Context, client *http.Client, minServers int) (
|
|||||||
}
|
}
|
||||||
|
|
||||||
server.VPN = vpn.Wireguard
|
server.VPN = vpn.Wireguard
|
||||||
|
server.UDP = true
|
||||||
|
server.TCP = false
|
||||||
server.OvpnX509 = ""
|
server.OvpnX509 = ""
|
||||||
server.WgPubKey = wgPubKey
|
server.WgPubKey = wgPubKey
|
||||||
server.IPs = []net.IP{node.IP3}
|
server.IPs = []net.IP{node.IP3}
|
||||||
|
|||||||
Reference in New Issue
Block a user