Merge pull request #1376 from Luap99/mozim-netlink

mozim: do not use netlink feature

Author: baude

Cargo.lock

@@ -55,7 +55,7 @@ tokio-stream = { version = "0.1.18", features = ["net"] }
 tonic = "0.14.2"
 tonic-prost = "0.14.2"
 prost = "0.14.1"
-mozim = "0.3.1"
+mozim = { version = "0.3.1", default-features = false }
 futures-channel = "0.3.31"
 futures-core = "0.3.31"
 futures-util = "0.3.31"

Cargo.toml

@@ -1,6 +1,9 @@
 use std::{net::Ipv4Addr, sync::Arc};
 
-use crate::network::netlink_route::{LinkID, Route};
+use crate::network::{
+    netlink,
+    netlink_route::{LinkID, NetlinkRoute, Route},
+};
 use log::debug;
 use mozim::{DhcpV4Client, DhcpV4Config, DhcpV4Lease as MozimV4Lease, DhcpV4State};
 use tokio::sync::Mutex;
@@ -54,6 +57,14 @@ impl DhcpV4Service {
             .map_err(|e| DhcpServiceError::new(InvalidArgument, e.to_string()))?;
         config.set_timeout_sec(timeout);
 
+        let mut socket = netlink::Socket::<NetlinkRoute>::new()
+            .map_err(|e| DhcpServiceError::new(InvalidArgument, e.to_string()))?;
+        let link = socket
+            .get_link(LinkID::Name(nc.host_iface.clone()))
+            .map_err(|e| DhcpServiceError::new(InvalidArgument, e.to_string()))?;
+
+        config.set_iface_index(link.header.index);
+
         // Sending the hostname to the DHCP server is optional but it can be
         // useful in environments where DDNS is used to create or update
         // DNS records.