diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-11-15 15:37:10 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-11-15 16:26:04 +0100 |
| commit | 74188a87413f4d99c48e05b808a1483d11c28bbd (patch) | |
| tree | d94f8bdcd49eef8a08667d61aa2282be091b8838 | |
| parent | 77e16517d54c9d0fbb9a1252acdca8dbf628a039 (diff) | |
| download | mullvadvpn-74188a87413f4d99c48e05b808a1483d11c28bbd.tar.xz mullvadvpn-74188a87413f4d99c48e05b808a1483d11c28bbd.zip | |
Move Windows default route arguments to BASE_ARGUMENTS
| -rw-r--r-- | talpid-core/src/process/openvpn.rs | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/talpid-core/src/process/openvpn.rs b/talpid-core/src/process/openvpn.rs index 2a17fe81ab..c524277290 100644 --- a/talpid-core/src/process/openvpn.rs +++ b/talpid-core/src/process/openvpn.rs @@ -31,6 +31,16 @@ static BASE_ARGUMENTS: &[&[&str]] = &[ &["--fast-io"], &["--cipher", "AES-256-CBC"], &["--verb", "3"], + #[cfg(windows)] + &[ + "--route-gateway", + "dhcp", + "--route", + "0.0.0.0", + "0.0.0.0", + "vpn_gateway", + "1", + ], ]; static ALLOWED_TLS_CIPHERS: &[&str] = &[ @@ -219,11 +229,6 @@ impl OpenVpnCommand { args.extend(Self::security_arguments().iter().map(OsString::from)); args.extend(self.proxy_arguments().iter().map(OsString::from)); - #[cfg(windows)] - { - args.extend(Self::default_route_arguments().iter().map(OsString::from)); - } - args } @@ -302,18 +307,6 @@ impl OpenVpnCommand { }; args } - - fn default_route_arguments() -> Vec<String> { - vec![ - "--route-gateway".to_owned(), - "dhcp".to_owned(), - "--route".to_owned(), - "0.0.0.0".to_owned(), - "0.0.0.0".to_owned(), - "vpn_gateway".to_owned(), - "1".to_owned(), - ] - } } impl fmt::Display for OpenVpnCommand { |