NoInterfaceFound error now prints the interface name

Author: Techassi

crates/lib-dhcp/src/client/error.rs

@@ -19,8 +19,8 @@ pub enum ClientError {
     #[error("Failed to retrieve interfaces: {0}")]
     InterfaceError(#[from] InterfaceError),
 
-    #[error("Failed to select a network interface")]
-    NoInterfaceFound,
+    #[error("Failed to select a network interface: {0}")]
+    NoInterfaceFound(String),
 
     #[error("Parse hardware address error: {0}")]
     ParseHardwareAddrError(#[from] ParseHardwareAddrError),

crates/lib-dhcp/src/client/mod.rs

@@ -70,7 +70,7 @@ impl ClientBuilder {
         let interface =
             match utils::select_network_interface(&self.interface, self.interface_fallback)? {
                 Some(ifa) => ifa,
-                None => return Err(ClientError::NoInterfaceFound),
+                None => return Err(ClientError::NoInterfaceFound(self.interface)),
             };
 
         let hardware_address = match &interface.mac_addr {
@@ -132,6 +132,8 @@ impl ClientBuilder {
     }
 }
 
+// TODO (Techassi): The T1 and T2 timers a implemented slightly wrong. See 4.4.5
+
 pub struct Client {
     /// Duration before the binding process of the socket times out.
     bind_timeout: time::Duration,
@@ -231,7 +233,7 @@ impl Client {
         println!("Sending DHCPDISCOVER message");
         let discover_message = self.builder.make_discover_message(
             self.get_xid(),
-            Some(self.destination_addr()),
+            self.destination_addr(),
             None,
             None,
         )?;
@@ -601,7 +603,7 @@ impl Client {
             &self.interface.name,
         )?;
 
-        Ok(())
+        Ok(self.transition_to(DhcpState::Bound)?)
     }
 
     /// Returns the current transaction ID.