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

Maint: deduplicate ProtonVPN servers by entry IP

Browse Source
This commit is contained in:
Quentin McGaw (desktop)
2021-09-30 15:23:18 +00:00
parent 1d25a0e18c
commit a432de95a9
7 changed files with 3158 additions and 8865 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/models/getservers.go
View File

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

2
internal/models/getservers_test.go
View File

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

14
internal/models/server.go
View File

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