diff options
| author | David Lönnhager <david.l@mullvad.net> | 2019-11-25 18:01:14 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2019-11-26 14:26:56 +0100 |
| commit | f38b18e3a4f5d11051cc8d3fe7f6a4129682cada (patch) | |
| tree | c162cec23f9fb6b9cb3aa32db47103c2b1842ac3 | |
| parent | 7f075d9c74682e5efa36d3aa07f6e792596c6120 (diff) | |
| download | mullvadvpn-f38b18e3a4f5d11051cc8d3fe7f6a4129682cada.tar.xz mullvadvpn-f38b18e3a4f5d11051cc8d3fe7f6a4129682cada.zip | |
Fix FFI function return type
| -rw-r--r-- | talpid-core/src/offline/windows.rs | 4 | ||||
| -rw-r--r-- | talpid-core/src/routing/windows.rs | 4 | ||||
| -rw-r--r-- | talpid-core/src/winnet.rs | 8 |
3 files changed, 6 insertions, 10 deletions
diff --git a/talpid-core/src/offline/windows.rs b/talpid-core/src/offline/windows.rs index 816fe89b4d..3d4ed27271 100644 --- a/talpid-core/src/offline/windows.rs +++ b/talpid-core/src/offline/windows.rs @@ -223,9 +223,7 @@ impl Drop for BroadcastListener { PostThreadMessageW(self.thread_id, REQUEST_THREAD_SHUTDOWN, 0, 0); WaitForSingleObject(self.thread_handle, INFINITE); CloseHandle(self.thread_handle); - if !winnet::WinNet_DeactivateConnectivityMonitor() { - log::error!("Failed to deactivate connectivity monitor"); - } + winnet::WinNet_DeactivateConnectivityMonitor(); } } } diff --git a/talpid-core/src/routing/windows.rs b/talpid-core/src/routing/windows.rs index 684d1a3184..9e70c800fa 100644 --- a/talpid-core/src/routing/windows.rs +++ b/talpid-core/src/routing/windows.rs @@ -47,9 +47,7 @@ impl RouteManagerImpl { impl Drop for RouteManagerImpl { fn drop(&mut self) { - if !winnet::deactivate_routing_manager() { - log::error!("Failed to deactivate routing manager"); - } + winnet::deactivate_routing_manager() } } diff --git a/talpid-core/src/winnet.rs b/talpid-core/src/winnet.rs index d4130e213b..7568200d43 100644 --- a/talpid-core/src/winnet.rs +++ b/talpid-core/src/winnet.rs @@ -364,7 +364,7 @@ pub fn routing_manager_add_routes(routes: &[WinNetRoute]) -> bool { unsafe { WinNet_AddRoutes(ptr, length) } } -pub fn deactivate_routing_manager() -> bool { +pub fn deactivate_routing_manager() { unsafe { WinNet_DeactivateRouteManager() } } @@ -406,7 +406,7 @@ mod api { // pub fn WinNet_DeleteRoute(route: *const super::WinNetRoute) -> bool; #[link_name = "WinNet_DeactivateRouteManager"] - pub fn WinNet_DeactivateRouteManager() -> bool; + pub fn WinNet_DeactivateRouteManager(); #[link_name = "WinNet_EnsureTopMetric"] pub fn WinNet_EnsureTopMetric( @@ -429,7 +429,7 @@ mod api { ) -> bool; #[link_name = "WinNet_ReleaseString"] - pub fn WinNet_ReleaseString(string: *mut wchar_t) -> u32; + pub fn WinNet_ReleaseString(string: *mut wchar_t); #[link_name = "WinNet_ActivateConnectivityMonitor"] pub fn WinNet_ActivateConnectivityMonitor( @@ -450,7 +450,7 @@ mod api { pub fn WinNet_UnregisterDefaultRouteChangedCallback(registrationHandle: *mut libc::c_void); #[link_name = "WinNet_DeactivateConnectivityMonitor"] - pub fn WinNet_DeactivateConnectivityMonitor() -> bool; + pub fn WinNet_DeactivateConnectivityMonitor(); #[link_name = "WinNet_AddDeviceIpAddresses"] pub fn WinNet_AddDeviceIpAddresses( |
