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

Mullvad servers do not have a default port

Browse Source 
- Refers to #218
- Checks for custom port value depending on protocol
- Remove default port from server constants
- Use 443 and 1194 ports respectively for tcp and udp
This commit is contained in:
Quentin McGaw
2020-08-24 01:53:24 +00:00
parent 7e3e6f166a
commit 6fc2b3dd21
5 changed files with 375 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -120,7 +120,7 @@ Want more testing? ▶ [see the Wiki](https://github.com/qdm12/gluetun/wiki/Test
| `COUNTRY` | | One of the [Mullvad countries](https://mullvad.net/en/servers/#openvpn) | VPN server country | | `COUNTRY` | | One of the [Mullvad countries](https://mullvad.net/en/servers/#openvpn) | VPN server country |
| `CITY` | | One of the [Mullvad cities](https://mullvad.net/en/servers/#openvpn) | VPN server city | | `CITY` | | One of the [Mullvad cities](https://mullvad.net/en/servers/#openvpn) | VPN server city |
| `ISP` | | One of the [Mullvad ISP](https://mullvad.net/en/servers/#openvpn) | VPN server ISP | | `ISP` | | One of the [Mullvad ISP](https://mullvad.net/en/servers/#openvpn) | VPN server ISP |
| `PORT` | | `80` or `443` for TCP; or `53` for UDP. Leave blank for default Mullvad server port | Custom VPN port to use | | `PORT` | | `80`, `443` or `1401` for TCP; `53`, `1194`, `1195`, `1196`, `1197`, `1300`, `1301`, `1302`, `1303` or `1400` for UDP. Defaults to TCP `443` and UDP `1194` | Custom VPN port to use |
- Windscribe - Windscribe

780
internal/constants/mullvad.go
View File

@@ -56,604 +56,520 @@ func MullvadISPChoices() (choices []string) {
func MullvadServers() []models.MullvadServer { func MullvadServers() []models.MullvadServer {
return []models.MullvadServer{ return []models.MullvadServer{
{ {
Country: "united arab emirates", Country: "united arab emirates",
City: "dubai", City: "dubai",
ISP: "m247", ISP: "m247",
IPs: []net.IP{{45, 9, 249, 34}}, IPs: []net.IP{{45, 9, 249, 34}},
DefaultPort: 1194,
}, },
{ {
Country: "albania", Country: "albania",
City: "tirana", City: "tirana",
ISP: "iregister", ISP: "iregister",
IPs: []net.IP{{31, 171, 154, 210}}, IPs: []net.IP{{31, 171, 154, 210}},
DefaultPort: 1197,
}, },
{ {
Country: "austria", Country: "austria",
City: "wien", City: "wien",
ISP: "m247", ISP: "m247",
IPs: []net.IP{{37, 120, 155, 250}, {217, 64, 127, 138}, {217, 64, 127, 202}}, IPs: []net.IP{{37, 120, 155, 250}, {217, 64, 127, 138}, {217, 64, 127, 202}},
DefaultPort: 1196,
}, },
{ {
Country: "australia", Country: "australia",
City: "adelaide", City: "adelaide",
ISP: "intergrid", ISP: "intergrid",
IPs: []net.IP{{116, 206, 231, 58}}, IPs: []net.IP{{116, 206, 231, 58}},
DefaultPort: 1300,
}, },
{ {
Country: "australia", Country: "australia",
City: "brisbane", City: "brisbane",
ISP: "intergrid", ISP: "intergrid",
IPs: []net.IP{{43, 245, 160, 162}}, IPs: []net.IP{{43, 245, 160, 162}},
DefaultPort: 1300,
}, },
{ {
Country: "australia", Country: "australia",
City: "canberra", City: "canberra",
ISP: "intergrid", ISP: "intergrid",
IPs: []net.IP{{116, 206, 229, 98}}, IPs: []net.IP{{116, 206, 229, 98}},
DefaultPort: 1300,
}, },
{ {
Country: "australia", Country: "australia",
City: "melbourne", City: "melbourne",
ISP: "intergrid", ISP: "intergrid",
IPs: []net.IP{{116, 206, 228, 202}, {116, 206, 228, 242}, {116, 206, 230, 98}}, IPs: []net.IP{{116, 206, 228, 202}, {116, 206, 228, 242}, {116, 206, 230, 98}},
DefaultPort: 1300,
}, },
{ {
Country: "australia", Country: "australia",
City: "perth", City: "perth",
ISP: "intergrid", ISP: "intergrid",
IPs: []net.IP{{103, 77, 235, 66}}, IPs: []net.IP{{103, 77, 235, 66}},
DefaultPort: 1300,
}, },
{ {
Country: "australia", Country: "australia",
City: "sydney", City: "sydney",
ISP: "intergrid", ISP: "intergrid",
IPs: []net.IP{{43, 245, 162, 130}, {103, 77, 232, 130}, {103, 77, 232, 146}}, IPs: []net.IP{{43, 245, 162, 130}, {103, 77, 232, 130}, {103, 77, 232, 146}},
DefaultPort: 1300,
}, },
{ {
Country: "australia", Country: "australia",
City: "sydney", City: "sydney",
ISP: "m247", ISP: "m247",
IPs: []net.IP{{217, 138, 204, 82}, {217, 138, 204, 98}, {217, 138, 204, 66}}, IPs: []net.IP{{217, 138, 204, 82}, {217, 138, 204, 98}, {217, 138, 204, 66}},
DefaultPort: 1300,
}, },
{ {
Country: "belgium", Country: "belgium",
City: "brussels", City: "brussels",
ISP: "m247", 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}}, 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: "bulgaria", Country: "bulgaria",
City: "sofia", City: "sofia",
ISP: "m247", ISP: "m247",
IPs: []net.IP{{185, 94, 192, 42}, {185, 94, 192, 66}}, IPs: []net.IP{{185, 94, 192, 42}, {185, 94, 192, 66}},
DefaultPort: 1300,
}, },
{ {
Country: "brazil", Country: "brazil",
City: "sao paulo", City: "sao paulo",
ISP: "qnax", ISP: "qnax",
IPs: []net.IP{{191, 101, 62, 178}}, IPs: []net.IP{{191, 101, 62, 178}},
DefaultPort: 1301,
}, },
{ {
Country: "brazil", Country: "brazil",
City: "sao paulo", City: "sao paulo",
ISP: "heficed", ISP: "heficed",
IPs: []net.IP{{177, 67, 80, 186}}, IPs: []net.IP{{177, 67, 80, 186}},
DefaultPort: 1300,
}, },
{ {
Country: "canada", Country: "canada",
City: "montreal", City: "montreal",
ISP: "m247", 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}}, 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: "canada", Country: "canada",
City: "toronto", City: "toronto",
ISP: "amanah", ISP: "amanah",
IPs: []net.IP{{184, 75, 214, 130}, {162, 219, 176, 250}}, IPs: []net.IP{{184, 75, 214, 130}, {162, 219, 176, 250}},
DefaultPort: 1300,
}, },
{ {
Country: "canada", Country: "canada",
City: "vancouver", City: "vancouver",
ISP: "100tb", ISP: "100tb",
IPs: []net.IP{{172, 83, 40, 34}, {172, 83, 40, 38}}, IPs: []net.IP{{172, 83, 40, 34}, {172, 83, 40, 38}},
DefaultPort: 1300,
}, },
{ {
Country: "canada", Country: "canada",
City: "vancouver", City: "vancouver",
ISP: "esecuredata", ISP: "esecuredata",
IPs: []net.IP{{71, 19, 249, 81}, {176, 113, 74, 186}, {71, 19, 248, 240}}, IPs: []net.IP{{71, 19, 249, 81}, {176, 113, 74, 186}, {71, 19, 248, 240}},
DefaultPort: 1300,
}, },
{ {
Country: "switzerland", Country: "switzerland",
City: "zurich", City: "zurich",
ISP: "31173", ISP: "31173",
IPs: []net.IP{{193, 32, 127, 82}, {193, 32, 127, 81}, {193, 32, 127, 83}, {193, 32, 127, 84}}, IPs: []net.IP{{193, 32, 127, 82}, {193, 32, 127, 81}, {193, 32, 127, 83}, {193, 32, 127, 84}},
Owned: true, Owned: true,
DefaultPort: 1301,
}, },
{ {
Country: "zwitzerland", Country: "zwitzerland",
City: "zurich", City: "zurich",
ISP: "m247", 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}}, 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: "switzerland", Country: "switzerland",
City: "zurich", City: "zurich",
ISP: "privateLayer", ISP: "privateLayer",
IPs: []net.IP{{179, 43, 128, 170}, {81, 17, 20, 34}}, IPs: []net.IP{{179, 43, 128, 170}, {81, 17, 20, 34}},
DefaultPort: 1301,
}, },
{ {
Country: "czech republic", Country: "czech republic",
City: "prague", City: "prague",
ISP: "m247", ISP: "m247",
IPs: []net.IP{{217, 138, 199, 82}, {217, 138, 199, 74}}, IPs: []net.IP{{217, 138, 199, 82}, {217, 138, 199, 74}},
DefaultPort: 1197,
}, },
{ {
Country: "germany", Country: "germany",
City: "frankfurt", City: "frankfurt",
ISP: "31173", 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}}, 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, Owned: true,
DefaultPort: 1197,
}, },
{ {
Country: "germany", Country: "germany",
City: "frankfurt", City: "frankfurt",
ISP: "m247", ISP: "m247",
IPs: []net.IP{{82, 102, 16, 90}, {185, 104, 184, 186}, {77, 243, 183, 202}}, IPs: []net.IP{{82, 102, 16, 90}, {185, 104, 184, 186}, {77, 243, 183, 202}},
DefaultPort: 1197,
}, },
{ {
Country: "denmark", Country: "denmark",
City: "copenhagen", City: "copenhagen",
ISP: "31173", ISP: "31173",
IPs: []net.IP{{141, 98, 254, 71}, {141, 98, 254, 72}}, IPs: []net.IP{{141, 98, 254, 71}, {141, 98, 254, 72}},
Owned: true, Owned: true,
DefaultPort: 1195,
}, },
{ {
Country: "denmark", Country: "denmark",
City: "copenhagen", City: "copenhagen",
ISP: "m247", ISP: "m247",
IPs: []net.IP{{185, 206, 224, 114}, {185, 206, 224, 119}}, IPs: []net.IP{{185, 206, 224, 114}, {185, 206, 224, 119}},
DefaultPort: 1195,
}, },
{ {
Country: "denmark", Country: "denmark",
City: "copenhagen", City: "copenhagen",
ISP: "blix", ISP: "blix",
IPs: []net.IP{{134, 90, 149, 138}}, IPs: []net.IP{{134, 90, 149, 138}},
DefaultPort: 1195,
}, },
{ {
Country: "denmark", Country: "denmark",
City: "copenhagen", City: "copenhagen",
ISP: "asergo", ISP: "asergo",
IPs: []net.IP{{82, 103, 140, 213}}, IPs: []net.IP{{82, 103, 140, 213}},
DefaultPort: 1195,
}, },
{ {
Country: "spain", Country: "spain",
City: "madrid", City: "madrid",
ISP: "m247", 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}}, 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: "finland", Country: "finland",
City: "helsinki", City: "helsinki",
ISP: "creanova", 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}}, 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, Owned: true,
DefaultPort: 1196,
}, },
{ {
Country: "france", Country: "france",
City: "paris", City: "paris",
ISP: "31173", ISP: "31173",
IPs: []net.IP{{193, 32, 126, 83}, {193, 32, 126, 82}, {193, 32, 126, 81}, {193, 32, 126, 84}}, IPs: []net.IP{{193, 32, 126, 83}, {193, 32, 126, 82}, {193, 32, 126, 81}, {193, 32, 126, 84}},
Owned: true, Owned: true,
DefaultPort: 1301,
}, },
{ {
Country: "france", Country: "france",
City: "paris", City: "paris",
ISP: "m247", ISP: "m247",
IPs: []net.IP{{185, 189, 113, 82}, {185, 156, 173, 218}, {185, 128, 25, 162}}, IPs: []net.IP{{185, 189, 113, 82}, {185, 156, 173, 218}, {185, 128, 25, 162}},
DefaultPort: 1301,
}, },
{ {
Country: "uk", Country: "uk",
City: "london", City: "london",
ISP: "31173", 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}}, 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, Owned: true,
DefaultPort: 1196,
}, },
{ {
Country: "uk", Country: "uk",
City: "london", City: "london",
ISP: "m247", ISP: "m247",
IPs: []net.IP{{185, 200, 118, 105}, {185, 212, 168, 244}}, IPs: []net.IP{{185, 200, 118, 105}, {185, 212, 168, 244}},
DefaultPort: 1196,
}, },
{ {
Country: "uk", Country: "uk",
City: "manchester", City: "manchester",
ISP: "m247", 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}}, 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: "greece", Country: "greece",
City: "athens", City: "athens",
ISP: "aweb", ISP: "aweb",
IPs: []net.IP{{185, 226, 67, 168}}, IPs: []net.IP{{185, 226, 67, 168}},
DefaultPort: 1302,
}, },
{ {
Country: "hong kong", Country: "hong kong",
City: "hong kong", City: "hong kong",
ISP: "leaseweb", ISP: "leaseweb",
IPs: []net.IP{{209, 58, 185, 53}, {209, 58, 184, 146}}, IPs: []net.IP{{209, 58, 185, 53}, {209, 58, 184, 146}},
DefaultPort: 1194,
}, },
{ {
Country: "hungary", Country: "hungary",
City: "budapest", City: "budapest",
ISP: "m247", ISP: "m247",
IPs: []net.IP{{185, 94, 190, 138}, {185, 189, 114, 10}}, IPs: []net.IP{{185, 94, 190, 138}, {185, 189, 114, 10}},
DefaultPort: 1300,
}, },
{ {
Country: "ireland", Country: "ireland",
City: "dublin", City: "dublin",
ISP: "m247", ISP: "m247",
IPs: []net.IP{{217, 138, 222, 90}, {217, 138, 222, 82}}, IPs: []net.IP{{217, 138, 222, 90}, {217, 138, 222, 82}},
DefaultPort: 1197,
}, },
{ {
Country: "israel", Country: "israel",
City: "tel aviv", City: "tel aviv",
ISP: "hqserv", ISP: "hqserv",
IPs: []net.IP{{185, 191, 207, 210}}, IPs: []net.IP{{185, 191, 207, 210}},
DefaultPort: 1301,
}, },
{ {
Country: "italy", Country: "italy",
City: "milan", City: "milan",
ISP: "m247", 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}}, 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: "japan", Country: "japan",
City: "tokyo", City: "tokyo",
ISP: "m247", 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}}, 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: "luxembourg", Country: "luxembourg",
City: "luxembourg", City: "luxembourg",
ISP: "evoluso", ISP: "evoluso",
IPs: []net.IP{{92, 223, 89, 160}, {92, 223, 89, 182}}, IPs: []net.IP{{92, 223, 89, 160}, {92, 223, 89, 182}},
DefaultPort: 1301,
}, },
{ {
Country: "latvia", Country: "latvia",
City: "riga", City: "riga",
ISP: "makonix", ISP: "makonix",
IPs: []net.IP{{31, 170, 22, 2}}, IPs: []net.IP{{31, 170, 22, 2}},
DefaultPort: 1300,
}, },
{ {
Country: "moldova", Country: "moldova",
City: "chisinau", City: "chisinau",
ISP: "trabia", ISP: "trabia",
IPs: []net.IP{{178, 175, 142, 194}}, IPs: []net.IP{{178, 175, 142, 194}},
DefaultPort: 1197,
}, },
{ {
Country: "netherlands", Country: "netherlands",
City: "amsterdam", City: "amsterdam",
ISP: "31173", 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}}, 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, Owned: true,
DefaultPort: 1194,
}, },
{ {
Country: "norway", Country: "norway",
City: "oslo", City: "oslo",
ISP: "blix", 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}}, 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, Owned: true,
DefaultPort: 1302,
}, },
{ {
Country: "new zealand", Country: "new zealand",
City: "auckland", City: "auckland",
ISP: "intergrid", ISP: "intergrid",
IPs: []net.IP{{103, 231, 91, 114}}, IPs: []net.IP{{103, 231, 91, 114}},
DefaultPort: 1195,
}, },
{ {
Country: "poland", Country: "poland",
City: "warsaw", City: "warsaw",
ISP: "m247", 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}}, 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: "portugal", Country: "portugal",
City: "lisbon", City: "lisbon",
ISP: "dotsi", ISP: "dotsi",
IPs: []net.IP{{5, 206, 231, 214}}, IPs: []net.IP{{5, 206, 231, 214}},
DefaultPort: 1194,
}, },
{ {
Country: "romania", Country: "romania",
City: "bucharest", City: "bucharest",
ISP: "m247", 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}}, 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: "serbia", Country: "serbia",
City: "belgrade", City: "belgrade",
ISP: "m247", ISP: "m247",
IPs: []net.IP{{141, 98, 103, 50}}, IPs: []net.IP{{141, 98, 103, 50}},
DefaultPort: 1301,
}, },
{ {
Country: "serbia", Country: "serbia",
City: "nis", City: "nis",
ISP: "ninet", ISP: "ninet",
IPs: []net.IP{{176, 104, 107, 118}}, IPs: []net.IP{{176, 104, 107, 118}},
DefaultPort: 1301,
}, },
{ {
Country: "sweden", Country: "sweden",
City: "gothenburg", City: "gothenburg",
ISP: "31173", 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}}, 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, Owned: true,
DefaultPort: 1302,
}, },
{ {
Country: "sweden", Country: "sweden",
City: "helsingborg", City: "helsingborg",
ISP: "31173", 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}}, 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, Owned: true,
DefaultPort: 1302,
}, },
{ {
Country: "sweden", Country: "sweden",
City: "malmo", City: "malmo",
ISP: "31173", 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}}, 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, Owned: true,
DefaultPort: 1302,
}, },
{ {
Country: "sweden", Country: "sweden",
City: "stockholm", City: "stockholm",
ISP: "31173", 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}}, 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, Owned: true,
DefaultPort: 1302,
}, },
{ {
Country: "singapore", Country: "singapore",
City: "singapore", City: "singapore",
ISP: "m247", ISP: "m247",
IPs: []net.IP{{37, 120, 208, 218}, {37, 120, 208, 234}, {37, 120, 208, 226}, {185, 128, 24, 50}}, IPs: []net.IP{{37, 120, 208, 218}, {37, 120, 208, 234}, {37, 120, 208, 226}, {185, 128, 24, 50}},
DefaultPort: 1196,
}, },
{ {
Country: "singapore", Country: "singapore",
City: "singapore", City: "singapore",
ISP: "leaseweb", ISP: "leaseweb",
IPs: []net.IP{{103, 254, 153, 82}}, IPs: []net.IP{{103, 254, 153, 82}},
DefaultPort: 1196,
}, },
{ {
Country: "usa", Country: "usa",
City: "atlanta", City: "atlanta",
ISP: "100tb", ISP: "100tb",
IPs: []net.IP{{208, 84, 153, 142}, {107, 152, 108, 62}}, IPs: []net.IP{{208, 84, 153, 142}, {107, 152, 108, 62}},
DefaultPort: 1194,
}, },
{ {
Country: "usa", Country: "usa",
City: "atlanta", City: "atlanta",
ISP: "quadranet", ISP: "quadranet",
IPs: []net.IP{{104, 129, 24, 242}}, IPs: []net.IP{{104, 129, 24, 242}},
DefaultPort: 1194,
}, },
{ {
Country: "usa", Country: "usa",
City: "atlanta", City: "atlanta",
ISP: "micfo", ISP: "micfo",
IPs: []net.IP{{155, 254, 96, 2}, {155, 254, 96, 18}, {155, 254, 96, 34}}, // 1 missing IPs: []net.IP{{155, 254, 96, 2}, {155, 254, 96, 18}, {155, 254, 96, 34}}, // 1 missing
DefaultPort: 1194,
}, },
{ {
Country: "usa", Country: "usa",
City: "chicago", City: "chicago",
ISP: "tzulo", 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 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: "usa", Country: "usa",
City: "chicago", City: "chicago",
ISP: "quadranet", ISP: "quadranet",
IPs: []net.IP{}, // 1 missing IPs: []net.IP{}, // 1 missing
DefaultPort: 1194,
}, },
{ {
Country: "usa", Country: "usa",
City: "dallas", City: "dallas",
ISP: "quadranet", ISP: "quadranet",
IPs: []net.IP{{96, 44, 145, 18}}, IPs: []net.IP{{96, 44, 145, 18}},
DefaultPort: 1194,
}, },
{ {
Country: "usa", Country: "usa",
City: "dallas", City: "dallas",
ISP: "100tb", ISP: "100tb",
IPs: []net.IP{{104, 200, 142, 50}, {107, 152, 102, 106}}, IPs: []net.IP{{104, 200, 142, 50}, {107, 152, 102, 106}},
DefaultPort: 1194,
}, },
{ {
Country: "usa", Country: "usa",
City: "denver", City: "denver",
ISP: "tzulo", ISP: "tzulo",
IPs: []net.IP{{198, 54, 128, 74}}, // 1 missing IPs: []net.IP{{198, 54, 128, 74}}, // 1 missing
DefaultPort: 1194,
}, },
{ {
Country: "usa", Country: "usa",
City: "los angeles", City: "los angeles",
ISP: "m247", ISP: "m247",
IPs: []net.IP{{45, 152, 182, 66}, {45, 152, 182, 74}, {45, 83, 89, 162}, {185, 230, 126, 146}}, // 7 missing IPs: []net.IP{{45, 152, 182, 66}, {45, 152, 182, 74}, {45, 83, 89, 162}, {185, 230, 126, 146}}, // 7 missing
DefaultPort: 1194,
}, },
{ {
Country: "usa", Country: "usa",
City: "los angeles", City: "los angeles",
ISP: "tzulo", ISP: "tzulo",
IPs: []net.IP{{198, 54, 129, 74}}, // 1 missing IPs: []net.IP{{198, 54, 129, 74}}, // 1 missing
DefaultPort: 1194,
}, },
{ {
Country: "usa", Country: "usa",
City: "los angeles", City: "los angeles",
ISP: "100tb", ISP: "100tb",
IPs: []net.IP{{104, 200, 152, 66}, {107, 181, 168, 130}}, IPs: []net.IP{{104, 200, 152, 66}, {107, 181, 168, 130}},
DefaultPort: 1194,
}, },
{ {
Country: "usa", Country: "usa",
City: "los angeles", City: "los angeles",
ISP: "choopa", ISP: "choopa",
IPs: []net.IP{{104, 238, 143, 58}}, // 1 missing IPs: []net.IP{{104, 238, 143, 58}}, // 1 missing
DefaultPort: 1194,
}, },
{ {
Country: "usa", Country: "usa",
City: "miami", City: "miami",
ISP: "m247", ISP: "m247",
IPs: []net.IP{{37, 120, 215, 130}, {193, 37, 252, 138}, {193, 37, 252, 154}, {37, 120, 215, 138}}, // 1 missing IPs: []net.IP{{37, 120, 215, 130}, {193, 37, 252, 138}, {193, 37, 252, 154}, {37, 120, 215, 138}}, // 1 missing
DefaultPort: 1194,
}, },
{ {
Country: "usa", Country: "usa",
City: "miami", City: "miami",
ISP: "100tb", ISP: "100tb",
IPs: []net.IP{{172, 98, 76, 114}}, IPs: []net.IP{{172, 98, 76, 114}},
DefaultPort: 1194,
}, },
{ {
Country: "usa", Country: "usa",
City: "miami", City: "miami",
ISP: "micfo", ISP: "micfo",
IPs: []net.IP{}, // 1 missing IPs: []net.IP{}, // 1 missing
DefaultPort: 1194,
}, },
{ {
Country: "usa", Country: "usa",
City: "new york", City: "new york",
ISP: "m247", 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 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: "usa", Country: "usa",
City: "new york", City: "new york",
ISP: "100tb", ISP: "100tb",
IPs: []net.IP{{107, 182, 226, 206}, {107, 182, 226, 218}}, IPs: []net.IP{{107, 182, 226, 206}, {107, 182, 226, 218}},
DefaultPort: 1194,
}, },
{ {
Country: "usa", Country: "usa",
City: "phoenix", City: "phoenix",
ISP: "100tb", ISP: "100tb",
IPs: []net.IP{}, // 1 missing IPs: []net.IP{}, // 1 missing
DefaultPort: 1194,
}, },
{ {
Country: "usa", Country: "usa",
City: "phoenix", City: "phoenix",
ISP: "micfo", ISP: "micfo",
IPs: []net.IP{{192, 200, 24, 82}}, // 1 missing IPs: []net.IP{{192, 200, 24, 82}}, // 1 missing
DefaultPort: 1194,
}, },
{ {
Country: "usa", Country: "usa",
City: "piscataway", City: "piscataway",
ISP: "choopa", ISP: "choopa",
IPs: []net.IP{{108, 61, 78, 138}, {108, 61, 48, 115}, {66, 55, 147, 59}}, IPs: []net.IP{{108, 61, 78, 138}, {108, 61, 48, 115}, {66, 55, 147, 59}},
DefaultPort: 1194,
}, },
{ {
Country: "usa", Country: "usa",
City: "seattle", City: "seattle",
ISP: "100tb", ISP: "100tb",
IPs: []net.IP{{104, 200, 129, 202}, {104, 200, 129, 150}, {104, 200, 129, 110}}, // 1 missing IPs: []net.IP{{104, 200, 129, 202}, {104, 200, 129, 150}, {104, 200, 129, 110}}, // 1 missing
DefaultPort: 1194,
}, },
{ {
Country: "usa", Country: "usa",
City: "seattle", City: "seattle",
ISP: "micfo", ISP: "micfo",
IPs: []net.IP{{104, 128, 136, 146}}, IPs: []net.IP{{104, 128, 136, 146}},
DefaultPort: 1194,
}, },
{ {
Country: "usa", Country: "usa",
City: "san francisco", City: "san francisco",
ISP: "micfo", ISP: "micfo",
IPs: []net.IP{{209, 209, 238, 34}}, // 1 missing IPs: []net.IP{{209, 209, 238, 34}}, // 1 missing
DefaultPort: 1194,
}, },
{ {
Country: "usa", Country: "usa",
City: "salt lake city", City: "salt lake city",
ISP: "100tb", 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 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: "usa", Country: "usa",
City: "secaucus", City: "secaucus",
ISP: "quadranet", ISP: "quadranet",
IPs: []net.IP{{23, 226, 131, 154}}, // 1 missing IPs: []net.IP{{23, 226, 131, 154}}, // 1 missing
DefaultPort: 1194,
}, },
} }
} }

11
internal/models/servers.go
View File

@@ -8,12 +8,11 @@ type PIAServer struct {
} }
type MullvadServer struct { type MullvadServer struct {
IPs []net.IP IPs []net.IP
Country string Country string
City string City string
ISP string ISP string
Owned bool Owned bool
DefaultPort uint16
} }
type WindscribeServer struct { type WindscribeServer struct {

7
internal/provider/mullvad.go
View File

@@ -42,8 +42,13 @@ func (m *mullvad) GetOpenVPNConnections(selection models.ServerSelection) (conne
return nil, fmt.Errorf("no server found for country %q, city %q and ISP %q", selection.Country, selection.City, selection.ISP) return nil, fmt.Errorf("no server found for country %q, city %q and ISP %q", selection.Country, selection.City, selection.ISP)
} }
var defaultPort uint16 = 1194
if selection.Protocol == constants.TCP {
defaultPort = 443
}
for _, server := range servers { for _, server := range servers {
port := server.DefaultPort port := defaultPort
if selection.CustomPort > 0 { if selection.CustomPort > 0 {
port = selection.CustomPort port = selection.CustomPort
} }

15
internal/settings/providers.go
View File

@@ -1,6 +1,8 @@
package settings package settings
import ( import (
"fmt"
"github.com/qdm12/gluetun/internal/constants" "github.com/qdm12/gluetun/internal/constants"
"github.com/qdm12/gluetun/internal/models" "github.com/qdm12/gluetun/internal/models"
"github.com/qdm12/gluetun/internal/params" "github.com/qdm12/gluetun/internal/params"
@@ -67,6 +69,19 @@ func GetMullvadSettings(paramsReader params.Reader) (settings models.ProviderSet
if err != nil { if err != nil {
return settings, err return settings, err
} }
if settings.ServerSelection.Protocol == constants.TCP {
switch settings.ServerSelection.CustomPort {
case 0, 80, 443, 1401:
default:
return settings, fmt.Errorf("port %d is not valid for TCP protocol", settings.ServerSelection.CustomPort)
}
} else {
switch settings.ServerSelection.CustomPort {
case 0, 53, 1194, 1195, 1196, 1197, 1300, 1301, 1302, 1303, 1400:
default:
return settings, fmt.Errorf("port %d is not valid for UDP protocol", settings.ServerSelection.CustomPort)
}
}
return settings, nil return settings, nil
} }