Maint: OpenVPN option: remove all ping-* options

- Use the built-in healthcheck vpn restart mechanism instead - Restarting with `ping-restart` or `ping-exit` would only restart with the same `remote` connection - Specify `ping` options as VPN specific to ensure the server doesn't disconnect us
2021-09-14 15:23:56 +00:00
parent 9f65157a0d
commit c3078f84e8
13 changed files with 11 additions and 25 deletions
--- a/internal/provider/cyberghost/openvpnconf.go
+++ b/internal/provider/cyberghost/openvpnconf.go
@@ -25,11 +25,10 @@ func (c *Cyberghost) BuildConf(connection models.Connection,
 		"dev " + settings.Interface,
 		"nobind",
 		"remote-cert-tls server",
-		"ping 10",
-		"ping-exit 60",
 		"tls-exit",

 		// Cyberghost specific
+		"ping 10",

 		// Added constant values
 		"auth-nocache",
--- a/internal/provider/fastestvpn/openvpnconf.go
+++ b/internal/provider/fastestvpn/openvpnconf.go
@@ -25,12 +25,10 @@ func (f *Fastestvpn) BuildConf(connection models.Connection,
 		"client",
 		"dev " + settings.Interface,
 		"nobind",
-		"ping 15",
-		"ping-exit 60",
 		"tls-exit",

 		// Fastestvpn specific
-		"ping-restart 0",
+		"ping 15",
 		"tls-cipher  TLS-DHE-RSA-WITH-AES-256-GCM-SHA384:TLS-DHE-RSA-WITH-AES-256-CBC-SHA256:TLS-DHE-RSA-WITH-CAMELLIA-256-CBC-SHA:TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-CAMELLIA-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA", //nolint:lll
 		"key-direction 1",
 		"tun-mtu-extra 32",
--- a/internal/provider/hidemyass/openvpnconf.go
+++ b/internal/provider/hidemyass/openvpnconf.go
@@ -19,11 +19,10 @@ func (h *HideMyAss) BuildConf(connection models.Connection,
 		"client",
 		"dev " + settings.Interface,
 		"nobind",
-		"ping 5",
-		"ping-exit 30",
 		"tls-exit",

 		// HideMyAss specific
+		"ping 5",
 		"remote-cert-tls server", // updated name of ns-cert-type
 		// "route-metric 1",

--- a/internal/provider/ivpn/openvpnconf.go
+++ b/internal/provider/ivpn/openvpnconf.go
@@ -22,11 +22,10 @@ func (i *Ivpn) BuildConf(connection models.Connection,
 		"client",
 		"dev " + settings.Interface,
 		"nobind",
-		"ping 5",
-		"ping-exit 30",
 		"tls-exit",

 		// IVPN specific
+		"ping 5",
 		"remote-cert-tls server", // updated name of ns-cert-type
 		"key-direction 1",
 		"tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA",
--- a/internal/provider/mullvad/openvpnconf.go
+++ b/internal/provider/mullvad/openvpnconf.go
@@ -20,11 +20,10 @@ func (m *Mullvad) BuildConf(connection models.Connection,
 		"dev " + settings.Interface,
 		"nobind",
 		"remote-cert-tls server",
-		"ping 10",
-		"ping-exit 60",
 		"tls-exit",

 		// Mullvad specific
+		"ping 10",
 		"sndbuf 524288",
 		"rcvbuf 524288",
 		"tls-cipher TLS-DHE-RSA-WITH-AES-256-GCM-SHA384:TLS-DHE-RSA-WITH-AES-256-CBC-SHA",
--- a/internal/provider/nordvpn/openvpnconf.go
+++ b/internal/provider/nordvpn/openvpnconf.go
@@ -36,7 +36,6 @@ func (n *Nordvpn) BuildConf(connection models.Connection,
 		"reneg-sec 0",
 		"key-direction 1",
 		"ping 15",
-		"ping-restart 0",

 		// Added constant values
 		"auth-nocache",
--- a/internal/provider/privado/openvpnconf.go
+++ b/internal/provider/privado/openvpnconf.go
@@ -23,11 +23,10 @@ func (p *Privado) BuildConf(connection models.Connection,
 		"client",
 		"dev " + settings.Interface,
 		"nobind",
-		"ping 10",
-		"ping-exit 60",
 		"tls-exit",

 		// Privado specific
+		"ping 10",
 		"tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA",
 		"verify-x509-name " + connection.Hostname + " name",

--- a/internal/provider/purevpn/openvpnconf.go
+++ b/internal/provider/purevpn/openvpnconf.go
@@ -20,11 +20,10 @@ func (p *Purevpn) BuildConf(connection models.Connection,
 		"dev " + settings.Interface,
 		"nobind",
 		"remote-cert-tls server",
-		"ping 10",
-		"ping-exit 60",
 		"tls-exit",

 		// Purevpn specific
+		"ping 10",
 		"key-direction 1",
 		"remote-cert-tls server",
 		"cipher AES-256-CBC",
--- a/internal/provider/surfshark/openvpnconf.go
+++ b/internal/provider/surfshark/openvpnconf.go
@@ -29,15 +29,14 @@ func (s *Surfshark) BuildConf(connection models.Connection,
 		"dev " + settings.Interface,
 		"nobind",
 		"remote-cert-tls server",
-		"ping 15",
 		"tls-exit",

 		// Surfshark specific
+		"ping 15",
 		"tun-mtu-extra 32",
 		"mssfix " + strconv.Itoa(int(settings.MSSFix)),
 		"reneg-sec 0",
 		"key-direction 1",
-		"ping-restart 0",

 		// Added constant values
 		"auth-nocache",
--- a/internal/provider/torguard/openvpnconf.go
+++ b/internal/provider/torguard/openvpnconf.go
@@ -29,11 +29,10 @@ func (t *Torguard) BuildConf(connection models.Connection,
 		"dev " + settings.Interface,
 		"nobind",
 		"remote-cert-tls server",
-		"ping 5",
-		"ping-restart 30",
 		"tls-exit",

 		// Torguard specific
+		"ping 5",
 		"tun-mtu-extra 32",
 		"mssfix " + strconv.Itoa(int(settings.MSSFix)),
 		"reneg-sec 0",
--- a/internal/provider/vpnunlimited/openvpnconf.go
+++ b/internal/provider/vpnunlimited/openvpnconf.go
@@ -21,7 +21,6 @@ func (p *Provider) BuildConf(connection models.Connection,
 		// VPNUnlimited specific
 		"reneg-sec 0",
 		"ping 5",
-		"ping-exit 30",
 		"route-metric 1",

 		// Added constant values
--- a/internal/provider/vyprvpn/openvpnconf.go
+++ b/internal/provider/vyprvpn/openvpnconf.go
@@ -24,11 +24,10 @@ func (v *Vyprvpn) BuildConf(connection models.Connection,
 		"dev " + settings.Interface,
 		"nobind",
 		"remote-cert-tls server",
-		"ping 10",
-		"ping-exit 60",
 		"tls-exit",

 		// Vyprvpn specific
+		"ping 10",
 		// "verify-x509-name lu1.vyprvpn.com name",
 		"tls-cipher TLS-ECDHE-RSA-WITH-AES-256-GCM-SHA384:TLS-DHE-RSA-WITH-AES-256-CBC-SHA256:TLS-DHE-RSA-WITH-AES-256-CBC-SHA", //nolint:lll

--- a/internal/provider/windscribe/openvpnconf.go
+++ b/internal/provider/windscribe/openvpnconf.go
@@ -25,11 +25,10 @@ func (w *Windscribe) BuildConf(connection models.Connection,
 		"dev " + settings.Interface,
 		"nobind",
 		"remote-cert-tls server",
-		"ping 10",
-		"ping-exit 60",
 		"tls-exit",

 		// Windscribe specific
+		"ping 10",
 		"key-direction 1",
 		"reneg-sec 0",