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

HotFix: IVPN add TCP and UDP fields

Browse Source
This commit is contained in:
Quentin McGaw (desktop)
2021-05-31 00:41:44 +00:00
parent 3c3cd431cd
commit 9be912e9fd
5 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
internal/constants/ivpn.go
View File

@@ -43,48 +43,48 @@ func IvpnHostnameChoices() (choices []string) {
// IvpnServers returns a slice of all the server information for Ivpn. // IvpnServers returns a slice of all the server information for Ivpn.
func IvpnServers() []models.IvpnServer { func IvpnServers() []models.IvpnServer {
return []models.IvpnServer{ return []models.IvpnServer{
{Country: "Australia", City: "", Hostname: "au-nsw.gw.ivpn.net", IPs: []net.IP{{46, 102, 153, 242}}}, {Country: "Australia", City: "", Hostname: "au-nsw.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{46, 102, 153, 242}}},
{Country: "Austria", City: "", Hostname: "at.gw.ivpn.net", IPs: []net.IP{{185, 244, 212, 66}}}, {Country: "Austria", City: "", Hostname: "at.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{185, 244, 212, 66}}},
{Country: "Belgium", City: "", Hostname: "be.gw.ivpn.net", IPs: []net.IP{{194, 187, 251, 10}}}, {Country: "Belgium", City: "", Hostname: "be.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{194, 187, 251, 10}}},
{Country: "Brazil", City: "", Hostname: "br.gw.ivpn.net", IPs: []net.IP{{45, 162, 229, 130}}}, {Country: "Brazil", City: "", Hostname: "br.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{45, 162, 229, 130}}},
{Country: "Canada", City: "Montreal", Hostname: "ca-qc.gw.ivpn.net", IPs: []net.IP{{87, 101, 92, 26}}}, {Country: "Canada", City: "Montreal", Hostname: "ca-qc.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{87, 101, 92, 26}}},
{Country: "Canada", City: "Toronto", Hostname: "ca.gw.ivpn.net", IPs: []net.IP{{104, 254, 90, 178}}}, {Country: "Canada", City: "Toronto", Hostname: "ca.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{104, 254, 90, 178}}},
{Country: "Czech Republic", City: "", Hostname: "cz.gw.ivpn.net", IPs: []net.IP{{195, 181, 160, 167}}}, {Country: "Czech Republic", City: "", Hostname: "cz.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{195, 181, 160, 167}}},
{Country: "Denmark", City: "", Hostname: "dk.gw.ivpn.net", IPs: []net.IP{{185, 245, 84, 226}}}, {Country: "Denmark", City: "", Hostname: "dk.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{185, 245, 84, 226}}},
{Country: "Finland", City: "", Hostname: "fi.gw.ivpn.net", IPs: []net.IP{{185, 112, 82, 12}}}, {Country: "Finland", City: "", Hostname: "fi.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{185, 112, 82, 12}}},
{Country: "France", City: "", Hostname: "fr.gw.ivpn.net", IPs: []net.IP{{185, 246, 211, 179}}}, {Country: "France", City: "", Hostname: "fr.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{185, 246, 211, 179}}},
{Country: "Germany", City: "", Hostname: "de.gw.ivpn.net", IPs: []net.IP{{178, 162, 211, 114}}}, {Country: "Germany", City: "", Hostname: "de.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{178, 162, 211, 114}}},
{Country: "Hong Kong", City: "", Hostname: "hk.gw.ivpn.net", IPs: []net.IP{{209, 58, 188, 13}}}, {Country: "Hong Kong", City: "", Hostname: "hk.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{209, 58, 188, 13}}},
{Country: "Hungary", City: "", Hostname: "hu.gw.ivpn.net", IPs: []net.IP{{185, 189, 114, 186}}}, {Country: "Hungary", City: "", Hostname: "hu.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{185, 189, 114, 186}}},
{Country: "Iceland", City: "", Hostname: "is.gw.ivpn.net", IPs: []net.IP{{82, 221, 107, 178}}}, {Country: "Iceland", City: "", Hostname: "is.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{82, 221, 107, 178}}},
{Country: "Israel", City: "", Hostname: "il.gw.ivpn.net", IPs: []net.IP{{185, 191, 207, 194}}}, {Country: "Israel", City: "", Hostname: "il.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{185, 191, 207, 194}}},
{Country: "Italy", City: "", Hostname: "it.gw.ivpn.net", IPs: []net.IP{{158, 58, 172, 73}}}, {Country: "Italy", City: "", Hostname: "it.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{158, 58, 172, 73}}},
{Country: "Japan", City: "", Hostname: "jp.gw.ivpn.net", IPs: []net.IP{{91, 207, 174, 234}}}, {Country: "Japan", City: "", Hostname: "jp.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{91, 207, 174, 234}}},
{Country: "Luxembourg", City: "", Hostname: "lu.gw.ivpn.net", IPs: []net.IP{{92, 223, 89, 53}}}, {Country: "Luxembourg", City: "", Hostname: "lu.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{92, 223, 89, 53}}},
{Country: "Netherlands", City: "", Hostname: "nl.gw.ivpn.net", IPs: []net.IP{{95, 211, 172, 95}}}, {Country: "Netherlands", City: "", Hostname: "nl.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{95, 211, 172, 95}}},
{Country: "Norway", City: "", Hostname: "no.gw.ivpn.net", IPs: []net.IP{{194, 242, 10, 150}}}, {Country: "Norway", City: "", Hostname: "no.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{194, 242, 10, 150}}},
{Country: "Poland", City: "", Hostname: "pl.gw.ivpn.net", IPs: []net.IP{{185, 246, 208, 86}}}, {Country: "Poland", City: "", Hostname: "pl.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{185, 246, 208, 86}}},
{Country: "Portugal", City: "", Hostname: "pt.gw.ivpn.net", IPs: []net.IP{{94, 46, 175, 112}}}, {Country: "Portugal", City: "", Hostname: "pt.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{94, 46, 175, 112}}},
{Country: "Romania", City: "", Hostname: "ro.gw.ivpn.net", IPs: []net.IP{{37, 120, 206, 50}}}, {Country: "Romania", City: "", Hostname: "ro.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{37, 120, 206, 50}}},
{Country: "Serbia", City: "", Hostname: "rs.gw.ivpn.net", IPs: []net.IP{{141, 98, 103, 250}}}, {Country: "Serbia", City: "", Hostname: "rs.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{141, 98, 103, 250}}},
{Country: "Singapore", City: "", Hostname: "sg.gw.ivpn.net", IPs: []net.IP{{185, 128, 24, 186}}}, {Country: "Singapore", City: "", Hostname: "sg.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{185, 128, 24, 186}}},
{Country: "Slovakia", City: "", Hostname: "sk.gw.ivpn.net", IPs: []net.IP{{185, 245, 85, 250}}}, {Country: "Slovakia", City: "", Hostname: "sk.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{185, 245, 85, 250}}},
{Country: "Sweden", City: "", Hostname: "se.gw.ivpn.net", IPs: []net.IP{{80, 67, 10, 138}}}, {Country: "Sweden", City: "", Hostname: "se.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{80, 67, 10, 138}}},
{Country: "Switzerland", City: "", Hostname: "ch.gw.ivpn.net", IPs: []net.IP{{185, 212, 170, 138}}}, {Country: "Switzerland", City: "", Hostname: "ch.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{185, 212, 170, 138}}},
{Country: "USA", City: "Atlanta", Hostname: "us-ga.gw.ivpn.net", IPs: []net.IP{{104, 129, 24, 146}}}, {Country: "USA", City: "Atlanta", Hostname: "us-ga.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{104, 129, 24, 146}}},
{Country: "USA", City: "Chicago", Hostname: "us-il.gw.ivpn.net", IPs: []net.IP{{72, 11, 137, 146}}}, {Country: "USA", City: "Chicago", Hostname: "us-il.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{72, 11, 137, 146}}},
{Country: "USA", City: "Dallas", Hostname: "us-tx.gw.ivpn.net", IPs: []net.IP{{96, 44, 189, 194}}}, {Country: "USA", City: "Dallas", Hostname: "us-tx.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{96, 44, 189, 194}}},
{Country: "USA", City: "Las Vegas", Hostname: "us-nv.gw.ivpn.net", IPs: []net.IP{{185, 242, 5, 34}}}, {Country: "USA", City: "Las Vegas", Hostname: "us-nv.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{185, 242, 5, 34}}},
{Country: "USA", City: "Los Angeles", Hostname: "us-ca.gw.ivpn.net", IPs: []net.IP{{69, 12, 80, 146}}}, {Country: "USA", City: "Los Angeles", Hostname: "us-ca.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{69, 12, 80, 146}}},
{Country: "USA", City: "Miami", Hostname: "us-fl.gw.ivpn.net", IPs: []net.IP{{173, 44, 49, 90}}}, {Country: "USA", City: "Miami", Hostname: "us-fl.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{173, 44, 49, 90}}},
{Country: "USA", City: "New Jersey", Hostname: "us-nj.gw.ivpn.net", IPs: []net.IP{{23, 226, 128, 18}}}, {Country: "USA", City: "New Jersey", Hostname: "us-nj.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{23, 226, 128, 18}}},
{Country: "USA", City: "New York", Hostname: "us-ny.gw.ivpn.net", IPs: []net.IP{{64, 120, 44, 114}}}, {Country: "USA", City: "New York", Hostname: "us-ny.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{64, 120, 44, 114}}},
{Country: "USA", City: "Phoenix", Hostname: "us-az.gw.ivpn.net", IPs: []net.IP{{193, 37, 254, 130}}}, {Country: "USA", City: "Phoenix", Hostname: "us-az.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{193, 37, 254, 130}}},
{Country: "USA", City: "Salt Lake City", Hostname: "us-ut.gw.ivpn.net", IPs: []net.IP{{198, 105, 216, 28}}}, {Country: "USA", City: "Salt Lake City", Hostname: "us-ut.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{198, 105, 216, 28}}},
{Country: "USA", City: "Seattle", Hostname: "us-wa.gw.ivpn.net", IPs: []net.IP{{23, 19, 87, 209}}}, {Country: "USA", City: "Seattle", Hostname: "us-wa.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{23, 19, 87, 209}}},
{Country: "USA", City: "Washington", Hostname: "us-dc.gw.ivpn.net", IPs: []net.IP{{207, 244, 108, 207}}}, {Country: "USA", City: "Washington", Hostname: "us-dc.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{207, 244, 108, 207}}},
{Country: "Ukraine", City: "", Hostname: "ua.gw.ivpn.net", IPs: []net.IP{{193, 203, 48, 54}}}, {Country: "Ukraine", City: "", Hostname: "ua.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{193, 203, 48, 54}}},
{Country: "United Kingdom", City: "London", Hostname: "gb.gw.ivpn.net", IPs: []net.IP{{185, 59, 221, 133}, {185, 59, 221, 88}}}, {Country: "United Kingdom", City: "London", Hostname: "gb.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{185, 59, 221, 133}, {185, 59, 221, 88}}},
{Country: "United Kingdom", City: "Manchester", Hostname: "gb-man.gw.ivpn.net", IPs: []net.IP{{89, 238, 141, 228}}}, {Country: "United Kingdom", City: "Manchester", Hostname: "gb-man.gw.ivpn.net", TCP: false, UDP: true, IPs: []net.IP{{89, 238, 141, 228}}},
} }
} }

2
internal/constants/servers.go
View File

@@ -23,7 +23,7 @@ func GetAllServers() (allServers models.AllServers) {
}, },
Ivpn: models.IvpnServers{ Ivpn: models.IvpnServers{
Version: 1, Version: 1,
Timestamp: 1622406883, Timestamp: 1622421364,
Servers: IvpnServers(), Servers: IvpnServers(),
}, },
Mullvad: models.MullvadServers{ Mullvad: models.MullvadServers{

2
internal/constants/servers_test.go
View File

@@ -165,7 +165,7 @@ func Test_timestamps(t *testing.T) {
"Ivpn": { "Ivpn": {
servers: allServers.Ivpn.Servers, servers: allServers.Ivpn.Servers,
timestamp: allServers.Ivpn.Timestamp, timestamp: allServers.Ivpn.Timestamp,
digest: "a648c5f1", digest: "158630c0",
}, },
"Mullvad": { "Mullvad": {
servers: allServers.Mullvad.Servers, servers: allServers.Mullvad.Servers,

4
internal/models/server.go
View File

@@ -57,8 +57,8 @@ type IvpnServer struct {
} }
func (s *IvpnServer) String() string { func (s *IvpnServer) String() string {
return fmt.Sprintf("{Country: %q, City: %q, Hostname: %q, IPs: %s}", return fmt.Sprintf("{Country: %q, City: %q, Hostname: %q, TCP: %t, UDP: %t, IPs: %s}",
s.Country, s.City, s.Hostname, goStringifyIPs(s.IPs)) s.Country, s.City, s.Hostname, s.TCP, s.UDP, goStringifyIPs(s.IPs))
} }
type MullvadServer struct { type MullvadServer struct {

4
internal/updater/providers/ivpn/string_test.go
View File

@@ -26,8 +26,8 @@ func Test_Stringify(t *testing.T) {
}, },
s: `func IvpnServers() []models.IvpnServer { s: `func IvpnServers() []models.IvpnServer {
return []models.IvpnServer{ return []models.IvpnServer{
{Country: "A", City: "", Hostname: "", IPs: []net.IP{}}, {Country: "A", City: "", Hostname: "", TCP: false, UDP: false, IPs: []net.IP{}},
{Country: "B", City: "", Hostname: "", IPs: []net.IP{}}, {Country: "B", City: "", Hostname: "", TCP: false, UDP: false, IPs: []net.IP{}},
} }
}`, }`,
}, },