Refactor (#174)
- Goal was to simplify main.go complexity - Use common structures and interfaces for all vpn providers - Moved files around - Removed some alias models
This commit is contained in:
Quentin McGaw
@@ -2,6 +2,7 @@ package constants
|
||||
|
||||
import (
|
||||
"net"
|
||||
"sort"
|
||||
|
||||
"github.com/qdm12/private-internet-access-docker/internal/models"
|
||||
)
|
||||
@@ -13,37 +14,46 @@ const (
|
||||
func MullvadCountryChoices() (choices []string) {
|
||||
uniqueChoices := map[string]struct{}{}
|
||||
for _, server := range mullvadServers() {
|
||||
uniqueChoices[string(server.Country)] = struct{}{}
|
||||
uniqueChoices[server.Country] = struct{}{}
|
||||
}
|
||||
for choice := range uniqueChoices {
|
||||
choices = append(choices, choice)
|
||||
}
|
||||
sort.Slice(choices, func(i, j int) bool {
|
||||
return choices[i] < choices[j]
|
||||
})
|
||||
return choices
|
||||
}
|
||||
|
||||
func MullvadCityChoices() (choices []string) {
|
||||
uniqueChoices := map[string]struct{}{}
|
||||
for _, server := range mullvadServers() {
|
||||
uniqueChoices[string(server.City)] = struct{}{}
|
||||
uniqueChoices[server.City] = struct{}{}
|
||||
}
|
||||
for choice := range uniqueChoices {
|
||||
choices = append(choices, choice)
|
||||
}
|
||||
sort.Slice(choices, func(i, j int) bool {
|
||||
return choices[i] < choices[j]
|
||||
})
|
||||
return choices
|
||||
}
|
||||
|
||||
func MullvadProviderChoices() (choices []string) {
|
||||
func MullvadISPChoices() (choices []string) {
|
||||
uniqueChoices := map[string]struct{}{}
|
||||
for _, server := range mullvadServers() {
|
||||
uniqueChoices[string(server.Provider)] = struct{}{}
|
||||
uniqueChoices[server.ISP] = struct{}{}
|
||||
}
|
||||
for choice := range uniqueChoices {
|
||||
choices = append(choices, choice)
|
||||
}
|
||||
sort.Slice(choices, func(i, j int) bool {
|
||||
return choices[i] < choices[j]
|
||||
})
|
||||
return choices
|
||||
}
|
||||
|
||||
func MullvadServerFilter(country models.MullvadCountry, city models.MullvadCity, provider models.MullvadProvider) (servers []models.MullvadServer) {
|
||||
func MullvadServerFilter(country, city, isp string) (servers []models.MullvadServer) {
|
||||
for _, server := range mullvadServers() {
|
||||
if len(country) == 0 {
|
||||
server.Country = ""
|
||||
@@ -51,10 +61,10 @@ func MullvadServerFilter(country models.MullvadCountry, city models.MullvadCity,
|
||||
if len(city) == 0 {
|
||||
server.City = ""
|
||||
}
|
||||
if len(provider) == 0 {
|
||||
server.Provider = ""
|
||||
if len(isp) == 0 {
|
||||
server.ISP = ""
|
||||
}
|
||||
if server.Country == country && server.City == city && server.Provider == provider {
|
||||
if server.Country == country && server.City == city && server.ISP == isp {
|
||||
servers = append(servers, server)
|
||||
}
|
||||
}
|
||||
@@ -64,602 +74,602 @@ func MullvadServerFilter(country models.MullvadCountry, city models.MullvadCity,
|
||||
func mullvadServers() []models.MullvadServer {
|
||||
return []models.MullvadServer{
|
||||
{
|
||||
Country: models.MullvadCountry("united arab emirates"),
|
||||
City: models.MullvadCity("dubai"),
|
||||
Provider: models.MullvadProvider("m247"),
|
||||
Country: "united arab emirates",
|
||||
City: "dubai",
|
||||
ISP: "m247",
|
||||
IPs: []net.IP{{45, 9, 249, 34}},
|
||||
DefaultPort: 1194,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("albania"),
|
||||
City: models.MullvadCity("tirana"),
|
||||
Provider: models.MullvadProvider("iregister"),
|
||||
Country: "albania",
|
||||
City: "tirana",
|
||||
ISP: "iregister",
|
||||
IPs: []net.IP{{31, 171, 154, 210}},
|
||||
DefaultPort: 1197,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("austria"),
|
||||
City: models.MullvadCity("wien"),
|
||||
Provider: models.MullvadProvider("m247"),
|
||||
Country: "austria",
|
||||
City: "wien",
|
||||
ISP: "m247",
|
||||
IPs: []net.IP{{37, 120, 155, 250}, {217, 64, 127, 138}, {217, 64, 127, 202}},
|
||||
DefaultPort: 1196,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("australia"),
|
||||
City: models.MullvadCity("adelaide"),
|
||||
Provider: models.MullvadProvider("intergrid"),
|
||||
Country: "australia",
|
||||
City: "adelaide",
|
||||
ISP: "intergrid",
|
||||
IPs: []net.IP{{116, 206, 231, 58}},
|
||||
DefaultPort: 1300,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("australia"),
|
||||
City: models.MullvadCity("brisbane"),
|
||||
Provider: models.MullvadProvider("intergrid"),
|
||||
Country: "australia",
|
||||
City: "brisbane",
|
||||
ISP: "intergrid",
|
||||
IPs: []net.IP{{43, 245, 160, 162}},
|
||||
DefaultPort: 1300,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("australia"),
|
||||
City: models.MullvadCity("canberra"),
|
||||
Provider: models.MullvadProvider("intergrid"),
|
||||
Country: "australia",
|
||||
City: "canberra",
|
||||
ISP: "intergrid",
|
||||
IPs: []net.IP{{116, 206, 229, 98}},
|
||||
DefaultPort: 1300,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("australia"),
|
||||
City: models.MullvadCity("melbourne"),
|
||||
Provider: models.MullvadProvider("intergrid"),
|
||||
Country: "australia",
|
||||
City: "melbourne",
|
||||
ISP: "intergrid",
|
||||
IPs: []net.IP{{116, 206, 228, 202}, {116, 206, 228, 242}, {116, 206, 230, 98}},
|
||||
DefaultPort: 1300,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("australia"),
|
||||
City: models.MullvadCity("perth"),
|
||||
Provider: models.MullvadProvider("intergrid"),
|
||||
Country: "australia",
|
||||
City: "perth",
|
||||
ISP: "intergrid",
|
||||
IPs: []net.IP{{103, 77, 235, 66}},
|
||||
DefaultPort: 1300,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("australia"),
|
||||
City: models.MullvadCity("sydney"),
|
||||
Provider: models.MullvadProvider("intergrid"),
|
||||
Country: "australia",
|
||||
City: "sydney",
|
||||
ISP: "intergrid",
|
||||
IPs: []net.IP{{43, 245, 162, 130}, {103, 77, 232, 130}, {103, 77, 232, 146}},
|
||||
DefaultPort: 1300,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("australia"),
|
||||
City: models.MullvadCity("sydney"),
|
||||
Provider: models.MullvadProvider("m247"),
|
||||
Country: "australia",
|
||||
City: "sydney",
|
||||
ISP: "m247",
|
||||
IPs: []net.IP{{217, 138, 204, 82}, {217, 138, 204, 98}, {217, 138, 204, 66}},
|
||||
DefaultPort: 1300,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("belgium"),
|
||||
City: models.MullvadCity("brussels"),
|
||||
Provider: models.MullvadProvider("m247"),
|
||||
Country: "belgium",
|
||||
City: "brussels",
|
||||
ISP: "m247",
|
||||
IPs: []net.IP{{37, 120, 218, 146}, {37, 120, 218, 138}, {91, 207, 57, 50}, {37, 120, 143, 138}, {185, 104, 186, 202}},
|
||||
DefaultPort: 1300,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("bulgaria"),
|
||||
City: models.MullvadCity("sofia"),
|
||||
Provider: models.MullvadProvider("m247"),
|
||||
Country: "bulgaria",
|
||||
City: "sofia",
|
||||
ISP: "m247",
|
||||
IPs: []net.IP{{185, 94, 192, 42}, {185, 94, 192, 66}},
|
||||
DefaultPort: 1300,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("brazil"),
|
||||
City: models.MullvadCity("sao paulo"),
|
||||
Provider: models.MullvadProvider("qnax"),
|
||||
Country: "brazil",
|
||||
City: "sao paulo",
|
||||
ISP: "qnax",
|
||||
IPs: []net.IP{{191, 101, 62, 178}},
|
||||
DefaultPort: 1301,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("brazil"),
|
||||
City: models.MullvadCity("sao paulo"),
|
||||
Provider: models.MullvadProvider("heficed"),
|
||||
Country: "brazil",
|
||||
City: "sao paulo",
|
||||
ISP: "heficed",
|
||||
IPs: []net.IP{{177, 67, 80, 186}},
|
||||
DefaultPort: 1300,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("canada"),
|
||||
City: models.MullvadCity("montreal"),
|
||||
Provider: models.MullvadProvider("m247"),
|
||||
Country: "canada",
|
||||
City: "montreal",
|
||||
ISP: "m247",
|
||||
IPs: []net.IP{{139, 28, 218, 114}, {217, 138, 200, 194}, {217, 138, 200, 186}, {87, 101, 92, 146}, {176, 113, 74, 178}, {37, 120, 205, 114}, {87, 101, 92, 138}, {37, 120, 205, 122}, {217, 138, 200, 210}, {217, 138, 200, 202}},
|
||||
DefaultPort: 1300,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("canada"),
|
||||
City: models.MullvadCity("toronto"),
|
||||
Provider: models.MullvadProvider("amanah"),
|
||||
Country: "canada",
|
||||
City: "toronto",
|
||||
ISP: "amanah",
|
||||
IPs: []net.IP{{184, 75, 214, 130}, {162, 219, 176, 250}},
|
||||
DefaultPort: 1300,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("canada"),
|
||||
City: models.MullvadCity("vancouver"),
|
||||
Provider: models.MullvadProvider("100tb"),
|
||||
Country: "canada",
|
||||
City: "vancouver",
|
||||
ISP: "100tb",
|
||||
IPs: []net.IP{{172, 83, 40, 34}, {172, 83, 40, 38}},
|
||||
DefaultPort: 1300,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("canada"),
|
||||
City: models.MullvadCity("vancouver"),
|
||||
Provider: models.MullvadProvider("esecuredata"),
|
||||
Country: "canada",
|
||||
City: "vancouver",
|
||||
ISP: "esecuredata",
|
||||
IPs: []net.IP{{71, 19, 249, 81}, {176, 113, 74, 186}, {71, 19, 248, 240}},
|
||||
DefaultPort: 1300,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("switzerland"),
|
||||
City: models.MullvadCity("zurich"),
|
||||
Provider: models.MullvadProvider("31173"),
|
||||
Country: "switzerland",
|
||||
City: "zurich",
|
||||
ISP: "31173",
|
||||
IPs: []net.IP{{193, 32, 127, 82}, {193, 32, 127, 81}, {193, 32, 127, 83}, {193, 32, 127, 84}},
|
||||
Owned: true,
|
||||
DefaultPort: 1301,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("zwitzerland"),
|
||||
City: models.MullvadCity("zurich"),
|
||||
Provider: models.MullvadProvider("m247"),
|
||||
Country: "zwitzerland",
|
||||
City: "zurich",
|
||||
ISP: "m247",
|
||||
IPs: []net.IP{{185, 212, 170, 50}, {185, 183, 104, 82}, {185, 9, 18, 98}, {82, 102, 24, 130}, {82, 102, 24, 186}, {185, 212, 170, 162}, {185, 9, 18, 114}},
|
||||
DefaultPort: 1301,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("switzerland"),
|
||||
City: models.MullvadCity("zurich"),
|
||||
Provider: models.MullvadProvider("privateLayer"),
|
||||
Country: "switzerland",
|
||||
City: "zurich",
|
||||
ISP: "privateLayer",
|
||||
IPs: []net.IP{{179, 43, 128, 170}, {81, 17, 20, 34}},
|
||||
DefaultPort: 1301,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("czech republic"),
|
||||
City: models.MullvadCity("prague"),
|
||||
Provider: models.MullvadProvider("m247"),
|
||||
Country: "czech republic",
|
||||
City: "prague",
|
||||
ISP: "m247",
|
||||
IPs: []net.IP{{217, 138, 199, 82}, {217, 138, 199, 74}},
|
||||
DefaultPort: 1197,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("germany"),
|
||||
City: models.MullvadCity("frankfurt"),
|
||||
Provider: models.MullvadProvider("31173"),
|
||||
Country: "germany",
|
||||
City: "frankfurt",
|
||||
ISP: "31173",
|
||||
IPs: []net.IP{{185, 213, 155, 132}, {185, 213, 155, 140}, {185, 213, 155, 136}, {185, 213, 155, 133}, {185, 213, 155, 144}, {185, 213, 155, 143}, {185, 213, 155, 138}, {185, 213, 155, 142}, {185, 213, 155, 139}, {185, 213, 155, 135}, {185, 213, 155, 145}, {185, 213, 155, 137}, {185, 213, 155, 131}, {185, 213, 155, 134}, {185, 213, 155, 141}},
|
||||
Owned: true,
|
||||
DefaultPort: 1197,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("germany"),
|
||||
City: models.MullvadCity("frankfurt"),
|
||||
Provider: models.MullvadProvider("m247"),
|
||||
Country: "germany",
|
||||
City: "frankfurt",
|
||||
ISP: "m247",
|
||||
IPs: []net.IP{{82, 102, 16, 90}, {185, 104, 184, 186}, {77, 243, 183, 202}},
|
||||
DefaultPort: 1197,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("denmark"),
|
||||
City: models.MullvadCity("copenhagen"),
|
||||
Provider: models.MullvadProvider("31173"),
|
||||
Country: "denmark",
|
||||
City: "copenhagen",
|
||||
ISP: "31173",
|
||||
IPs: []net.IP{{141, 98, 254, 71}, {141, 98, 254, 72}},
|
||||
Owned: true,
|
||||
DefaultPort: 1195,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("denmark"),
|
||||
City: models.MullvadCity("copenhagen"),
|
||||
Provider: models.MullvadProvider("m247"),
|
||||
Country: "denmark",
|
||||
City: "copenhagen",
|
||||
ISP: "m247",
|
||||
IPs: []net.IP{{185, 206, 224, 114}, {185, 206, 224, 119}},
|
||||
DefaultPort: 1195,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("denmark"),
|
||||
City: models.MullvadCity("copenhagen"),
|
||||
Provider: models.MullvadProvider("blix"),
|
||||
Country: "denmark",
|
||||
City: "copenhagen",
|
||||
ISP: "blix",
|
||||
IPs: []net.IP{{134, 90, 149, 138}},
|
||||
DefaultPort: 1195,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("denmark"),
|
||||
City: models.MullvadCity("copenhagen"),
|
||||
Provider: models.MullvadProvider("asergo"),
|
||||
Country: "denmark",
|
||||
City: "copenhagen",
|
||||
ISP: "asergo",
|
||||
IPs: []net.IP{{82, 103, 140, 213}},
|
||||
DefaultPort: 1195,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("spain"),
|
||||
City: models.MullvadCity("madrid"),
|
||||
Provider: models.MullvadProvider("m247"),
|
||||
Country: "spain",
|
||||
City: "madrid",
|
||||
ISP: "m247",
|
||||
IPs: []net.IP{{195, 206, 107, 146}, {45, 152, 183, 42}, {89, 238, 178, 74}, {45, 152, 183, 26}, {89, 238, 178, 34}},
|
||||
DefaultPort: 1195,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("finland"),
|
||||
City: models.MullvadCity("helsinki"),
|
||||
Provider: models.MullvadProvider("creanova"),
|
||||
Country: "finland",
|
||||
City: "helsinki",
|
||||
ISP: "creanova",
|
||||
IPs: []net.IP{{185, 204, 1, 174}, {185, 204, 1, 176}, {185, 212, 149, 201}, {185, 204, 1, 175}, {185, 204, 1, 173}, {185, 204, 1, 172}, {185, 204, 1, 171}},
|
||||
Owned: true,
|
||||
DefaultPort: 1196,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("france"),
|
||||
City: models.MullvadCity("paris"),
|
||||
Provider: models.MullvadProvider("31173"),
|
||||
Country: "france",
|
||||
City: "paris",
|
||||
ISP: "31173",
|
||||
IPs: []net.IP{{193, 32, 126, 83}, {193, 32, 126, 82}, {193, 32, 126, 81}, {193, 32, 126, 84}},
|
||||
Owned: true,
|
||||
DefaultPort: 1301,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("france"),
|
||||
City: models.MullvadCity("paris"),
|
||||
Provider: models.MullvadProvider("m247"),
|
||||
Country: "france",
|
||||
City: "paris",
|
||||
ISP: "m247",
|
||||
IPs: []net.IP{{185, 189, 113, 82}, {185, 156, 173, 218}, {185, 128, 25, 162}},
|
||||
DefaultPort: 1301,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("uk"),
|
||||
City: models.MullvadCity("london"),
|
||||
Provider: models.MullvadProvider("31173"),
|
||||
Country: "uk",
|
||||
City: "london",
|
||||
ISP: "31173",
|
||||
IPs: []net.IP{{141, 98, 252, 133}, {141, 98, 252, 139}, {141, 98, 252, 137}, {141, 98, 252, 143}, {141, 98, 252, 142}, {141, 98, 252, 132}, {141, 98, 252, 134}, {141, 98, 252, 140}, {141, 98, 252, 141}, {141, 98, 252, 136}, {141, 98, 252, 144}, {141, 98, 252, 131}, {141, 98, 252, 135}, {141, 98, 252, 138}},
|
||||
Owned: true,
|
||||
DefaultPort: 1196,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("uk"),
|
||||
City: models.MullvadCity("london"),
|
||||
Provider: models.MullvadProvider("m247"),
|
||||
Country: "uk",
|
||||
City: "london",
|
||||
ISP: "m247",
|
||||
IPs: []net.IP{{185, 200, 118, 105}, {185, 212, 168, 244}},
|
||||
DefaultPort: 1196,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("uk"),
|
||||
City: models.MullvadCity("manchester"),
|
||||
Provider: models.MullvadProvider("m247"),
|
||||
Country: "uk",
|
||||
City: "manchester",
|
||||
ISP: "m247",
|
||||
IPs: []net.IP{{89, 238, 130, 66}, {81, 92, 205, 10}, {89, 238, 130, 74}, {81, 92, 205, 18}, {81, 92, 205, 26}, {89, 238, 183, 244}, {89, 238, 132, 36}, {217, 151, 98, 68}, {37, 120, 159, 164}, {89, 238, 183, 60}},
|
||||
DefaultPort: 1196,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("greece"),
|
||||
City: models.MullvadCity("athens"),
|
||||
Provider: models.MullvadProvider("aweb"),
|
||||
Country: "greece",
|
||||
City: "athens",
|
||||
ISP: "aweb",
|
||||
IPs: []net.IP{{185, 226, 67, 168}},
|
||||
DefaultPort: 1302,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("hong kong"),
|
||||
City: models.MullvadCity("hong kong"),
|
||||
Provider: models.MullvadProvider("leaseweb"),
|
||||
Country: "hong kong",
|
||||
City: "hong kong",
|
||||
ISP: "leaseweb",
|
||||
IPs: []net.IP{{209, 58, 185, 53}, {209, 58, 184, 146}},
|
||||
DefaultPort: 1194,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("hungary"),
|
||||
City: models.MullvadCity("budapest"),
|
||||
Provider: models.MullvadProvider("m247"),
|
||||
Country: "hungary",
|
||||
City: "budapest",
|
||||
ISP: "m247",
|
||||
IPs: []net.IP{{185, 94, 190, 138}, {185, 189, 114, 10}},
|
||||
DefaultPort: 1300,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("ireland"),
|
||||
City: models.MullvadCity("dublin"),
|
||||
Provider: models.MullvadProvider("m247"),
|
||||
Country: "ireland",
|
||||
City: "dublin",
|
||||
ISP: "m247",
|
||||
IPs: []net.IP{{217, 138, 222, 90}, {217, 138, 222, 82}},
|
||||
DefaultPort: 1197,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("israel"),
|
||||
City: models.MullvadCity("tel aviv"),
|
||||
Provider: models.MullvadProvider("hqserv"),
|
||||
Country: "israel",
|
||||
City: "tel aviv",
|
||||
ISP: "hqserv",
|
||||
IPs: []net.IP{{185, 191, 207, 210}},
|
||||
DefaultPort: 1301,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("italy"),
|
||||
City: models.MullvadCity("milan"),
|
||||
Provider: models.MullvadProvider("m247"),
|
||||
Country: "italy",
|
||||
City: "milan",
|
||||
ISP: "m247",
|
||||
IPs: []net.IP{{217, 138, 197, 106}, {217, 64, 113, 180}, {217, 138, 197, 98}, {217, 138, 197, 114}, {217, 64, 113, 183}},
|
||||
DefaultPort: 1300,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("japan"),
|
||||
City: models.MullvadCity("tokyo"),
|
||||
Provider: models.MullvadProvider("m247"),
|
||||
Country: "japan",
|
||||
City: "tokyo",
|
||||
ISP: "m247",
|
||||
IPs: []net.IP{{37, 120, 210, 138}, {193, 148, 16, 218}, {37, 120, 210, 146}, {185, 242, 4, 50}, {37, 120, 210, 122}},
|
||||
DefaultPort: 1300,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("luxembourg"),
|
||||
City: models.MullvadCity("luxembourg"),
|
||||
Provider: models.MullvadProvider("evoluso"),
|
||||
Country: "luxembourg",
|
||||
City: "luxembourg",
|
||||
ISP: "evoluso",
|
||||
IPs: []net.IP{{92, 223, 89, 160}, {92, 223, 89, 182}},
|
||||
DefaultPort: 1301,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("latvia"),
|
||||
City: models.MullvadCity("riga"),
|
||||
Provider: models.MullvadProvider("makonix"),
|
||||
Country: "latvia",
|
||||
City: "riga",
|
||||
ISP: "makonix",
|
||||
IPs: []net.IP{{31, 170, 22, 2}},
|
||||
DefaultPort: 1300,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("moldova"),
|
||||
City: models.MullvadCity("chisinau"),
|
||||
Provider: models.MullvadProvider("trabia"),
|
||||
Country: "moldova",
|
||||
City: "chisinau",
|
||||
ISP: "trabia",
|
||||
IPs: []net.IP{{178, 175, 142, 194}},
|
||||
DefaultPort: 1197,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("netherlands"),
|
||||
City: models.MullvadCity("amsterdam"),
|
||||
Provider: models.MullvadProvider("31173"),
|
||||
Country: "netherlands",
|
||||
City: "amsterdam",
|
||||
ISP: "31173",
|
||||
IPs: []net.IP{{185, 65, 134, 139}, {185, 65, 134, 133}, {185, 65, 134, 148}, {185, 65, 134, 147}, {185, 65, 134, 141}, {185, 65, 134, 140}, {185, 65, 134, 145}, {185, 65, 134, 132}, {185, 65, 134, 146}, {185, 65, 134, 143}, {185, 65, 134, 134}, {185, 65, 134, 136}, {185, 65, 134, 135}, {185, 65, 134, 142}, {185, 65, 134, 144}},
|
||||
Owned: true,
|
||||
DefaultPort: 1194,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("norway"),
|
||||
City: models.MullvadCity("oslo"),
|
||||
Provider: models.MullvadProvider("blix"),
|
||||
Country: "norway",
|
||||
City: "oslo",
|
||||
ISP: "blix",
|
||||
IPs: []net.IP{{91, 90, 44, 13}, {91, 90, 44, 18}, {91, 90, 44, 12}, {91, 90, 44, 15}, {91, 90, 44, 16}, {91, 90, 44, 17}, {91, 90, 44, 14}, {91, 90, 44, 11}},
|
||||
Owned: true,
|
||||
DefaultPort: 1302,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("new zealand"),
|
||||
City: models.MullvadCity("auckland"),
|
||||
Provider: models.MullvadProvider("intergrid"),
|
||||
Country: "new zealand",
|
||||
City: "auckland",
|
||||
ISP: "intergrid",
|
||||
IPs: []net.IP{{103, 231, 91, 114}},
|
||||
DefaultPort: 1195,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("poland"),
|
||||
City: models.MullvadCity("warsaw"),
|
||||
Provider: models.MullvadProvider("m247"),
|
||||
Country: "poland",
|
||||
City: "warsaw",
|
||||
ISP: "m247",
|
||||
IPs: []net.IP{{37, 120, 211, 202}, {37, 120, 156, 162}, {185, 244, 214, 210}, {37, 120, 211, 186}, {185, 244, 214, 215}, {37, 120, 211, 194}},
|
||||
DefaultPort: 1194,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("portugal"),
|
||||
City: models.MullvadCity("lisbon"),
|
||||
Provider: models.MullvadProvider("dotsi"),
|
||||
Country: "portugal",
|
||||
City: "lisbon",
|
||||
ISP: "dotsi",
|
||||
IPs: []net.IP{{5, 206, 231, 214}},
|
||||
DefaultPort: 1194,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("romania"),
|
||||
City: models.MullvadCity("bucharest"),
|
||||
Provider: models.MullvadProvider("m247"),
|
||||
Country: "romania",
|
||||
City: "bucharest",
|
||||
ISP: "m247",
|
||||
IPs: []net.IP{{89, 40, 181, 146}, {185, 181, 100, 202}, {89, 40, 181, 82}, {185, 45, 13, 10}, {89, 40, 181, 210}},
|
||||
DefaultPort: 1301,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("serbia"),
|
||||
City: models.MullvadCity("belgrade"),
|
||||
Provider: models.MullvadProvider("m247"),
|
||||
Country: "serbia",
|
||||
City: "belgrade",
|
||||
ISP: "m247",
|
||||
IPs: []net.IP{{141, 98, 103, 50}},
|
||||
DefaultPort: 1301,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("serbia"),
|
||||
City: models.MullvadCity("nis"),
|
||||
Provider: models.MullvadProvider("ninet"),
|
||||
Country: "serbia",
|
||||
City: "nis",
|
||||
ISP: "ninet",
|
||||
IPs: []net.IP{{176, 104, 107, 118}},
|
||||
DefaultPort: 1301,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("sweden"),
|
||||
City: models.MullvadCity("gothenburg"),
|
||||
Provider: models.MullvadProvider("31173"),
|
||||
Country: "sweden",
|
||||
City: "gothenburg",
|
||||
ISP: "31173",
|
||||
IPs: []net.IP{{185, 213, 154, 139}, {185, 213, 154, 141}, {185, 213, 154, 140}, {185, 213, 154, 132}, {185, 213, 154, 135}, {185, 213, 154, 138}, {185, 213, 154, 133}, {185, 213, 154, 131}, {185, 213, 154, 134}, {185, 213, 154, 142}, {185, 213, 154, 137}},
|
||||
Owned: true,
|
||||
DefaultPort: 1302,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("sweden"),
|
||||
City: models.MullvadCity("helsingborg"),
|
||||
Provider: models.MullvadProvider("31173"),
|
||||
Country: "sweden",
|
||||
City: "helsingborg",
|
||||
ISP: "31173",
|
||||
IPs: []net.IP{{185, 213, 152, 133}, {185, 213, 152, 132}, {185, 213, 152, 138}, {185, 213, 152, 131}, {185, 213, 152, 137}},
|
||||
Owned: true,
|
||||
DefaultPort: 1302,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("sweden"),
|
||||
City: models.MullvadCity("malmo"),
|
||||
Provider: models.MullvadProvider("31173"),
|
||||
Country: "sweden",
|
||||
City: "malmo",
|
||||
ISP: "31173",
|
||||
IPs: []net.IP{{193, 138, 218, 138}, {45, 83, 220, 87}, {141, 98, 255, 94}, {141, 98, 255, 85}, {141, 98, 255, 87}, {141, 98, 255, 92}, {45, 83, 220, 84}, {141, 98, 255, 86}, {45, 83, 220, 81}, {193, 138, 218, 135}, {193, 138, 218, 131}, {193, 138, 218, 136}, {141, 98, 255, 88}, {141, 98, 255, 91}, {193, 138, 218, 133}, {45, 83, 220, 89}, {45, 83, 220, 88}, {141, 98, 255, 84}, {141, 98, 255, 89}, {193, 138, 218, 134}, {45, 83, 220, 86}, {141, 98, 255, 83}, {45, 83, 220, 85}, {141, 98, 255, 90}, {141, 98, 255, 93}, {193, 138, 218, 132}, {193, 138, 218, 137}, {45, 83, 220, 91}},
|
||||
Owned: true,
|
||||
DefaultPort: 1302,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("sweden"),
|
||||
City: models.MullvadCity("stockholm"),
|
||||
Provider: models.MullvadProvider("31173"),
|
||||
Country: "sweden",
|
||||
City: "stockholm",
|
||||
ISP: "31173",
|
||||
IPs: []net.IP{{185, 65, 135, 150}, {185, 65, 135, 153}, {185, 65, 135, 151}, {185, 65, 135, 149}, {185, 65, 135, 141}, {185, 65, 135, 144}, {185, 65, 135, 145}, {185, 65, 135, 140}, {185, 65, 135, 134}, {185, 65, 135, 139}, {185, 65, 135, 131}, {185, 65, 135, 152}, {185, 65, 135, 146}, {185, 65, 135, 138}, {185, 65, 135, 143}, {185, 65, 135, 135}, {185, 65, 135, 154}, {185, 65, 135, 136}, {185, 65, 135, 133}, {185, 65, 135, 132}},
|
||||
Owned: true,
|
||||
DefaultPort: 1302,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("singapore"),
|
||||
City: models.MullvadCity("singapore"),
|
||||
Provider: models.MullvadProvider("m247"),
|
||||
Country: "singapore",
|
||||
City: "singapore",
|
||||
ISP: "m247",
|
||||
IPs: []net.IP{{37, 120, 208, 218}, {37, 120, 208, 234}, {37, 120, 208, 226}, {185, 128, 24, 50}},
|
||||
DefaultPort: 1196,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("singapore"),
|
||||
City: models.MullvadCity("singapore"),
|
||||
Provider: models.MullvadProvider("leaseweb"),
|
||||
Country: "singapore",
|
||||
City: "singapore",
|
||||
ISP: "leaseweb",
|
||||
IPs: []net.IP{{103, 254, 153, 82}},
|
||||
DefaultPort: 1196,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("usa"),
|
||||
City: models.MullvadCity("atlanta"),
|
||||
Provider: models.MullvadProvider("100tb"),
|
||||
Country: "usa",
|
||||
City: "atlanta",
|
||||
ISP: "100tb",
|
||||
IPs: []net.IP{{208, 84, 153, 142}, {107, 152, 108, 62}},
|
||||
DefaultPort: 1194,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("usa"),
|
||||
City: models.MullvadCity("atlanta"),
|
||||
Provider: models.MullvadProvider("quadranet"),
|
||||
Country: "usa",
|
||||
City: "atlanta",
|
||||
ISP: "quadranet",
|
||||
IPs: []net.IP{{104, 129, 24, 242}},
|
||||
DefaultPort: 1194,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("usa"),
|
||||
City: models.MullvadCity("atlanta"),
|
||||
Provider: models.MullvadProvider("micfo"),
|
||||
Country: "usa",
|
||||
City: "atlanta",
|
||||
ISP: "micfo",
|
||||
IPs: []net.IP{{155, 254, 96, 2}, {155, 254, 96, 18}, {155, 254, 96, 34}}, // 1 missing
|
||||
DefaultPort: 1194,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("usa"),
|
||||
City: models.MullvadCity("chicago"),
|
||||
Provider: models.MullvadProvider("tzulo"),
|
||||
Country: "usa",
|
||||
City: "chicago",
|
||||
ISP: "tzulo",
|
||||
IPs: []net.IP{{68, 235, 43, 18}, {68, 235, 43, 26}, {68, 235, 43, 42}, {68, 235, 43, 50}, {68, 235, 43, 58}, {68, 235, 43, 66}, {68, 235, 43, 74}}, // 3 missing
|
||||
DefaultPort: 1194,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("usa"),
|
||||
City: models.MullvadCity("chicago"),
|
||||
Provider: models.MullvadProvider("quadranet"),
|
||||
Country: "usa",
|
||||
City: "chicago",
|
||||
ISP: "quadranet",
|
||||
IPs: []net.IP{}, // 1 missing
|
||||
DefaultPort: 1194,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("usa"),
|
||||
City: models.MullvadCity("dallas"),
|
||||
Provider: models.MullvadProvider("quadranet"),
|
||||
Country: "usa",
|
||||
City: "dallas",
|
||||
ISP: "quadranet",
|
||||
IPs: []net.IP{{96, 44, 145, 18}},
|
||||
DefaultPort: 1194,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("usa"),
|
||||
City: models.MullvadCity("dallas"),
|
||||
Provider: models.MullvadProvider("100tb"),
|
||||
Country: "usa",
|
||||
City: "dallas",
|
||||
ISP: "100tb",
|
||||
IPs: []net.IP{{104, 200, 142, 50}, {107, 152, 102, 106}},
|
||||
DefaultPort: 1194,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("usa"),
|
||||
City: models.MullvadCity("denver"),
|
||||
Provider: models.MullvadProvider("tzulo"),
|
||||
Country: "usa",
|
||||
City: "denver",
|
||||
ISP: "tzulo",
|
||||
IPs: []net.IP{{198, 54, 128, 74}}, // 1 missing
|
||||
DefaultPort: 1194,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("usa"),
|
||||
City: models.MullvadCity("los angeles"),
|
||||
Provider: models.MullvadProvider("m247"),
|
||||
Country: "usa",
|
||||
City: "los angeles",
|
||||
ISP: "m247",
|
||||
IPs: []net.IP{{45, 152, 182, 66}, {45, 152, 182, 74}, {45, 83, 89, 162}, {185, 230, 126, 146}}, // 7 missing
|
||||
DefaultPort: 1194,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("usa"),
|
||||
City: models.MullvadCity("los angeles"),
|
||||
Provider: models.MullvadProvider("tzulo"),
|
||||
Country: "usa",
|
||||
City: "los angeles",
|
||||
ISP: "tzulo",
|
||||
IPs: []net.IP{{198, 54, 129, 74}}, // 1 missing
|
||||
DefaultPort: 1194,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("usa"),
|
||||
City: models.MullvadCity("los angeles"),
|
||||
Provider: models.MullvadProvider("100tb"),
|
||||
Country: "usa",
|
||||
City: "los angeles",
|
||||
ISP: "100tb",
|
||||
IPs: []net.IP{{104, 200, 152, 66}, {107, 181, 168, 130}},
|
||||
DefaultPort: 1194,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("usa"),
|
||||
City: models.MullvadCity("los angeles"),
|
||||
Provider: models.MullvadProvider("choopa"),
|
||||
Country: "usa",
|
||||
City: "los angeles",
|
||||
ISP: "choopa",
|
||||
IPs: []net.IP{{104, 238, 143, 58}}, // 1 missing
|
||||
DefaultPort: 1194,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("usa"),
|
||||
City: models.MullvadCity("miami"),
|
||||
Provider: models.MullvadProvider("m247"),
|
||||
Country: "usa",
|
||||
City: "miami",
|
||||
ISP: "m247",
|
||||
IPs: []net.IP{{37, 120, 215, 130}, {193, 37, 252, 138}, {193, 37, 252, 154}, {37, 120, 215, 138}}, // 1 missing
|
||||
DefaultPort: 1194,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("usa"),
|
||||
City: models.MullvadCity("miami"),
|
||||
Provider: models.MullvadProvider("100tb"),
|
||||
Country: "usa",
|
||||
City: "miami",
|
||||
ISP: "100tb",
|
||||
IPs: []net.IP{{172, 98, 76, 114}},
|
||||
DefaultPort: 1194,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("usa"),
|
||||
City: models.MullvadCity("miami"),
|
||||
Provider: models.MullvadProvider("micfo"),
|
||||
Country: "usa",
|
||||
City: "miami",
|
||||
ISP: "micfo",
|
||||
IPs: []net.IP{}, // 1 missing
|
||||
DefaultPort: 1194,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("usa"),
|
||||
City: models.MullvadCity("new york"),
|
||||
Provider: models.MullvadProvider("m247"),
|
||||
Country: "usa",
|
||||
City: "new york",
|
||||
ISP: "m247",
|
||||
IPs: []net.IP{{185, 232, 22, 66}, {185, 232, 22, 98}, {193, 148, 18, 250}, {185, 232, 22, 10}, {217, 138, 206, 10}, {193, 148, 18, 218}, {193, 148, 18, 226}, {193, 148, 18, 194}, {87, 101, 95, 98}, {87, 101, 95, 114}, {87, 101, 95, 122}, {212, 103, 48, 226}, {176, 113, 72, 226}, {217, 138, 198, 250}, {217, 138, 206, 58}}, // 5 missing
|
||||
DefaultPort: 1194,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("usa"),
|
||||
City: models.MullvadCity("new york"),
|
||||
Provider: models.MullvadProvider("100tb"),
|
||||
Country: "usa",
|
||||
City: "new york",
|
||||
ISP: "100tb",
|
||||
IPs: []net.IP{{107, 182, 226, 206}, {107, 182, 226, 218}},
|
||||
DefaultPort: 1194,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("usa"),
|
||||
City: models.MullvadCity("phoenix"),
|
||||
Provider: models.MullvadProvider("100tb"),
|
||||
Country: "usa",
|
||||
City: "phoenix",
|
||||
ISP: "100tb",
|
||||
IPs: []net.IP{}, // 1 missing
|
||||
DefaultPort: 1194,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("usa"),
|
||||
City: models.MullvadCity("phoenix"),
|
||||
Provider: models.MullvadProvider("micfo"),
|
||||
Country: "usa",
|
||||
City: "phoenix",
|
||||
ISP: "micfo",
|
||||
IPs: []net.IP{{192, 200, 24, 82}}, // 1 missing
|
||||
DefaultPort: 1194,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("usa"),
|
||||
City: models.MullvadCity("piscataway"),
|
||||
Provider: models.MullvadProvider("choopa"),
|
||||
Country: "usa",
|
||||
City: "piscataway",
|
||||
ISP: "choopa",
|
||||
IPs: []net.IP{{108, 61, 78, 138}, {108, 61, 48, 115}, {66, 55, 147, 59}},
|
||||
DefaultPort: 1194,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("usa"),
|
||||
City: models.MullvadCity("seattle"),
|
||||
Provider: models.MullvadProvider("100tb"),
|
||||
Country: "usa",
|
||||
City: "seattle",
|
||||
ISP: "100tb",
|
||||
IPs: []net.IP{{104, 200, 129, 202}, {104, 200, 129, 150}, {104, 200, 129, 110}}, // 1 missing
|
||||
DefaultPort: 1194,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("usa"),
|
||||
City: models.MullvadCity("seattle"),
|
||||
Provider: models.MullvadProvider("micfo"),
|
||||
Country: "usa",
|
||||
City: "seattle",
|
||||
ISP: "micfo",
|
||||
IPs: []net.IP{{104, 128, 136, 146}},
|
||||
DefaultPort: 1194,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("usa"),
|
||||
City: models.MullvadCity("san francisco"),
|
||||
Provider: models.MullvadProvider("micfo"),
|
||||
Country: "usa",
|
||||
City: "san francisco",
|
||||
ISP: "micfo",
|
||||
IPs: []net.IP{{209, 209, 238, 34}}, // 1 missing
|
||||
DefaultPort: 1194,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("usa"),
|
||||
City: models.MullvadCity("salt lake city"),
|
||||
Provider: models.MullvadProvider("100tb"),
|
||||
Country: "usa",
|
||||
City: "salt lake city",
|
||||
ISP: "100tb",
|
||||
IPs: []net.IP{{107, 182, 238, 229}, {107, 182, 235, 233}, {67, 212, 238, 236}, {67, 212, 238, 237}, {67, 212, 238, 239}, {107, 182, 239, 185}, {107, 182, 239, 170}}, // 2 missing
|
||||
DefaultPort: 1194,
|
||||
},
|
||||
{
|
||||
Country: models.MullvadCountry("usa"),
|
||||
City: models.MullvadCity("secaucus"),
|
||||
Provider: models.MullvadProvider("quadranet"),
|
||||
Country: "usa",
|
||||
City: "secaucus",
|
||||
ISP: "quadranet",
|
||||
IPs: []net.IP{{23, 226, 131, 154}}, // 1 missing
|
||||
DefaultPort: 1194,
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user