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

chore(constants): internal/constants/vpn package

Browse Source
This commit is contained in:
Quentin McGaw
2022-04-18 09:15:20 +00:00
parent d51514015f
commit 934fafb64b
25 changed files with 193 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/updater/providers/ivpn/servers.go
View File

@@ -8,7 +8,7 @@ import (
"fmt"
"net/http"
"github.com/qdm12/gluetun/internal/constants"
"github.com/qdm12/gluetun/internal/constants/vpn"
"github.com/qdm12/gluetun/internal/models"
"github.com/qdm12/gluetun/internal/updater/resolver"
)
@@ -51,12 +51,12 @@ func GetServers(ctx context.Context, client *http.Client,
servers = make([]models.Server, 0, len(hosts))
for _, serverData := range data.Servers {
vpnType := constants.OpenVPN
vpnType := vpn.OpenVPN
hostname := serverData.Hostnames.OpenVPN
tcp := true
wgPubKey := ""
if hostname == "" {
vpnType = constants.Wireguard
vpnType = vpn.Wireguard
hostname = serverData.Hostnames.Wireguard
tcp = false
wgPubKey = serverData.WgPubKey

8
internal/updater/providers/ivpn/servers_test.go
View File

@@ -10,7 +10,7 @@ import (
"testing"
"github.com/golang/mock/gomock"
"github.com/qdm12/gluetun/internal/constants"
"github.com/qdm12/gluetun/internal/constants/vpn"
"github.com/qdm12/gluetun/internal/models"
"github.com/qdm12/gluetun/internal/updater/resolver"
"github.com/qdm12/gluetun/internal/updater/resolver/mock_resolver"
@@ -85,13 +85,13 @@ func Test_GetServers(t *testing.T) {
},
resolveWarnings: []string{"resolve warning"},
servers: []models.Server{
{VPN: constants.OpenVPN, Country: "Country1",
{VPN: vpn.OpenVPN, Country: "Country1",
City: "City A", Hostname: "hosta", TCP: true, UDP: true,
IPs: []net.IP{{1, 1, 1, 1}, {2, 2, 2, 2}}},
{VPN: constants.OpenVPN, Country: "Country2",
{VPN: vpn.OpenVPN, Country: "Country2",
City: "City B", Hostname: "hostb", TCP: true, UDP: true,
IPs: []net.IP{{3, 3, 3, 3}, {4, 4, 4, 4}}},
{VPN: constants.Wireguard,
{VPN: vpn.Wireguard,
Country: "Country3", City: "City C",
Hostname: "hostc", UDP: true,
WgPubKey: "xyz",

6
internal/updater/providers/mullvad/hosttoserver.go
View File

@@ -6,7 +6,7 @@ import (
"net"
"strings"
"github.com/qdm12/gluetun/internal/constants"
"github.com/qdm12/gluetun/internal/constants/vpn"
"github.com/qdm12/gluetun/internal/models"
)
@@ -35,9 +35,9 @@ func (hts hostToServer) add(data serverData) (err error) {
switch data.Type {
case "openvpn":
server.VPN = constants.OpenVPN
server.VPN = vpn.OpenVPN
case "wireguard":
server.VPN = constants.Wireguard
server.VPN = vpn.Wireguard
case "bridge":
// ignore bridge servers
return nil

6
internal/updater/providers/windscribe/servers.go
View File

@@ -9,7 +9,7 @@ import (
"net"
"net/http"
"github.com/qdm12/gluetun/internal/constants"
"github.com/qdm12/gluetun/internal/constants/vpn"
"github.com/qdm12/gluetun/internal/models"
)
@@ -40,7 +40,7 @@ func GetServers(ctx context.Context, client *http.Client, minServers int) (
ips = append(ips, node.IP2)
}
server := models.Server{
VPN: constants.OpenVPN,
VPN: vpn.OpenVPN,
Region: region,
City: city,
Hostname: node.Hostname,
@@ -55,7 +55,7 @@ func GetServers(ctx context.Context, client *http.Client, minServers int) (
return nil, fmt.Errorf("%w: for node %s", ErrNoWireguardKey, node.Hostname)
}
server.VPN = constants.Wireguard
server.VPN = vpn.Wireguard
server.OvpnX509 = ""
server.WgPubKey = wgPubKey
server.IPs = []net.IP{node.IP3}