Add MINIMAL_RETRANS_DURATION_SECS constant

Author: Techassi

crates/lib-dhcp/src/constants.rs

@@ -1,9 +1,13 @@
-pub const DHCP_MAGIC_COOKIE_ARR: [u8; 4] = [99, 130, 83, 99];
-pub const DHCP_MINIMUM_LEGAL_MAX_MESSAGE_SIZE: u16 = 576;
-pub const DHCP_MAGIC_COOKIE: u32 = 1_669_485_411;
-pub const DHCP_MIN_MSG_SIZE: usize = 300;
-pub const DHCP_SERVER_PORT: u16 = 67;
-pub const DHCP_CLIENT_PORT: u16 = 68;
+pub const MINIMUM_LEGAL_MAX_MESSAGE_SIZE: u16 = 576;
+pub const MIN_MSG_SIZE: usize = 300;
+
+pub const SERVER_PORT: u16 = 67;
+pub const CLIENT_PORT: u16 = 68;
+
+pub const MAGIC_COOKIE_ARR: [u8; 4] = [99, 130, 83, 99];
+pub const MAGIC_COOKIE: u32 = 1_669_485_411;
+
+pub const MINIMAL_RETRANS_DURATION_SECS: u32 = 60;
 
 pub const HARDWARE_ADDR_TYPE_ETHERNET: u8 = 1;
 pub const HARDWARE_ADDR_LEN_ETHERNET: u8 = 6;

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

@@ -50,7 +50,7 @@ impl Server {
             // Wait until the socket is readable, this can produce a false positive
             socket.readable().await?;
 
-            let mut buf = [0u8; constants::DHCP_MINIMUM_LEGAL_MAX_MESSAGE_SIZE as usize];
+            let mut buf = [0u8; constants::MINIMUM_LEGAL_MAX_MESSAGE_SIZE as usize];
             let (len, addr) = match socket.recv_from(&mut buf).await {
                 Ok(result) => result,
                 Err(err) if err.kind() == std::io::ErrorKind::WouldBlock => {

crates/lib-dhcp/src/types/message.rs

@@ -141,7 +141,7 @@ impl Readable for Message {
         let file = buf.read_vec(128)?;
 
         match buf.peekn::<4>() {
-            Some(m) if m == constants::DHCP_MAGIC_COOKIE_ARR => buf.skipn(4)?,
+            Some(m) if m == constants::MAGIC_COOKIE_ARR => buf.skipn(4)?,
             Some(_) => return Err(MessageError::BufferError(BufferError::InvalidData)),
             None => return Err(MessageError::BufferError(BufferError::BufTooShort)),
         };
@@ -198,7 +198,7 @@ impl Writeable for Message {
         n += self.file.write::<E>(buf)?;
 
         // Write magic cookie
-        n += buf.write(constants::DHCP_MAGIC_COOKIE_ARR);
+        n += buf.write(constants::MAGIC_COOKIE_ARR);
 
         n += self.options.write::<E>(buf)?;