From e37f557cd51f8d52155f2b716a312bc0a22da080 Mon Sep 17 00:00:00 2001 From: Quentin McGaw Date: Tue, 7 Jun 2022 16:58:08 +0000 Subject: [PATCH] chore(provider): add `Name()` method per provider --- internal/provider/custom/provider.go | 4 ++++ internal/provider/cyberghost/connection.go | 3 +-- internal/provider/cyberghost/provider.go | 4 ++++ internal/provider/expressvpn/connection.go | 3 +-- internal/provider/expressvpn/provider.go | 4 ++++ internal/provider/fastestvpn/connection.go | 3 +-- internal/provider/fastestvpn/provider.go | 4 ++++ internal/provider/hidemyass/connection.go | 3 +-- internal/provider/hidemyass/provider.go | 4 ++++ internal/provider/ipvanish/connection.go | 3 +-- internal/provider/ipvanish/provider.go | 4 ++++ internal/provider/ivpn/connection.go | 3 +-- internal/provider/ivpn/provider.go | 4 ++++ internal/provider/mullvad/connection.go | 3 +-- internal/provider/mullvad/provider.go | 4 ++++ internal/provider/nordvpn/connection.go | 3 +-- internal/provider/nordvpn/provider.go | 4 ++++ internal/provider/perfectprivacy/connection.go | 3 +-- internal/provider/perfectprivacy/provider.go | 4 ++++ internal/provider/privado/connection.go | 3 +-- internal/provider/privado/provider.go | 4 ++++ internal/provider/privateinternetaccess/connection.go | 3 +-- internal/provider/privateinternetaccess/provider.go | 5 +++++ internal/provider/privatevpn/connection.go | 3 +-- internal/provider/privatevpn/provider.go | 4 ++++ internal/provider/protonvpn/connection.go | 3 +-- internal/provider/protonvpn/provider.go | 4 ++++ internal/provider/provider.go | 1 + internal/provider/purevpn/connection.go | 3 +-- internal/provider/purevpn/provider.go | 4 ++++ internal/provider/surfshark/connection.go | 3 +-- internal/provider/surfshark/provider.go | 4 ++++ internal/provider/torguard/connection.go | 3 +-- internal/provider/torguard/provider.go | 4 ++++ internal/provider/vpnunlimited/connection.go | 3 +-- internal/provider/vpnunlimited/provider.go | 4 ++++ internal/provider/vyprvpn/connection.go | 3 +-- internal/provider/vyprvpn/provider.go | 4 ++++ internal/provider/wevpn/connection.go | 3 +-- internal/provider/wevpn/provider.go | 4 ++++ internal/provider/windscribe/connection.go | 3 +-- internal/provider/windscribe/provider.go | 4 ++++ 42 files changed, 106 insertions(+), 40 deletions(-) diff --git a/internal/provider/custom/provider.go b/internal/provider/custom/provider.go index fa17deba..7acf93d4 100644 --- a/internal/provider/custom/provider.go +++ b/internal/provider/custom/provider.go @@ -17,3 +17,7 @@ func New() *Provider { NoPortForwarder: utils.NewNoPortForwarding(providers.Custom), } } + +func (p *Provider) Name() string { + return providers.Custom +} diff --git a/internal/provider/cyberghost/connection.go b/internal/provider/cyberghost/connection.go index 8b13a80a..36ded82f 100644 --- a/internal/provider/cyberghost/connection.go +++ b/internal/provider/cyberghost/connection.go @@ -2,7 +2,6 @@ package cyberghost import ( "github.com/qdm12/gluetun/internal/configuration/settings" - "github.com/qdm12/gluetun/internal/constants/providers" "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/gluetun/internal/provider/utils" ) @@ -10,6 +9,6 @@ import ( func (p *Provider) GetConnection(selection settings.ServerSelection) ( connection models.Connection, err error) { defaults := utils.NewConnectionDefaults(443, 443, 0) //nolint:gomnd - return utils.GetConnection(providers.Cyberghost, + return utils.GetConnection(p.Name(), p.storage, selection, defaults, p.randSource) } diff --git a/internal/provider/cyberghost/provider.go b/internal/provider/cyberghost/provider.go index 401f6d5c..e920b78c 100644 --- a/internal/provider/cyberghost/provider.go +++ b/internal/provider/cyberghost/provider.go @@ -21,3 +21,7 @@ func New(storage common.Storage, randSource rand.Source) *Provider { NoPortForwarder: utils.NewNoPortForwarding(providers.Cyberghost), } } + +func (p *Provider) Name() string { + return providers.Cyberghost +} diff --git a/internal/provider/expressvpn/connection.go b/internal/provider/expressvpn/connection.go index 0e72c048..fd48a366 100644 --- a/internal/provider/expressvpn/connection.go +++ b/internal/provider/expressvpn/connection.go @@ -2,7 +2,6 @@ package expressvpn import ( "github.com/qdm12/gluetun/internal/configuration/settings" - "github.com/qdm12/gluetun/internal/constants/providers" "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/gluetun/internal/provider/utils" ) @@ -10,6 +9,6 @@ import ( func (p *Provider) GetConnection(selection settings.ServerSelection) ( connection models.Connection, err error) { defaults := utils.NewConnectionDefaults(0, 1195, 0) //nolint:gomnd - return utils.GetConnection(providers.Expressvpn, + return utils.GetConnection(p.Name(), p.storage, selection, defaults, p.randSource) } diff --git a/internal/provider/expressvpn/provider.go b/internal/provider/expressvpn/provider.go index 56a8d50e..3649f417 100644 --- a/internal/provider/expressvpn/provider.go +++ b/internal/provider/expressvpn/provider.go @@ -21,3 +21,7 @@ func New(storage common.Storage, randSource rand.Source) *Provider { NoPortForwarder: utils.NewNoPortForwarding(providers.Expressvpn), } } + +func (p *Provider) Name() string { + return providers.Expressvpn +} diff --git a/internal/provider/fastestvpn/connection.go b/internal/provider/fastestvpn/connection.go index 75e62574..4c1ef7ff 100644 --- a/internal/provider/fastestvpn/connection.go +++ b/internal/provider/fastestvpn/connection.go @@ -2,7 +2,6 @@ package fastestvpn import ( "github.com/qdm12/gluetun/internal/configuration/settings" - "github.com/qdm12/gluetun/internal/constants/providers" "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/gluetun/internal/provider/utils" ) @@ -10,6 +9,6 @@ import ( func (p *Provider) GetConnection(selection settings.ServerSelection) ( connection models.Connection, err error) { defaults := utils.NewConnectionDefaults(4443, 4443, 0) //nolint:gomnd - return utils.GetConnection(providers.Fastestvpn, + return utils.GetConnection(p.Name(), p.storage, selection, defaults, p.randSource) } diff --git a/internal/provider/fastestvpn/provider.go b/internal/provider/fastestvpn/provider.go index e6c20f74..f8858a31 100644 --- a/internal/provider/fastestvpn/provider.go +++ b/internal/provider/fastestvpn/provider.go @@ -21,3 +21,7 @@ func New(storage common.Storage, randSource rand.Source) *Provider { NoPortForwarder: utils.NewNoPortForwarding(providers.Fastestvpn), } } + +func (p *Provider) Name() string { + return providers.Fastestvpn +} diff --git a/internal/provider/hidemyass/connection.go b/internal/provider/hidemyass/connection.go index f131053f..d277a434 100644 --- a/internal/provider/hidemyass/connection.go +++ b/internal/provider/hidemyass/connection.go @@ -2,7 +2,6 @@ package hidemyass import ( "github.com/qdm12/gluetun/internal/configuration/settings" - "github.com/qdm12/gluetun/internal/constants/providers" "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/gluetun/internal/provider/utils" ) @@ -10,6 +9,6 @@ import ( func (p *Provider) GetConnection(selection settings.ServerSelection) ( connection models.Connection, err error) { defaults := utils.NewConnectionDefaults(8080, 553, 0) //nolint:gomnd - return utils.GetConnection(providers.HideMyAss, + return utils.GetConnection(p.Name(), p.storage, selection, defaults, p.randSource) } diff --git a/internal/provider/hidemyass/provider.go b/internal/provider/hidemyass/provider.go index b217cdb6..c39d8836 100644 --- a/internal/provider/hidemyass/provider.go +++ b/internal/provider/hidemyass/provider.go @@ -21,3 +21,7 @@ func New(storage common.Storage, randSource rand.Source) *Provider { NoPortForwarder: utils.NewNoPortForwarding(providers.HideMyAss), } } + +func (p *Provider) Name() string { + return providers.HideMyAss +} diff --git a/internal/provider/ipvanish/connection.go b/internal/provider/ipvanish/connection.go index deab75d8..751a7e83 100644 --- a/internal/provider/ipvanish/connection.go +++ b/internal/provider/ipvanish/connection.go @@ -2,7 +2,6 @@ package ipvanish import ( "github.com/qdm12/gluetun/internal/configuration/settings" - "github.com/qdm12/gluetun/internal/constants/providers" "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/gluetun/internal/provider/utils" ) @@ -10,6 +9,6 @@ import ( func (p *Provider) GetConnection(selection settings.ServerSelection) ( connection models.Connection, err error) { defaults := utils.NewConnectionDefaults(0, 443, 0) //nolint:gomnd - return utils.GetConnection(providers.Ipvanish, + return utils.GetConnection(p.Name(), p.storage, selection, defaults, p.randSource) } diff --git a/internal/provider/ipvanish/provider.go b/internal/provider/ipvanish/provider.go index 334af132..9c5d9860 100644 --- a/internal/provider/ipvanish/provider.go +++ b/internal/provider/ipvanish/provider.go @@ -21,3 +21,7 @@ func New(storage common.Storage, randSource rand.Source) *Provider { NoPortForwarder: utils.NewNoPortForwarding(providers.Ipvanish), } } + +func (p *Provider) Name() string { + return providers.Ipvanish +} diff --git a/internal/provider/ivpn/connection.go b/internal/provider/ivpn/connection.go index 95c19c3c..58c9df77 100644 --- a/internal/provider/ivpn/connection.go +++ b/internal/provider/ivpn/connection.go @@ -2,7 +2,6 @@ package ivpn import ( "github.com/qdm12/gluetun/internal/configuration/settings" - "github.com/qdm12/gluetun/internal/constants/providers" "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/gluetun/internal/provider/utils" ) @@ -10,6 +9,6 @@ import ( func (p *Provider) GetConnection(selection settings.ServerSelection) ( connection models.Connection, err error) { defaults := utils.NewConnectionDefaults(443, 1194, 58237) //nolint:gomnd - return utils.GetConnection(providers.Ivpn, + return utils.GetConnection(p.Name(), p.storage, selection, defaults, p.randSource) } diff --git a/internal/provider/ivpn/provider.go b/internal/provider/ivpn/provider.go index de51ebf4..1d8de558 100644 --- a/internal/provider/ivpn/provider.go +++ b/internal/provider/ivpn/provider.go @@ -21,3 +21,7 @@ func New(storage common.Storage, randSource rand.Source) *Provider { NoPortForwarder: utils.NewNoPortForwarding(providers.Ivpn), } } + +func (p *Provider) Name() string { + return providers.Ivpn +} diff --git a/internal/provider/mullvad/connection.go b/internal/provider/mullvad/connection.go index 74eb97a3..a29951ed 100644 --- a/internal/provider/mullvad/connection.go +++ b/internal/provider/mullvad/connection.go @@ -2,7 +2,6 @@ package mullvad import ( "github.com/qdm12/gluetun/internal/configuration/settings" - "github.com/qdm12/gluetun/internal/constants/providers" "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/gluetun/internal/provider/utils" ) @@ -10,6 +9,6 @@ import ( func (p *Provider) GetConnection(selection settings.ServerSelection) ( connection models.Connection, err error) { defaults := utils.NewConnectionDefaults(443, 1194, 51820) //nolint:gomnd - return utils.GetConnection(providers.Mullvad, + return utils.GetConnection(p.Name(), p.storage, selection, defaults, p.randSource) } diff --git a/internal/provider/mullvad/provider.go b/internal/provider/mullvad/provider.go index e10a6417..e8264bb6 100644 --- a/internal/provider/mullvad/provider.go +++ b/internal/provider/mullvad/provider.go @@ -21,3 +21,7 @@ func New(storage common.Storage, randSource rand.Source) *Provider { NoPortForwarder: utils.NewNoPortForwarding(providers.Mullvad), } } + +func (p *Provider) Name() string { + return providers.Mullvad +} diff --git a/internal/provider/nordvpn/connection.go b/internal/provider/nordvpn/connection.go index d431634c..00230121 100644 --- a/internal/provider/nordvpn/connection.go +++ b/internal/provider/nordvpn/connection.go @@ -2,7 +2,6 @@ package nordvpn import ( "github.com/qdm12/gluetun/internal/configuration/settings" - "github.com/qdm12/gluetun/internal/constants/providers" "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/gluetun/internal/provider/utils" ) @@ -10,6 +9,6 @@ import ( func (p *Provider) GetConnection(selection settings.ServerSelection) ( connection models.Connection, err error) { defaults := utils.NewConnectionDefaults(443, 1194, 0) //nolint:gomnd - return utils.GetConnection(providers.Nordvpn, + return utils.GetConnection(p.Name(), p.storage, selection, defaults, p.randSource) } diff --git a/internal/provider/nordvpn/provider.go b/internal/provider/nordvpn/provider.go index 72d27a80..07d94a58 100644 --- a/internal/provider/nordvpn/provider.go +++ b/internal/provider/nordvpn/provider.go @@ -21,3 +21,7 @@ func New(storage common.Storage, randSource rand.Source) *Provider { NoPortForwarder: utils.NewNoPortForwarding(providers.Nordvpn), } } + +func (p *Provider) Name() string { + return providers.Nordvpn +} diff --git a/internal/provider/perfectprivacy/connection.go b/internal/provider/perfectprivacy/connection.go index 85265b18..a51bdeb0 100644 --- a/internal/provider/perfectprivacy/connection.go +++ b/internal/provider/perfectprivacy/connection.go @@ -2,7 +2,6 @@ package perfectprivacy import ( "github.com/qdm12/gluetun/internal/configuration/settings" - "github.com/qdm12/gluetun/internal/constants/providers" "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/gluetun/internal/provider/utils" ) @@ -10,6 +9,6 @@ import ( func (p *Provider) GetConnection(selection settings.ServerSelection) ( connection models.Connection, err error) { defaults := utils.NewConnectionDefaults(443, 443, 0) //nolint:gomnd - return utils.GetConnection(providers.Perfectprivacy, + return utils.GetConnection(p.Name(), p.storage, selection, defaults, p.randSource) } diff --git a/internal/provider/perfectprivacy/provider.go b/internal/provider/perfectprivacy/provider.go index b604f1b9..4e8e0402 100644 --- a/internal/provider/perfectprivacy/provider.go +++ b/internal/provider/perfectprivacy/provider.go @@ -21,3 +21,7 @@ func New(storage common.Storage, randSource rand.Source) *Provider { NoPortForwarder: utils.NewNoPortForwarding(providers.Perfectprivacy), } } + +func (p *Provider) Name() string { + return providers.Perfectprivacy +} diff --git a/internal/provider/privado/connection.go b/internal/provider/privado/connection.go index 5529c737..dcb06111 100644 --- a/internal/provider/privado/connection.go +++ b/internal/provider/privado/connection.go @@ -2,7 +2,6 @@ package privado import ( "github.com/qdm12/gluetun/internal/configuration/settings" - "github.com/qdm12/gluetun/internal/constants/providers" "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/gluetun/internal/provider/utils" ) @@ -10,6 +9,6 @@ import ( func (p *Provider) GetConnection(selection settings.ServerSelection) ( connection models.Connection, err error) { defaults := utils.NewConnectionDefaults(0, 1194, 0) //nolint:gomnd - return utils.GetConnection(providers.Privado, + return utils.GetConnection(p.Name(), p.storage, selection, defaults, p.randSource) } diff --git a/internal/provider/privado/provider.go b/internal/provider/privado/provider.go index 2a4ad909..e8ec60a2 100644 --- a/internal/provider/privado/provider.go +++ b/internal/provider/privado/provider.go @@ -21,3 +21,7 @@ func New(storage common.Storage, randSource rand.Source) *Provider { NoPortForwarder: utils.NewNoPortForwarding(providers.Privado), } } + +func (p *Provider) Name() string { + return providers.Privado +} diff --git a/internal/provider/privateinternetaccess/connection.go b/internal/provider/privateinternetaccess/connection.go index 4326bf3c..7c30f981 100644 --- a/internal/provider/privateinternetaccess/connection.go +++ b/internal/provider/privateinternetaccess/connection.go @@ -2,7 +2,6 @@ package privateinternetaccess import ( "github.com/qdm12/gluetun/internal/configuration/settings" - "github.com/qdm12/gluetun/internal/constants/providers" "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/gluetun/internal/provider/privateinternetaccess/presets" "github.com/qdm12/gluetun/internal/provider/utils" @@ -21,6 +20,6 @@ func (p *Provider) GetConnection(selection settings.ServerSelection) ( defaults.OpenVPNUDPPort = 1197 } - return utils.GetConnection(providers.PrivateInternetAccess, + return utils.GetConnection(p.Name(), p.storage, selection, defaults, p.randSource) } diff --git a/internal/provider/privateinternetaccess/provider.go b/internal/provider/privateinternetaccess/provider.go index 9a8c90eb..09ff458f 100644 --- a/internal/provider/privateinternetaccess/provider.go +++ b/internal/provider/privateinternetaccess/provider.go @@ -5,6 +5,7 @@ import ( "time" "github.com/qdm12/gluetun/internal/constants/openvpn" + "github.com/qdm12/gluetun/internal/constants/providers" "github.com/qdm12/gluetun/internal/provider/common" ) @@ -28,3 +29,7 @@ func New(storage common.Storage, randSource rand.Source, authFilePath: openvpn.AuthConf, } } + +func (p *Provider) Name() string { + return providers.PrivateInternetAccess +} diff --git a/internal/provider/privatevpn/connection.go b/internal/provider/privatevpn/connection.go index 608b16eb..6d84a9aa 100644 --- a/internal/provider/privatevpn/connection.go +++ b/internal/provider/privatevpn/connection.go @@ -2,7 +2,6 @@ package privatevpn import ( "github.com/qdm12/gluetun/internal/configuration/settings" - "github.com/qdm12/gluetun/internal/constants/providers" "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/gluetun/internal/provider/utils" ) @@ -10,6 +9,6 @@ import ( func (p *Provider) GetConnection(selection settings.ServerSelection) ( connection models.Connection, err error) { defaults := utils.NewConnectionDefaults(443, 1194, 0) //nolint:gomnd - return utils.GetConnection(providers.Privatevpn, + return utils.GetConnection(p.Name(), p.storage, selection, defaults, p.randSource) } diff --git a/internal/provider/privatevpn/provider.go b/internal/provider/privatevpn/provider.go index f4476264..8998b88b 100644 --- a/internal/provider/privatevpn/provider.go +++ b/internal/provider/privatevpn/provider.go @@ -21,3 +21,7 @@ func New(storage common.Storage, randSource rand.Source) *Provider { NoPortForwarder: utils.NewNoPortForwarding(providers.Privatevpn), } } + +func (p *Provider) Name() string { + return providers.Privatevpn +} diff --git a/internal/provider/protonvpn/connection.go b/internal/provider/protonvpn/connection.go index 4ace8ab4..14c58344 100644 --- a/internal/provider/protonvpn/connection.go +++ b/internal/provider/protonvpn/connection.go @@ -2,7 +2,6 @@ package protonvpn import ( "github.com/qdm12/gluetun/internal/configuration/settings" - "github.com/qdm12/gluetun/internal/constants/providers" "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/gluetun/internal/provider/utils" ) @@ -10,6 +9,6 @@ import ( func (p *Provider) GetConnection(selection settings.ServerSelection) ( connection models.Connection, err error) { defaults := utils.NewConnectionDefaults(443, 1194, 0) //nolint:gomnd - return utils.GetConnection(providers.Protonvpn, + return utils.GetConnection(p.Name(), p.storage, selection, defaults, p.randSource) } diff --git a/internal/provider/protonvpn/provider.go b/internal/provider/protonvpn/provider.go index 671aa4c2..4b21cc06 100644 --- a/internal/provider/protonvpn/provider.go +++ b/internal/provider/protonvpn/provider.go @@ -21,3 +21,7 @@ func New(storage common.Storage, randSource rand.Source) *Provider { NoPortForwarder: utils.NewNoPortForwarding(providers.Protonvpn), } } + +func (p *Provider) Name() string { + return providers.Protonvpn +} diff --git a/internal/provider/provider.go b/internal/provider/provider.go index 54500570..263ae3d2 100644 --- a/internal/provider/provider.go +++ b/internal/provider/provider.go @@ -39,6 +39,7 @@ import ( type Provider interface { GetConnection(selection settings.ServerSelection) (connection models.Connection, err error) OpenVPNConfig(connection models.Connection, settings settings.OpenVPN) (lines []string) + Name() string PortForwarder } diff --git a/internal/provider/purevpn/connection.go b/internal/provider/purevpn/connection.go index 508dfc1f..cc809cf1 100644 --- a/internal/provider/purevpn/connection.go +++ b/internal/provider/purevpn/connection.go @@ -2,7 +2,6 @@ package purevpn import ( "github.com/qdm12/gluetun/internal/configuration/settings" - "github.com/qdm12/gluetun/internal/constants/providers" "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/gluetun/internal/provider/utils" ) @@ -10,6 +9,6 @@ import ( func (p *Provider) GetConnection(selection settings.ServerSelection) ( connection models.Connection, err error) { defaults := utils.NewConnectionDefaults(80, 53, 0) //nolint:gomnd - return utils.GetConnection(providers.Purevpn, + return utils.GetConnection(p.Name(), p.storage, selection, defaults, p.randSource) } diff --git a/internal/provider/purevpn/provider.go b/internal/provider/purevpn/provider.go index 9d134fba..64b48606 100644 --- a/internal/provider/purevpn/provider.go +++ b/internal/provider/purevpn/provider.go @@ -21,3 +21,7 @@ func New(storage common.Storage, randSource rand.Source) *Provider { NoPortForwarder: utils.NewNoPortForwarding(providers.Purevpn), } } + +func (p *Provider) Name() string { + return providers.Purevpn +} diff --git a/internal/provider/surfshark/connection.go b/internal/provider/surfshark/connection.go index 4f343598..05190fc0 100644 --- a/internal/provider/surfshark/connection.go +++ b/internal/provider/surfshark/connection.go @@ -2,7 +2,6 @@ package surfshark import ( "github.com/qdm12/gluetun/internal/configuration/settings" - "github.com/qdm12/gluetun/internal/constants/providers" "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/gluetun/internal/provider/utils" ) @@ -10,6 +9,6 @@ import ( func (p *Provider) GetConnection(selection settings.ServerSelection) ( connection models.Connection, err error) { defaults := utils.NewConnectionDefaults(1443, 1194, 0) //nolint:gomnd - return utils.GetConnection(providers.Surfshark, + return utils.GetConnection(p.Name(), p.storage, selection, defaults, p.randSource) } diff --git a/internal/provider/surfshark/provider.go b/internal/provider/surfshark/provider.go index a65dcc41..ad184dd5 100644 --- a/internal/provider/surfshark/provider.go +++ b/internal/provider/surfshark/provider.go @@ -21,3 +21,7 @@ func New(storage common.Storage, randSource rand.Source) *Provider { NoPortForwarder: utils.NewNoPortForwarding(providers.Surfshark), } } + +func (p *Provider) Name() string { + return providers.Surfshark +} diff --git a/internal/provider/torguard/connection.go b/internal/provider/torguard/connection.go index 50d4d4c8..02748079 100644 --- a/internal/provider/torguard/connection.go +++ b/internal/provider/torguard/connection.go @@ -2,7 +2,6 @@ package torguard import ( "github.com/qdm12/gluetun/internal/configuration/settings" - "github.com/qdm12/gluetun/internal/constants/providers" "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/gluetun/internal/provider/utils" ) @@ -10,6 +9,6 @@ import ( func (p *Provider) GetConnection(selection settings.ServerSelection) ( connection models.Connection, err error) { defaults := utils.NewConnectionDefaults(1912, 1912, 0) //nolint:gomnd - return utils.GetConnection(providers.Torguard, + return utils.GetConnection(p.Name(), p.storage, selection, defaults, p.randSource) } diff --git a/internal/provider/torguard/provider.go b/internal/provider/torguard/provider.go index 42de29b8..e684b879 100644 --- a/internal/provider/torguard/provider.go +++ b/internal/provider/torguard/provider.go @@ -21,3 +21,7 @@ func New(storage common.Storage, randSource rand.Source) *Provider { NoPortForwarder: utils.NewNoPortForwarding(providers.Torguard), } } + +func (p *Provider) Name() string { + return providers.Torguard +} diff --git a/internal/provider/vpnunlimited/connection.go b/internal/provider/vpnunlimited/connection.go index 3a98cee9..d628725e 100644 --- a/internal/provider/vpnunlimited/connection.go +++ b/internal/provider/vpnunlimited/connection.go @@ -2,7 +2,6 @@ package vpnunlimited import ( "github.com/qdm12/gluetun/internal/configuration/settings" - "github.com/qdm12/gluetun/internal/constants/providers" "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/gluetun/internal/provider/utils" ) @@ -10,6 +9,6 @@ import ( func (p *Provider) GetConnection(selection settings.ServerSelection) ( connection models.Connection, err error) { defaults := utils.NewConnectionDefaults(0, 1194, 0) //nolint:gomnd - return utils.GetConnection(providers.VPNUnlimited, + return utils.GetConnection(p.Name(), p.storage, selection, defaults, p.randSource) } diff --git a/internal/provider/vpnunlimited/provider.go b/internal/provider/vpnunlimited/provider.go index a6dd922a..6d076905 100644 --- a/internal/provider/vpnunlimited/provider.go +++ b/internal/provider/vpnunlimited/provider.go @@ -21,3 +21,7 @@ func New(storage common.Storage, randSource rand.Source) *Provider { NoPortForwarder: utils.NewNoPortForwarding(providers.VPNUnlimited), } } + +func (p *Provider) Name() string { + return providers.VPNUnlimited +} diff --git a/internal/provider/vyprvpn/connection.go b/internal/provider/vyprvpn/connection.go index fe8ae915..7d69b7de 100644 --- a/internal/provider/vyprvpn/connection.go +++ b/internal/provider/vyprvpn/connection.go @@ -2,7 +2,6 @@ package vyprvpn import ( "github.com/qdm12/gluetun/internal/configuration/settings" - "github.com/qdm12/gluetun/internal/constants/providers" "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/gluetun/internal/provider/utils" ) @@ -10,6 +9,6 @@ import ( func (p *Provider) GetConnection(selection settings.ServerSelection) ( connection models.Connection, err error) { defaults := utils.NewConnectionDefaults(0, 443, 0) //nolint:gomnd - return utils.GetConnection(providers.Vyprvpn, + return utils.GetConnection(p.Name(), p.storage, selection, defaults, p.randSource) } diff --git a/internal/provider/vyprvpn/provider.go b/internal/provider/vyprvpn/provider.go index 82535e3c..9ccb8f9a 100644 --- a/internal/provider/vyprvpn/provider.go +++ b/internal/provider/vyprvpn/provider.go @@ -21,3 +21,7 @@ func New(storage common.Storage, randSource rand.Source) *Provider { NoPortForwarder: utils.NewNoPortForwarding(providers.Vyprvpn), } } + +func (p *Provider) Name() string { + return providers.Vyprvpn +} diff --git a/internal/provider/wevpn/connection.go b/internal/provider/wevpn/connection.go index b1c3c75a..d8e567a8 100644 --- a/internal/provider/wevpn/connection.go +++ b/internal/provider/wevpn/connection.go @@ -2,7 +2,6 @@ package wevpn import ( "github.com/qdm12/gluetun/internal/configuration/settings" - "github.com/qdm12/gluetun/internal/constants/providers" "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/gluetun/internal/provider/utils" ) @@ -10,6 +9,6 @@ import ( func (p *Provider) GetConnection(selection settings.ServerSelection) ( connection models.Connection, err error) { defaults := utils.NewConnectionDefaults(1195, 1194, 0) //nolint:gomnd - return utils.GetConnection(providers.Wevpn, + return utils.GetConnection(p.Name(), p.storage, selection, defaults, p.randSource) } diff --git a/internal/provider/wevpn/provider.go b/internal/provider/wevpn/provider.go index 68b1ce55..e6fd601a 100644 --- a/internal/provider/wevpn/provider.go +++ b/internal/provider/wevpn/provider.go @@ -21,3 +21,7 @@ func New(storage common.Storage, randSource rand.Source) *Provider { NoPortForwarder: utils.NewNoPortForwarding(providers.Wevpn), } } + +func (p *Provider) Name() string { + return providers.Wevpn +} diff --git a/internal/provider/windscribe/connection.go b/internal/provider/windscribe/connection.go index 039ddada..ff5344d1 100644 --- a/internal/provider/windscribe/connection.go +++ b/internal/provider/windscribe/connection.go @@ -2,7 +2,6 @@ package windscribe import ( "github.com/qdm12/gluetun/internal/configuration/settings" - "github.com/qdm12/gluetun/internal/constants/providers" "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/gluetun/internal/provider/utils" ) @@ -10,6 +9,6 @@ import ( func (p *Provider) GetConnection(selection settings.ServerSelection) ( connection models.Connection, err error) { defaults := utils.NewConnectionDefaults(443, 1194, 1194) //nolint:gomnd - return utils.GetConnection(providers.Windscribe, + return utils.GetConnection(p.Name(), p.storage, selection, defaults, p.randSource) } diff --git a/internal/provider/windscribe/provider.go b/internal/provider/windscribe/provider.go index 13b8f6db..2acda23c 100644 --- a/internal/provider/windscribe/provider.go +++ b/internal/provider/windscribe/provider.go @@ -21,3 +21,7 @@ func New(storage common.Storage, randSource rand.Source) *Provider { NoPortForwarder: utils.NewNoPortForwarding(providers.Windscribe), } } + +func (p *Provider) Name() string { + return providers.Windscribe +}