diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2019-11-25 15:38:32 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2019-11-25 19:06:04 +0100 |
| commit | 2bc5550169602657e52ebc6aaed001ea52f9a17c (patch) | |
| tree | 669ab538fc07eddfca8358150e1715946b049d15 | |
| parent | 01bfa1e1d4bf7cc5edfffca78f101c43c8cb3cb6 (diff) | |
| download | mullvadvpn-2bc5550169602657e52ebc6aaed001ea52f9a17c.tar.xz mullvadvpn-2bc5550169602657e52ebc6aaed001ea52f9a17c.zip | |
Rename set_default to add_default for default route callbacks
| -rw-r--r-- | talpid-core/src/routing/mod.rs | 4 | ||||
| -rw-r--r-- | talpid-core/src/tunnel/wireguard/mod.rs | 2 | ||||
| -rw-r--r-- | talpid-core/src/winnet.rs | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/talpid-core/src/routing/mod.rs b/talpid-core/src/routing/mod.rs index 4636b0b27d..a01ef01723 100644 --- a/talpid-core/src/routing/mod.rs +++ b/talpid-core/src/routing/mod.rs @@ -82,12 +82,12 @@ impl RouteManager { /// Sets a callback that is called whenever the default route changes. #[cfg(target_os = "windows")] - pub fn set_default_route_callback<T: 'static>( + pub fn add_default_route_callback<T: 'static>( &mut self, callback: Option<winnet::DefaultRouteChangedCallback>, context: T, ) { - match winnet::set_default_route_change_callback(callback, context) { + match winnet::add_default_route_change_callback(callback, context) { Err(_e) => { // not sure if this should panic log::error!("Failed to add callback!"); diff --git a/talpid-core/src/tunnel/wireguard/mod.rs b/talpid-core/src/tunnel/wireguard/mod.rs index 1f7f11052f..58abe1897e 100644 --- a/talpid-core/src/tunnel/wireguard/mod.rs +++ b/talpid-core/src/tunnel/wireguard/mod.rs @@ -107,7 +107,7 @@ impl WireguardMonitor { #[cfg(target_os = "windows")] route_handle - .set_default_route_callback(Some(WgGoTunnel::default_route_changed_callback), ()); + .add_default_route_callback(Some(WgGoTunnel::default_route_changed_callback), ()); let event_callback = Box::new(on_event.clone()); let (close_msg_sender, close_msg_receiver) = mpsc::channel(); diff --git a/talpid-core/src/winnet.rs b/talpid-core/src/winnet.rs index 6b42f6d810..d4130e213b 100644 --- a/talpid-core/src/winnet.rs +++ b/talpid-core/src/winnet.rs @@ -338,7 +338,7 @@ pub type DefaultRouteChangedCallback = unsafe extern "system" fn( #[error(display = "Failed to set callback for default route")] pub struct DefaultRouteCallbackError; -pub fn set_default_route_change_callback<T: 'static>( +pub fn add_default_route_change_callback<T: 'static>( callback: Option<DefaultRouteChangedCallback>, context: T, ) -> std::result::Result<WinNetCallbackHandle, DefaultRouteCallbackError> { @@ -351,7 +351,6 @@ pub fn set_default_route_change_callback<T: 'static>( return Err(DefaultRouteCallbackError); } - Ok(WinNetCallbackHandle { handle: handle_ptr, _context: context, |