Upgrade to nix 0.29

Signed-off-by: Gris Ge <[email protected]>

Cargo.toml

@@ -17,7 +17,7 @@ byteorder = "1.4.3"
 dhcproto = "0.9.0"
 log = "0.4.17"
 etherparse = "0.13.0"
-nix = { version = "0.27.0", features = ["poll", "time", "event"] }
+nix = { version = "0.29.0", features = ["poll", "time", "event"] }
 nispor = "1.2.17"
 futures = { version = "0.3", default-features = false, features = ["std"] }
 

src/client_async.rs

@@ -13,7 +13,7 @@ use nix::poll::{PollFd, PollFlags};
 
 use crate::{DhcpError, DhcpV4Client, DhcpV4Config, DhcpV4Lease, ErrorKind};
 
-const POLL_TIMEOUT: libc::c_int = 1000; // milliseconds
+const POLL_TIMEOUT: u16 = 1000; // milliseconds
 
 #[derive(Debug)]
 struct ShareState {
@@ -107,7 +107,7 @@ impl std::ops::Drop for DhcpV4ClientAsync {
 fn poll_thread(fd: RawFd, share_state: Arc<Mutex<ShareState>>) {
     let fd = unsafe { BorrowedFd::borrow_raw(fd) };
     let mut poll_fds = [PollFd::new(
-        &fd,
+        fd,
         PollFlags::POLLIN
             | PollFlags::POLLOUT
             | PollFlags::POLLHUP

src/event.rs

@@ -233,7 +233,7 @@ impl DhcpEpoll {
             [EpollEvent::empty(); EVENT_BUFFER_COUNT];
 
         loop {
-            match self.fd.wait(&mut events, 1000 * wait_time) {
+            match self.fd.wait(&mut events, 1000 * wait_time as u16) {
                 Ok(c) => {
                     let mut ret = Vec::new();
                     for i in &events[..c] {