Fix up linux build

[netwatcher] / src / watch_linux.rs

diff --git a/src/watch_linux.rs b/src/watch_linux.rs
index dc9957211a698fc4269911e4adf674bfd4f8cfc4..e49d629cde92d7f5a25f4b930d77d331bf815c19 100644 (file)
--- a/src/watch_linux.rs
+++ b/src/watch_linux.rs
@@ -11,9 +11,9 @@ use nix::sys::socket::socket;
 use nix::sys::socket::AddressFamily;
 use nix::sys::socket::MsgFlags;
 use nix::sys::socket::NetlinkAddr;
 use nix::sys::socket::AddressFamily;
 use nix::sys::socket::MsgFlags;
 use nix::sys::socket::NetlinkAddr;

+use nix::sys::socket::SockFlag;

 use nix::sys::socket::SockProtocol;
 use nix::sys::socket::SockType;
 use nix::sys::socket::SockProtocol;
 use nix::sys::socket::SockType;

-use nix::sys::socket::SOCK_NONBLOCK;

 use nix::unistd::pipe;
 
 use crate::Error;
 use nix::unistd::pipe;
 
 use crate::Error;


@@ -35,7 +35,7 @@ pub(crate) struct WatchHandle {
 impl Drop for WatchHandle {
     fn drop(&mut self) {
         drop(self.pipefd.take());
 impl Drop for WatchHandle {
     fn drop(&mut self) {
         drop(self.pipefd.take());

-        let _ = self.complete.take().recv();
+        let _ = self.complete.take().unwrap().recv();

     }
 }
 
     }
 }
 


@@ -55,11 +55,10 @@ fn start_watcher_thread<F: FnMut(Update) + Send + 'static>(
     let sockfd = socket(
         AddressFamily::Netlink,
         SockType::Raw,
     let sockfd = socket(
         AddressFamily::Netlink,
         SockType::Raw,

-        SOCK_NONBLOCK,
+        SockFlag::SOCK_NONBLOCK,

         Some(SockProtocol::NetlinkRoute),
     )
     .map_err(|e| Error::CreateSocket(e.to_string()))?;
         Some(SockProtocol::NetlinkRoute),
     )
     .map_err(|e| Error::CreateSocket(e.to_string()))?;

-    sockfd.set_nonblocking(true);

     let sa_nl = NetlinkAddr::new(
         0,
         (RTMGRP_LINK | RTMGRP_IPV4_IFADDR | RTMGRP_IPV6_IFADDR) as u32,
     let sa_nl = NetlinkAddr::new(
         0,
         (RTMGRP_LINK | RTMGRP_IPV4_IFADDR | RTMGRP_IPV6_IFADDR) as u32,


@@ -124,5 +123,5 @@ fn start_watcher_thread<F: FnMut(Update) + Send + 'static>(
         drop(complete_tx);
     });
 
         drop(complete_tx);
     });
 

-    Ok(pipe_wr)
+    Ok((pipe_wr, complete_rx))

 }
 }