diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2019-03-29 07:04:03 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2019-03-29 07:33:47 +0100 |
| commit | 2981d9997a15ab5f3abc92c8a134f39a67cc2768 (patch) | |
| tree | 806ea67a01ed9353b99b859cd8974a778d3bbb20 /talpid-core | |
| parent | 2870df54b0c12a66fd6a7f55d8fb7bab26bcdeae (diff) | |
| download | mullvadvpn-2981d9997a15ab5f3abc92c8a134f39a67cc2768.tar.xz mullvadvpn-2981d9997a15ab5f3abc92c8a134f39a67cc2768.zip | |
Upgrade filetime, nix & widestring
Diffstat (limited to 'talpid-core')
| -rw-r--r-- | talpid-core/Cargo.toml | 4 | ||||
| -rw-r--r-- | talpid-core/src/firewall/windows.rs | 6 | ||||
| -rw-r--r-- | talpid-core/src/winnet.rs | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml index 2fc392e719..188542f1c0 100644 --- a/talpid-core/Cargo.toml +++ b/talpid-core/Cargo.toml @@ -31,7 +31,7 @@ hex = "0.3" ipnetwork = "0.14" lazy_static = "1.0" tun = { git = "https://github.com/pinkisemils/rust-tun", branch = "add-raw-fd-traits" } -nix = "0.12" +nix = "0.13" [target.'cfg(target_os = "linux")'.dependencies] @@ -55,7 +55,7 @@ system-configuration = "0.2" [target.'cfg(windows)'.dependencies] -widestring = "0.3" +widestring = "0.4" winreg = "0.5" winapi = { version = "0.3.6", features = ["handleapi", "libloaderapi", "synchapi", "winbase", "winuser"] } diff --git a/talpid-core/src/firewall/windows.rs b/talpid-core/src/firewall/windows.rs index 143dd1cd4e..f84d01dc98 100644 --- a/talpid-core/src/firewall/windows.rs +++ b/talpid-core/src/firewall/windows.rs @@ -120,7 +120,7 @@ impl Firewall { // ip_str has to outlive winfw_relay let winfw_relay = WinFwRelay { - ip: ip_str.as_wide_c_str().as_ptr(), + ip: ip_str.as_ptr(), port: endpoint.address.port(), protocol: WinFwProt::from(endpoint.protocol), }; @@ -151,7 +151,7 @@ impl Firewall { // ip_str, gateway_str and tunnel_alias have to outlive winfw_relay let winfw_relay = WinFwRelay { - ip: ip_str.as_wide_c_str().as_ptr(), + ip: ip_str.as_ptr(), port: endpoint.address.port(), protocol: WinFwProt::from(endpoint.protocol), }; @@ -174,7 +174,7 @@ impl Firewall { WinFw_ApplyPolicyConnected( winfw_settings, &winfw_relay, - tunnel_alias.as_wide_c_str().as_ptr(), + tunnel_alias.as_ptr(), v4_gateway.as_ptr(), v6_gateway_ptr, ) diff --git a/talpid-core/src/winnet.rs b/talpid-core/src/winnet.rs index 0eb80c794b..f6a932acfb 100644 --- a/talpid-core/src/winnet.rs +++ b/talpid-core/src/winnet.rs @@ -36,7 +36,7 @@ pub fn ensure_top_metric_for_interface(interface_alias: &str) -> Result<bool> { let metric_result = unsafe { WinRoute_EnsureTopMetric( - interface_alias_ws.as_wide_c_str().as_ptr(), + interface_alias_ws.as_ptr(), Some(error_sink), ptr::null_mut(), ) |