admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(protonvpn): remove unused exit IPs field

Browse Source
This commit is contained in:
Quentin McGaw
2022-03-16 09:44:57 +00:00
parent c3a231e0ab
commit acdbe2163e
6 changed files with 1254 additions and 4531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
internal/models/getservers.go
View File

@@ -181,7 +181,6 @@ func (a *AllServers) GetProtonvpn() (servers []ProtonvpnServer) {
for i, serverToCopy := range a.Protonvpn.Servers { for i, serverToCopy := range a.Protonvpn.Servers {
servers[i] = serverToCopy servers[i] = serverToCopy
servers[i].EntryIP = copyIP(serverToCopy.EntryIP) servers[i].EntryIP = copyIP(serverToCopy.EntryIP)
servers[i].ExitIPs = copyIPs(serverToCopy.ExitIPs)
} }
return servers return servers
} }

1
internal/models/getservers_test.go
View File

@@ -74,7 +74,6 @@ func Test_AllServers_GetCopy(t *testing.T) {
Protonvpn: ProtonvpnServers{ Protonvpn: ProtonvpnServers{
Servers: []ProtonvpnServer{{ Servers: []ProtonvpnServer{{
EntryIP: net.IP{1, 2, 3, 4}, EntryIP: net.IP{1, 2, 3, 4},
ExitIPs: []net.IP{{1, 2, 3, 4}},
}}, }},
}, },
Purevpn: PurevpnServers{ Purevpn: PurevpnServers{

13
internal/models/server.go
View File

@@ -114,13 +114,12 @@ type PrivatevpnServer struct {
} }
type ProtonvpnServer struct { type ProtonvpnServer struct {
Country string `json:"country,omitempty"` Country string `json:"country,omitempty"`
Region string `json:"region,omitempty"` Region string `json:"region,omitempty"`
City string `json:"city,omitempty"` City string `json:"city,omitempty"`
Name string `json:"name,omitempty"` Name string `json:"name,omitempty"`
Hostname string `json:"hostname,omitempty"` Hostname string `json:"hostname,omitempty"`
EntryIP net.IP `json:"entry_ip,omitempty"` EntryIP net.IP `json:"entry_ip,omitempty"`
ExitIPs []net.IP `json:"exit_ip,omitempty"` // TODO verify it matches with public IP once connected
} }
type PurevpnServer struct { type PurevpnServer struct {

5762
internal/storage/servers.json
View File

File diff suppressed because it is too large Load Diff

5
internal/updater/providers/protonvpn/iptoserver.go
View File

@@ -9,7 +9,7 @@ import (
type ipToServer map[string]models.ProtonvpnServer type ipToServer map[string]models.ProtonvpnServer
func (its ipToServer) add(country, region, city, name, hostname string, func (its ipToServer) add(country, region, city, name, hostname string,
entryIP, exitIP net.IP) { entryIP net.IP) {
key := entryIP.String() key := entryIP.String()
server, ok := its[key] server, ok := its[key]
@@ -20,9 +20,6 @@ func (its ipToServer) add(country, region, city, name, hostname string,
server.Name = name server.Name = name
server.Hostname = hostname server.Hostname = hostname
server.EntryIP = entryIP server.EntryIP = entryIP
server.ExitIPs = []net.IP{exitIP}
} else {
server.ExitIPs = append(server.ExitIPs, exitIP)
} }
its[key] = server its[key] = server

3
internal/updater/providers/protonvpn/servers.go
View File

@@ -47,7 +47,6 @@ func GetServers(ctx context.Context, client *http.Client, minServers int) (
hostname := physicalServer.Domain hostname := physicalServer.Domain
entryIP := physicalServer.EntryIP entryIP := physicalServer.EntryIP
exitIP := physicalServer.ExitIP
// Note: for multi-hop use the server name or hostname // Note: for multi-hop use the server name or hostname
// instead of the country // instead of the country
@@ -57,7 +56,7 @@ func GetServers(ctx context.Context, client *http.Client, minServers int) (
warnings = append(warnings, warning) warnings = append(warnings, warning)
} }
ipToServer.add(country, region, city, name, hostname, entryIP, exitIP) ipToServer.add(country, region, city, name, hostname, entryIP)
} }
} }