diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2018-08-10 14:27:31 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2018-09-06 08:46:05 -0300 |
| commit | 6312481a9086f84b0e551d802008b173e632769c (patch) | |
| tree | 21691ed0b9d1abc1cac888fb847fda49ac45d7ce | |
| parent | c448ca931fddacce052a392614d2d906033ca933 (diff) | |
| download | mullvadvpn-6312481a9086f84b0e551d802008b173e632769c.tar.xz mullvadvpn-6312481a9086f84b0e551d802008b173e632769c.zip | |
Move OpenVPN tunnel endpoint check to a new method
| -rw-r--r-- | talpid-core/src/tunnel/mod.rs | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/talpid-core/src/tunnel/mod.rs b/talpid-core/src/tunnel/mod.rs index ce49ea7b0d..9c23bcad59 100644 --- a/talpid-core/src/tunnel/mod.rs +++ b/talpid-core/src/tunnel/mod.rs @@ -150,10 +150,8 @@ impl TunnelMonitor { where L: Fn(TunnelEvent) + Send + Sync + 'static, { - match tunnel_endpoint.tunnel { - TunnelEndpointData::OpenVpn(_) => (), - TunnelEndpointData::Wireguard(_) => bail!(ErrorKind::UnsupportedTunnelProtocol), - } + Self::ensure_endpoint_is_openvpn(&tunnel_endpoint)?; + let user_pass_file = Self::create_user_pass_file(username).chain_err(|| ErrorKind::CredentialsWriteError)?; let cmd = Self::create_openvpn_cmd( @@ -188,6 +186,13 @@ impl TunnelMonitor { }) } + fn ensure_endpoint_is_openvpn(endpoint: &TunnelEndpoint) -> Result<()> { + match endpoint.tunnel { + TunnelEndpointData::OpenVpn(_) => Ok(()), + TunnelEndpointData::Wireguard(_) => bail!(ErrorKind::UnsupportedTunnelProtocol), + } + } + fn create_openvpn_cmd( remote: Endpoint, tunnel_alias: Option<OsString>, |