diff options
| author | Emīls <emils@mullvad.net> | 2019-11-28 16:45:20 +0000 |
|---|---|---|
| committer | Emīls <emils@mullvad.net> | 2019-11-28 16:45:20 +0000 |
| commit | e8ccf55092fad45ca7c63bc97c74e18ece55c5d0 (patch) | |
| tree | 4e087970500212792fb480480a2b4753e0c818fc | |
| parent | 028426e9e9528830ae62772b7ffc80e57e3bd829 (diff) | |
| parent | a59c17287e724336c548e679be895248c7caf3f7 (diff) | |
| download | mullvadvpn-e8ccf55092fad45ca7c63bc97c74e18ece55c5d0.tar.xz mullvadvpn-e8ccf55092fad45ca7c63bc97c74e18ece55c5d0.zip | |
Merge remote-tracking branch 'origin/windows-fix-routing-manager'
| -rw-r--r-- | talpid-core/src/winnet.rs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/talpid-core/src/winnet.rs b/talpid-core/src/winnet.rs index 7568200d43..231aacf08a 100644 --- a/talpid-core/src/winnet.rs +++ b/talpid-core/src/winnet.rs @@ -286,8 +286,8 @@ impl Drop for WinNetRoute { } pub fn activate_routing_manager(routes: &[WinNetRoute]) -> bool { - unsafe { WinNet_ActivateRouteManager(Some(log_sink), ptr::null_mut()) }; - routing_manager_add_routes(routes) + return unsafe { WinNet_ActivateRouteManager(Some(log_sink), ptr::null_mut()) } + && routing_manager_add_routes(routes); } pub struct WinNetCallbackHandle { @@ -391,7 +391,10 @@ mod api { extern "system" { #[link_name = "WinNet_ActivateRouteManager"] - pub fn WinNet_ActivateRouteManager(sink: Option<LogSink>, sink_context: *mut c_void); + pub fn WinNet_ActivateRouteManager( + sink: Option<LogSink>, + sink_context: *mut c_void, + ) -> bool; #[link_name = "WinNet_AddRoutes"] pub fn WinNet_AddRoutes(routes: *const super::WinNetRoute, num_routes: u32) -> bool; |
