From 1cd3a1890baa6bf9d919fb32b829c3f4ac8eaa59 Mon Sep 17 00:00:00 2001
From: Gris Ge <fge@redhat.com>
Date: Sun, 15 Dec 2024 14:04:39 +0800
Subject: [PATCH] Upgrade to nix 0.29

Signed-off-by: Gris Ge <fge@redhat.com>
---
 Cargo.toml          | 2 +-
 src/client_async.rs | 4 ++--
 src/event.rs        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 8c8445f..a3fe42a 100644
--- a/Cargo.toml
+++ b/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"] }
 
diff --git a/src/client_async.rs b/src/client_async.rs
index 4b352da..919e8dd 100644
--- a/src/client_async.rs
+++ b/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
diff --git a/src/event.rs b/src/event.rs
index d07f8ef..0c34a92 100644
--- a/src/event.rs
+++ b/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] {