From 8d258feff7cc62c35e742560a20129fde25e3321 Mon Sep 17 00:00:00 2001 From: "Quentin McGaw (desktop)" Date: Fri, 20 Aug 2021 01:13:04 +0000 Subject: [PATCH] Hot fix: interface name set for openvpn configs --- internal/openvpn/custom/custom_test.go | 6 +++--- internal/provider/cyberghost/openvpnconf.go | 2 +- internal/provider/fastestvpn/openvpnconf.go | 2 +- internal/provider/hidemyass/openvpnconf.go | 2 +- internal/provider/ipvanish/openvpnconf.go | 2 +- internal/provider/ivpn/openvpnconf.go | 2 +- internal/provider/mullvad/openvpnconf.go | 2 +- internal/provider/nordvpn/openvpnconf.go | 2 +- internal/provider/privado/openvpnconf.go | 2 +- internal/provider/privateinternetaccess/openvpnconf.go | 2 +- internal/provider/privatevpn/openvpnconf.go | 2 +- internal/provider/protonvpn/openvpnconf.go | 2 +- internal/provider/purevpn/openvpnconf.go | 2 +- internal/provider/surfshark/openvpnconf.go | 2 +- internal/provider/torguard/openvpnconf.go | 2 +- internal/provider/vpnunlimited/openvpnconf.go | 2 +- internal/provider/vyprvpn/openvpnconf.go | 2 +- internal/provider/windscribe/openvpnconf.go | 2 +- 18 files changed, 20 insertions(+), 20 deletions(-) diff --git a/internal/openvpn/custom/custom_test.go b/internal/openvpn/custom/custom_test.go index e028c812..34de0a89 100644 --- a/internal/openvpn/custom/custom_test.go +++ b/internal/openvpn/custom/custom_test.go @@ -30,7 +30,7 @@ func Test_BuildConfig(t *testing.T) { Cipher: "cipher", MSSFix: 999, Config: file.Name(), - Interface: "tun", + Interface: "tun0", } lines, connection, intf, err := BuildConfig(settings) @@ -40,7 +40,7 @@ func Test_BuildConfig(t *testing.T) { "keep me", "proto udp", "remote 1.9.8.7 1194", - "dev tun", + "dev tun0", "mute-replay-warnings", "auth-nocache", "pull-filter ignore \"auth-token\"", @@ -63,5 +63,5 @@ func Test_BuildConfig(t *testing.T) { } assert.Equal(t, expectedConnection, connection) - assert.Equal(t, "tun", intf) + assert.Equal(t, "tun0", intf) } diff --git a/internal/provider/cyberghost/openvpnconf.go b/internal/provider/cyberghost/openvpnconf.go index cc2edc70..231f5df8 100644 --- a/internal/provider/cyberghost/openvpnconf.go +++ b/internal/provider/cyberghost/openvpnconf.go @@ -22,7 +22,7 @@ func (c *Cyberghost) BuildConf(connection models.Connection, lines = []string{ "client", - "dev tun", + "dev " + settings.Interface, "nobind", "persist-key", "persist-tun", diff --git a/internal/provider/fastestvpn/openvpnconf.go b/internal/provider/fastestvpn/openvpnconf.go index 8227b5a9..105f434f 100644 --- a/internal/provider/fastestvpn/openvpnconf.go +++ b/internal/provider/fastestvpn/openvpnconf.go @@ -23,7 +23,7 @@ func (f *Fastestvpn) BuildConf(connection models.Connection, lines = []string{ "client", - "dev tun", + "dev " + settings.Interface, "nobind", "persist-key", "ping 15", diff --git a/internal/provider/hidemyass/openvpnconf.go b/internal/provider/hidemyass/openvpnconf.go index 3ced884e..6b898fec 100644 --- a/internal/provider/hidemyass/openvpnconf.go +++ b/internal/provider/hidemyass/openvpnconf.go @@ -17,7 +17,7 @@ func (h *HideMyAss) BuildConf(connection models.Connection, lines = []string{ "client", - "dev tun", + "dev " + settings.Interface, "nobind", "persist-key", "ping 5", diff --git a/internal/provider/ipvanish/openvpnconf.go b/internal/provider/ipvanish/openvpnconf.go index 5ee0455e..5065204f 100644 --- a/internal/provider/ipvanish/openvpnconf.go +++ b/internal/provider/ipvanish/openvpnconf.go @@ -20,7 +20,7 @@ func (i *Ipvanish) BuildConf(connection models.Connection, lines = []string{ "client", - "dev tun", + "dev " + settings.Interface, "nobind", "persist-key", "ping-timer-rem", diff --git a/internal/provider/ivpn/openvpnconf.go b/internal/provider/ivpn/openvpnconf.go index bcf4a88d..41307365 100644 --- a/internal/provider/ivpn/openvpnconf.go +++ b/internal/provider/ivpn/openvpnconf.go @@ -20,7 +20,7 @@ func (i *Ivpn) BuildConf(connection models.Connection, lines = []string{ "client", - "dev tun", + "dev " + settings.Interface, "nobind", "persist-key", "ping 5", diff --git a/internal/provider/mullvad/openvpnconf.go b/internal/provider/mullvad/openvpnconf.go index 1a1c98aa..20449880 100644 --- a/internal/provider/mullvad/openvpnconf.go +++ b/internal/provider/mullvad/openvpnconf.go @@ -17,7 +17,7 @@ func (m *Mullvad) BuildConf(connection models.Connection, lines = []string{ "client", - "dev tun", + "dev " + settings.Interface, "nobind", "persist-key", "remote-cert-tls server", diff --git a/internal/provider/nordvpn/openvpnconf.go b/internal/provider/nordvpn/openvpnconf.go index 601f827a..dd926ba1 100644 --- a/internal/provider/nordvpn/openvpnconf.go +++ b/internal/provider/nordvpn/openvpnconf.go @@ -25,7 +25,7 @@ func (n *Nordvpn) BuildConf(connection models.Connection, lines = []string{ "client", - "dev tun", + "dev " + settings.Interface, "nobind", "persist-key", "remote-cert-tls server", diff --git a/internal/provider/privado/openvpnconf.go b/internal/provider/privado/openvpnconf.go index b5985751..0c0af77e 100644 --- a/internal/provider/privado/openvpnconf.go +++ b/internal/provider/privado/openvpnconf.go @@ -21,7 +21,7 @@ func (p *Privado) BuildConf(connection models.Connection, lines = []string{ "client", - "dev tun", + "dev " + settings.Interface, "nobind", "persist-key", "ping 10", diff --git a/internal/provider/privateinternetaccess/openvpnconf.go b/internal/provider/privateinternetaccess/openvpnconf.go index 5bfa1c0b..78222f67 100644 --- a/internal/provider/privateinternetaccess/openvpnconf.go +++ b/internal/provider/privateinternetaccess/openvpnconf.go @@ -40,7 +40,7 @@ func (p *PIA) BuildConf(connection models.Connection, lines = []string{ "client", - "dev tun", + "dev " + settings.Interface, "nobind", "persist-key", "remote-cert-tls server", diff --git a/internal/provider/privatevpn/openvpnconf.go b/internal/provider/privatevpn/openvpnconf.go index 70bce0a4..fdb3194f 100644 --- a/internal/provider/privatevpn/openvpnconf.go +++ b/internal/provider/privatevpn/openvpnconf.go @@ -21,7 +21,7 @@ func (p *Privatevpn) BuildConf(connection models.Connection, lines = []string{ "client", - "dev tun", + "dev " + settings.Interface, "nobind", "persist-key", "remote-cert-tls server", diff --git a/internal/provider/protonvpn/openvpnconf.go b/internal/provider/protonvpn/openvpnconf.go index 6f69a69b..357b4e0c 100644 --- a/internal/provider/protonvpn/openvpnconf.go +++ b/internal/provider/protonvpn/openvpnconf.go @@ -26,7 +26,7 @@ func (p *Protonvpn) BuildConf(connection models.Connection, lines = []string{ "client", - "dev tun", + "dev " + settings.Interface, "nobind", "persist-key", "remote-cert-tls server", diff --git a/internal/provider/purevpn/openvpnconf.go b/internal/provider/purevpn/openvpnconf.go index 1433a0a0..db83de4a 100644 --- a/internal/provider/purevpn/openvpnconf.go +++ b/internal/provider/purevpn/openvpnconf.go @@ -17,7 +17,7 @@ func (p *Purevpn) BuildConf(connection models.Connection, lines = []string{ "client", - "dev tun", + "dev " + settings.Interface, "nobind", "persist-key", "remote-cert-tls server", diff --git a/internal/provider/surfshark/openvpnconf.go b/internal/provider/surfshark/openvpnconf.go index a4f11d54..58b5892f 100644 --- a/internal/provider/surfshark/openvpnconf.go +++ b/internal/provider/surfshark/openvpnconf.go @@ -26,7 +26,7 @@ func (s *Surfshark) BuildConf(connection models.Connection, lines = []string{ "client", - "dev tun", + "dev " + settings.Interface, "nobind", "persist-key", "remote-cert-tls server", diff --git a/internal/provider/torguard/openvpnconf.go b/internal/provider/torguard/openvpnconf.go index c3d06581..8ea3a6aa 100644 --- a/internal/provider/torguard/openvpnconf.go +++ b/internal/provider/torguard/openvpnconf.go @@ -26,7 +26,7 @@ func (t *Torguard) BuildConf(connection models.Connection, lines = []string{ "client", - "dev tun", + "dev " + settings.Interface, "nobind", "persist-key", "remote-cert-tls server", diff --git a/internal/provider/vpnunlimited/openvpnconf.go b/internal/provider/vpnunlimited/openvpnconf.go index 76924a7c..f2c65623 100644 --- a/internal/provider/vpnunlimited/openvpnconf.go +++ b/internal/provider/vpnunlimited/openvpnconf.go @@ -13,7 +13,7 @@ func (p *Provider) BuildConf(connection models.Connection, settings configuration.OpenVPN) (lines []string) { lines = []string{ "client", - "dev tun", + "dev " + settings.Interface, "nobind", "persist-key", "tls-exit", diff --git a/internal/provider/vyprvpn/openvpnconf.go b/internal/provider/vyprvpn/openvpnconf.go index 53118de1..1d8e4da4 100644 --- a/internal/provider/vyprvpn/openvpnconf.go +++ b/internal/provider/vyprvpn/openvpnconf.go @@ -21,7 +21,7 @@ func (v *Vyprvpn) BuildConf(connection models.Connection, lines = []string{ "client", - "dev tun", + "dev " + settings.Interface, "nobind", "persist-key", "remote-cert-tls server", diff --git a/internal/provider/windscribe/openvpnconf.go b/internal/provider/windscribe/openvpnconf.go index 519b76b0..33921c52 100644 --- a/internal/provider/windscribe/openvpnconf.go +++ b/internal/provider/windscribe/openvpnconf.go @@ -22,7 +22,7 @@ func (w *Windscribe) BuildConf(connection models.Connection, lines = []string{ "client", - "dev tun", + "dev " + settings.Interface, "nobind", "persist-key", "remote-cert-tls server",