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

chore(internal/provider): rename all structs to Provider

Browse Source
This commit is contained in:
Quentin McGaw
2022-05-27 18:05:04 +00:00
parent a295269518
commit a91eb95456
55 changed files with 102 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/provider/cyberghost/connection.go
View File

@@ -6,8 +6,8 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (c *Cyberghost) GetConnection(selection settings.ServerSelection) (
func (p *Provider) GetConnection(selection settings.ServerSelection) (
connection models.Connection, err error) {
defaults := utils.NewConnectionDefaults(443, 443, 0) //nolint:gomnd
return utils.GetConnection(c.servers, selection, defaults, c.randSource)
return utils.GetConnection(p.servers, selection, defaults, p.randSource)
}

2
internal/provider/cyberghost/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (c *Cyberghost) BuildConf(connection models.Connection,
func (p *Provider) BuildConf(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
//nolint:gomnd
providerSettings := utils.OpenVPNProviderSettings{

6
internal/provider/cyberghost/provider.go
View File

@@ -8,14 +8,14 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
type Cyberghost struct {
type Provider struct {
servers []models.Server
randSource rand.Source
utils.NoPortForwarder
}
func New(servers []models.Server, randSource rand.Source) *Cyberghost {
return &Cyberghost{
func New(servers []models.Server, randSource rand.Source) *Provider {
return &Provider{
servers: servers,
randSource: randSource,
NoPortForwarder: utils.NewNoPortForwarding(providers.Cyberghost),

4
internal/provider/fastestvpn/connection.go
View File

@@ -6,8 +6,8 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (f *Fastestvpn) GetConnection(selection settings.ServerSelection) (
func (p *Provider) GetConnection(selection settings.ServerSelection) (
connection models.Connection, err error) {
defaults := utils.NewConnectionDefaults(4443, 4443, 0) //nolint:gomnd
return utils.GetConnection(f.servers, selection, defaults, f.randSource)
return utils.GetConnection(p.servers, selection, defaults, p.randSource)
}

2
internal/provider/fastestvpn/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (f *Fastestvpn) BuildConf(connection models.Connection,
func (p *Provider) BuildConf(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
//nolint:gomnd
providerSettings := utils.OpenVPNProviderSettings{

6
internal/provider/fastestvpn/provider.go
View File

@@ -8,14 +8,14 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
type Fastestvpn struct {
type Provider struct {
servers []models.Server
randSource rand.Source
utils.NoPortForwarder
}
func New(servers []models.Server, randSource rand.Source) *Fastestvpn {
return &Fastestvpn{
func New(servers []models.Server, randSource rand.Source) *Provider {
return &Provider{
servers: servers,
randSource: randSource,
NoPortForwarder: utils.NewNoPortForwarding(providers.Fastestvpn),

4
internal/provider/hidemyass/connection.go
View File

@@ -6,8 +6,8 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (h *HideMyAss) GetConnection(selection settings.ServerSelection) (
func (p *Provider) GetConnection(selection settings.ServerSelection) (
connection models.Connection, err error) {
defaults := utils.NewConnectionDefaults(8080, 553, 0) //nolint:gomnd
return utils.GetConnection(h.servers, selection, defaults, h.randSource)
return utils.GetConnection(p.servers, selection, defaults, p.randSource)
}

2
internal/provider/hidemyass/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (h *HideMyAss) BuildConf(connection models.Connection,
func (p *Provider) BuildConf(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
//nolint:gomnd
providerSettings := utils.OpenVPNProviderSettings{

6
internal/provider/hidemyass/provider.go
View File

@@ -8,14 +8,14 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
type HideMyAss struct {
type Provider struct {
servers []models.Server
randSource rand.Source
utils.NoPortForwarder
}
func New(servers []models.Server, randSource rand.Source) *HideMyAss {
return &HideMyAss{
func New(servers []models.Server, randSource rand.Source) *Provider {
return &Provider{
servers: servers,
randSource: randSource,
NoPortForwarder: utils.NewNoPortForwarding(providers.HideMyAss),

4
internal/provider/ipvanish/connection.go
View File

@@ -6,8 +6,8 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (i *Ipvanish) GetConnection(selection settings.ServerSelection) (
func (p *Provider) GetConnection(selection settings.ServerSelection) (
connection models.Connection, err error) {
defaults := utils.NewConnectionDefaults(0, 443, 0) //nolint:gomnd
return utils.GetConnection(i.servers, selection, defaults, i.randSource)
return utils.GetConnection(p.servers, selection, defaults, p.randSource)
}

2
internal/provider/ipvanish/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (i *Ipvanish) BuildConf(connection models.Connection,
func (p *Provider) BuildConf(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
providerSettings := utils.OpenVPNProviderSettings{
AuthUserPass: true,

6
internal/provider/ipvanish/provider.go
View File

@@ -8,14 +8,14 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
type Ipvanish struct {
type Provider struct {
servers []models.Server
randSource rand.Source
utils.NoPortForwarder
}
func New(servers []models.Server, randSource rand.Source) *Ipvanish {
return &Ipvanish{
func New(servers []models.Server, randSource rand.Source) *Provider {
return &Provider{
servers: servers,
randSource: randSource,
NoPortForwarder: utils.NewNoPortForwarding(providers.Ipvanish),

4
internal/provider/ivpn/connection.go
View File

@@ -6,8 +6,8 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (i *Ivpn) GetConnection(selection settings.ServerSelection) (
func (p *Provider) GetConnection(selection settings.ServerSelection) (
connection models.Connection, err error) {
defaults := utils.NewConnectionDefaults(443, 1194, 58237) //nolint:gomnd
return utils.GetConnection(i.servers, selection, defaults, i.randSource)
return utils.GetConnection(p.servers, selection, defaults, p.randSource)
}

2
internal/provider/ivpn/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (i *Ivpn) BuildConf(connection models.Connection,
func (p *Provider) BuildConf(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
//nolint:gomnd
providerSettings := utils.OpenVPNProviderSettings{

6
internal/provider/ivpn/provider.go
View File

@@ -8,14 +8,14 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
type Ivpn struct {
type Provider struct {
servers []models.Server
randSource rand.Source
utils.NoPortForwarder
}
func New(servers []models.Server, randSource rand.Source) *Ivpn {
return &Ivpn{
func New(servers []models.Server, randSource rand.Source) *Provider {
return &Provider{
servers: servers,
randSource: randSource,
NoPortForwarder: utils.NewNoPortForwarding(providers.Ivpn),

4
internal/provider/mullvad/connection.go
View File

@@ -6,8 +6,8 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (m *Mullvad) GetConnection(selection settings.ServerSelection) (
func (p *Provider) GetConnection(selection settings.ServerSelection) (
connection models.Connection, err error) {
defaults := utils.NewConnectionDefaults(443, 1194, 51820) //nolint:gomnd
return utils.GetConnection(m.servers, selection, defaults, m.randSource)
return utils.GetConnection(p.servers, selection, defaults, p.randSource)
}

2
internal/provider/mullvad/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (m *Mullvad) BuildConf(connection models.Connection,
func (p *Provider) BuildConf(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
//nolint:gomnd
providerSettings := utils.OpenVPNProviderSettings{

6
internal/provider/mullvad/provider.go
View File

@@ -8,14 +8,14 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
type Mullvad struct {
type Provider struct {
servers []models.Server
randSource rand.Source
utils.NoPortForwarder
}
func New(servers []models.Server, randSource rand.Source) *Mullvad {
return &Mullvad{
func New(servers []models.Server, randSource rand.Source) *Provider {
return &Provider{
servers: servers,
randSource: randSource,
NoPortForwarder: utils.NewNoPortForwarding(providers.Mullvad),

4
internal/provider/nordvpn/connection.go
View File

@@ -6,8 +6,8 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (n *Nordvpn) GetConnection(selection settings.ServerSelection) (
func (p *Provider) GetConnection(selection settings.ServerSelection) (
connection models.Connection, err error) {
defaults := utils.NewConnectionDefaults(443, 1194, 0) //nolint:gomnd
return utils.GetConnection(n.servers, selection, defaults, n.randSource)
return utils.GetConnection(p.servers, selection, defaults, p.randSource)
}

2
internal/provider/nordvpn/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (n *Nordvpn) BuildConf(connection models.Connection,
func (p *Provider) BuildConf(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
//nolint:gomnd
providerSettings := utils.OpenVPNProviderSettings{

6
internal/provider/nordvpn/provider.go
View File

@@ -8,14 +8,14 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
type Nordvpn struct {
type Provider struct {
servers []models.Server
randSource rand.Source
utils.NoPortForwarder
}
func New(servers []models.Server, randSource rand.Source) *Nordvpn {
return &Nordvpn{
func New(servers []models.Server, randSource rand.Source) *Provider {
return &Provider{
servers: servers,
randSource: randSource,
NoPortForwarder: utils.NewNoPortForwarding(providers.Nordvpn),

2
internal/provider/perfectprivacy/connection.go
View File

@@ -6,7 +6,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Perfectprivacy) GetConnection(selection settings.ServerSelection) (
func (p *Provider) GetConnection(selection settings.ServerSelection) (
connection models.Connection, err error) {
defaults := utils.NewConnectionDefaults(443, 443, 0) //nolint:gomnd
return utils.GetConnection(p.servers, selection, defaults, p.randSource)

2
internal/provider/perfectprivacy/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Perfectprivacy) BuildConf(connection models.Connection,
func (p *Provider) BuildConf(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
//nolint:gomnd
providerSettings := utils.OpenVPNProviderSettings{

6
internal/provider/perfectprivacy/provider.go
View File

@@ -8,14 +8,14 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
type Perfectprivacy struct {
type Provider struct {
servers []models.Server
randSource rand.Source
utils.NoPortForwarder
}
func New(servers []models.Server, randSource rand.Source) *Perfectprivacy {
return &Perfectprivacy{
func New(servers []models.Server, randSource rand.Source) *Provider {
return &Provider{
servers: servers,
randSource: randSource,
NoPortForwarder: utils.NewNoPortForwarding(providers.Perfectprivacy),

2
internal/provider/privado/connection.go
View File

@@ -6,7 +6,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Privado) GetConnection(selection settings.ServerSelection) (
func (p *Provider) GetConnection(selection settings.ServerSelection) (
connection models.Connection, err error) {
defaults := utils.NewConnectionDefaults(0, 1194, 0) //nolint:gomnd
return utils.GetConnection(p.servers, selection, defaults, p.randSource)

2
internal/provider/privado/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Privado) BuildConf(connection models.Connection,
func (p *Provider) BuildConf(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
//nolint:gomnd
providerSettings := utils.OpenVPNProviderSettings{

6
internal/provider/privado/provider.go
View File

@@ -8,14 +8,14 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
type Privado struct {
type Provider struct {
servers []models.Server
randSource rand.Source
utils.NoPortForwarder
}
func New(servers []models.Server, randSource rand.Source) *Privado {
return &Privado{
func New(servers []models.Server, randSource rand.Source) *Provider {
return &Provider{
servers: servers,
randSource: randSource,
NoPortForwarder: utils.NewNoPortForwarding(providers.Privado),

2
internal/provider/privateinternetaccess/connection.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *PIA) GetConnection(selection settings.ServerSelection) (
func (p *Provider) GetConnection(selection settings.ServerSelection) (
connection models.Connection, err error) {
// Set port defaults depending on encryption preset.
var defaults utils.ConnectionDefaults

2
internal/provider/privateinternetaccess/openvpnconf.go
View File

@@ -8,7 +8,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *PIA) BuildConf(connection models.Connection,
func (p *Provider) BuildConf(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
providerSettings := utils.OpenVPNProviderSettings{
RemoteCertTLS: true,

4
internal/provider/privateinternetaccess/portforward.go
View File

@@ -26,7 +26,7 @@ var (
)
// PortForward obtains a VPN server side port forwarded from PIA.
func (p *PIA) PortForward(ctx context.Context, client *http.Client,
func (p *Provider) PortForward(ctx context.Context, client *http.Client,
logger utils.Logger, gateway net.IP, serverName string) (
port uint16, err error) {
var server models.Server
@@ -90,7 +90,7 @@ var (
ErrPortForwardedExpired = errors.New("port forwarded data expired")
)
func (p *PIA) KeepPortForward(ctx context.Context, client *http.Client,
func (p *Provider) KeepPortForward(ctx context.Context, client *http.Client,
port uint16, gateway net.IP, serverName string) (err error) {
privateIPClient := newHTTPClient(serverName)

6
internal/provider/privateinternetaccess/provider.go
View File

@@ -8,7 +8,7 @@ import (
"github.com/qdm12/gluetun/internal/models"
)
type PIA struct {
type Provider struct {
servers []models.Server
randSource rand.Source
timeNow func() time.Time
@@ -18,9 +18,9 @@ type PIA struct {
}
func New(servers []models.Server, randSource rand.Source,
timeNow func() time.Time) *PIA {
timeNow func() time.Time) *Provider {
const jsonPortForwardPath = "/gluetun/piaportforward.json"
return &PIA{
return &Provider{
servers: servers,
timeNow: timeNow,
randSource: randSource,

2
internal/provider/privatevpn/connection.go
View File

@@ -6,7 +6,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Privatevpn) GetConnection(selection settings.ServerSelection) (
func (p *Provider) GetConnection(selection settings.ServerSelection) (
connection models.Connection, err error) {
defaults := utils.NewConnectionDefaults(443, 1194, 0) //nolint:gomnd
return utils.GetConnection(p.servers, selection, defaults, p.randSource)

2
internal/provider/privatevpn/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Privatevpn) BuildConf(connection models.Connection,
func (p *Provider) BuildConf(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
providerSettings := utils.OpenVPNProviderSettings{
RemoteCertTLS: true,

6
internal/provider/privatevpn/provider.go
View File

@@ -8,14 +8,14 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
type Privatevpn struct {
type Provider struct {
servers []models.Server
randSource rand.Source
utils.NoPortForwarder
}
func New(servers []models.Server, randSource rand.Source) *Privatevpn {
return &Privatevpn{
func New(servers []models.Server, randSource rand.Source) *Provider {
return &Provider{
servers: servers,
randSource: randSource,
NoPortForwarder: utils.NewNoPortForwarding(providers.Privatevpn),

2
internal/provider/protonvpn/connection.go
View File

@@ -6,7 +6,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Protonvpn) GetConnection(selection settings.ServerSelection) (
func (p *Provider) GetConnection(selection settings.ServerSelection) (
connection models.Connection, err error) {
defaults := utils.NewConnectionDefaults(443, 1194, 0) //nolint:gomnd
return utils.GetConnection(p.servers, selection, defaults, p.randSource)

2
internal/provider/protonvpn/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Protonvpn) BuildConf(connection models.Connection,
func (p *Provider) BuildConf(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
//nolint:gomnd
providerSettings := utils.OpenVPNProviderSettings{

6
internal/provider/protonvpn/provider.go
View File

@@ -8,14 +8,14 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
type Protonvpn struct {
type Provider struct {
servers []models.Server
randSource rand.Source
utils.NoPortForwarder
}
func New(servers []models.Server, randSource rand.Source) *Protonvpn {
return &Protonvpn{
func New(servers []models.Server, randSource rand.Source) *Provider {
return &Provider{
servers: servers,
randSource: randSource,
NoPortForwarder: utils.NewNoPortForwarding(providers.Protonvpn),

2
internal/provider/purevpn/connection.go
View File

@@ -6,7 +6,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Purevpn) GetConnection(selection settings.ServerSelection) (
func (p *Provider) GetConnection(selection settings.ServerSelection) (
connection models.Connection, err error) {
defaults := utils.NewConnectionDefaults(80, 53, 0) //nolint:gomnd
return utils.GetConnection(p.servers, selection, defaults, p.randSource)

2
internal/provider/purevpn/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Purevpn) BuildConf(connection models.Connection,
func (p *Provider) BuildConf(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
providerSettings := utils.OpenVPNProviderSettings{
RemoteCertTLS: true,

6
internal/provider/purevpn/provider.go
View File

@@ -8,14 +8,14 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
type Purevpn struct {
type Provider struct {
servers []models.Server
randSource rand.Source
utils.NoPortForwarder
}
func New(servers []models.Server, randSource rand.Source) *Purevpn {
return &Purevpn{
func New(servers []models.Server, randSource rand.Source) *Provider {
return &Provider{
servers: servers,
randSource: randSource,
NoPortForwarder: utils.NewNoPortForwarding(providers.Purevpn),

4
internal/provider/surfshark/connection.go
View File

@@ -6,8 +6,8 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (s *Surfshark) GetConnection(selection settings.ServerSelection) (
func (p *Provider) GetConnection(selection settings.ServerSelection) (
connection models.Connection, err error) {
defaults := utils.NewConnectionDefaults(1443, 1194, 0) //nolint:gomnd
return utils.GetConnection(s.servers, selection, defaults, s.randSource)
return utils.GetConnection(p.servers, selection, defaults, p.randSource)
}

2
internal/provider/surfshark/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (s *Surfshark) BuildConf(connection models.Connection,
func (p *Provider) BuildConf(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
//nolint:gomnd
providerSettings := utils.OpenVPNProviderSettings{

6
internal/provider/surfshark/provider.go
View File

@@ -8,14 +8,14 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
type Surfshark struct {
type Provider struct {
servers []models.Server
randSource rand.Source
utils.NoPortForwarder
}
func New(servers []models.Server, randSource rand.Source) *Surfshark {
return &Surfshark{
func New(servers []models.Server, randSource rand.Source) *Provider {
return &Provider{
servers: servers,
randSource: randSource,
NoPortForwarder: utils.NewNoPortForwarding(providers.Surfshark),

2
internal/provider/torguard/connection.go
View File

@@ -6,7 +6,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Torguard) GetConnection(selection settings.ServerSelection) (
func (p *Provider) GetConnection(selection settings.ServerSelection) (
connection models.Connection, err error) {
defaults := utils.NewConnectionDefaults(1912, 1912, 0) //nolint:gomnd
return utils.GetConnection(p.servers, selection, defaults, p.randSource)

2
internal/provider/torguard/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (t *Torguard) BuildConf(connection models.Connection,
func (p *Provider) BuildConf(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
providerSettings := utils.OpenVPNProviderSettings{
RemoteCertTLS: true,

6
internal/provider/torguard/provider.go
View File

@@ -8,14 +8,14 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
type Torguard struct {
type Provider struct {
servers []models.Server
randSource rand.Source
utils.NoPortForwarder
}
func New(servers []models.Server, randSource rand.Source) *Torguard {
return &Torguard{
func New(servers []models.Server, randSource rand.Source) *Provider {
return &Provider{
servers: servers,
randSource: randSource,
NoPortForwarder: utils.NewNoPortForwarding(providers.Torguard),

4
internal/provider/vyprvpn/connection.go
View File

@@ -6,8 +6,8 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (v *Vyprvpn) GetConnection(selection settings.ServerSelection) (
func (p *Provider) GetConnection(selection settings.ServerSelection) (
connection models.Connection, err error) {
defaults := utils.NewConnectionDefaults(0, 443, 0) //nolint:gomnd
return utils.GetConnection(v.servers, selection, defaults, v.randSource)
return utils.GetConnection(p.servers, selection, defaults, p.randSource)
}

2
internal/provider/vyprvpn/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (v *Vyprvpn) BuildConf(connection models.Connection,
func (p *Provider) BuildConf(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
//nolint:gomnd
providerSettings := utils.OpenVPNProviderSettings{

6
internal/provider/vyprvpn/provider.go
View File

@@ -8,14 +8,14 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
type Vyprvpn struct {
type Provider struct {
servers []models.Server
randSource rand.Source
utils.NoPortForwarder
}
func New(servers []models.Server, randSource rand.Source) *Vyprvpn {
return &Vyprvpn{
func New(servers []models.Server, randSource rand.Source) *Provider {
return &Provider{
servers: servers,
randSource: randSource,
NoPortForwarder: utils.NewNoPortForwarding(providers.Vyprvpn),

4
internal/provider/wevpn/connection.go
View File

@@ -6,8 +6,8 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (w *Wevpn) GetConnection(selection settings.ServerSelection) (
func (p *Provider) GetConnection(selection settings.ServerSelection) (
connection models.Connection, err error) {
defaults := utils.NewConnectionDefaults(1195, 1194, 0) //nolint:gomnd
return utils.GetConnection(w.servers, selection, defaults, w.randSource)
return utils.GetConnection(p.servers, selection, defaults, p.randSource)
}

2
internal/provider/wevpn/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (w *Wevpn) BuildConf(connection models.Connection,
func (p *Provider) BuildConf(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
providerSettings := utils.OpenVPNProviderSettings{
RemoteCertTLS: true,

6
internal/provider/wevpn/provider.go
View File

@@ -8,14 +8,14 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
type Wevpn struct {
type Provider struct {
servers []models.Server
randSource rand.Source
utils.NoPortForwarder
}
func New(servers []models.Server, randSource rand.Source) *Wevpn {
return &Wevpn{
func New(servers []models.Server, randSource rand.Source) *Provider {
return &Provider{
servers: servers,
randSource: randSource,
NoPortForwarder: utils.NewNoPortForwarding(providers.Wevpn),

2
internal/provider/windscribe/connection.go
View File

@@ -6,7 +6,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Windscribe) GetConnection(selection settings.ServerSelection) (
func (p *Provider) GetConnection(selection settings.ServerSelection) (
connection models.Connection, err error) {
defaults := utils.NewConnectionDefaults(443, 1194, 1194) //nolint:gomnd
return utils.GetConnection(p.servers, selection, defaults, p.randSource)

2
internal/provider/windscribe/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (w *Windscribe) BuildConf(connection models.Connection,
func (p *Provider) BuildConf(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
providerSettings := utils.OpenVPNProviderSettings{
RemoteCertTLS: true,

6
internal/provider/windscribe/provider.go
View File

@@ -8,14 +8,14 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
type Windscribe struct {
type Provider struct {
servers []models.Server
randSource rand.Source
utils.NoPortForwarder
}
func New(servers []models.Server, randSource rand.Source) *Windscribe {
return &Windscribe{
func New(servers []models.Server, randSource rand.Source) *Provider {
return &Provider{
servers: servers,
randSource: randSource,
NoPortForwarder: utils.NewNoPortForwarding(providers.Windscribe),