fixups

Author: dignifiedquire

netwatch/src/interfaces/linux.rs

@@ -23,6 +23,8 @@ pub enum Error {
     MissingDestinationField,
     #[error("mask field is missing")]
     MissingMaskField,
+    #[error("netlink")]
+    Netlink(#[from] rtnetlink::Error),
 }
 
 pub async fn default_route() -> Option<DefaultRouteDetails> {

netwatch/src/netmon/actor.rs

@@ -5,6 +5,7 @@ use std::{
 };
 
 use futures_lite::future::Boxed as BoxFuture;
+pub(super) use os::Error;
 use os::{is_interesting_interface, RouteMonitor};
 use tokio::sync::{mpsc, oneshot};
 use tracing::{debug, trace};
@@ -28,8 +29,6 @@ use crate::{
     ip::is_link_local,
 };
 
-pub(super) use os::Error;
-
 /// The message sent by the OS specific monitors.
 #[derive(Debug, Copy, Clone)]
 pub(super) enum NetworkMessage {

netwatch/src/netmon/windows.rs

@@ -22,7 +22,8 @@ pub(super) struct RouteMonitor {
 pub enum Error {
     #[error("IO {0}")]
     Io(#[from] std::io::Error),
-    NotifyUnicastIpAddressChange(#[from] WIN32_ERROR),
+    #[error("win32: {0}")]
+    Win32(#[from] windows::Win32::Foundation::Error),
 }
 
 impl RouteMonitor {
@@ -112,7 +113,8 @@ impl CallbackHandler {
                 Some(Arc::as_ptr(&cb) as *const c_void), // context
                 BOOLEAN::from(false),                    // initial notification,
                 &mut handle,
-            )?;
+            )
+            .ok()?;
         }
 
         self.unicast_callbacks.insert(handle.0 as isize, cb);
@@ -131,7 +133,8 @@ impl CallbackHandler {
             .is_some()
         {
             unsafe {
-                windows::Win32::NetworkManagement::IpHelper::CancelMibChangeNotify2(handle.0)?;
+                windows::Win32::NetworkManagement::IpHelper::CancelMibChangeNotify2(handle.0)
+                    .ok()?;
             }
         }
 
@@ -152,7 +155,8 @@ impl CallbackHandler {
                 Arc::as_ptr(&cb) as *const c_void, // context
                 BOOLEAN::from(false),              // initial notification,
                 &mut handle,
-            )?;
+            )
+            .ok()?;
         }
 
         self.route_callbacks.insert(handle.0 as isize, cb);
@@ -171,7 +175,8 @@ impl CallbackHandler {
             .is_some()
         {
             unsafe {
-                windows::Win32::NetworkManagement::IpHelper::CancelMibChangeNotify2(handle.0)?;
+                windows::Win32::NetworkManagement::IpHelper::CancelMibChangeNotify2(handle.0)
+                    .ok()?;
             }
         }
 

netwatch/src/udp.rs

@@ -814,10 +814,10 @@ impl Drop for UdpSocket {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-
     use testresult::TestResult;
 
+    use super::*;
+
     #[tokio::test]
     async fn test_reconnect() -> TestResult {
         let (s_b, mut r_b) = tokio::sync::mpsc::channel(16);