From 562f12ffed055ae3c6397f986daa5f788373cc2e Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Thu, 1 Apr 2021 03:21:15 +0200
Subject: [PATCH 1/2] dhcp: always send parameter_request_list. Fixes #445.

---
 src/dhcp/clientv4.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/dhcp/clientv4.rs b/src/dhcp/clientv4.rs
index 33514a5..0d1e003 100644
--- a/src/dhcp/clientv4.rs
+++ b/src/dhcp/clientv4.rs
@@ -292,7 +292,7 @@ impl Client {
             requested_ip: None,
             client_identifier: Some(mac),
             server_identifier: None,
-            parameter_request_list: None,
+            parameter_request_list: Some(PARAMETER_REQUEST_LIST),
             max_size: Some(raw_socket.payload_recv_capacity() as u16),
             lease_duration: None,
             dns_servers: None,
@@ -325,7 +325,6 @@ impl Client {
                 dhcp_repr.broadcast = false;
                 dhcp_repr.requested_ip = Some(r_state.requested_ip);
                 dhcp_repr.server_identifier = Some(r_state.server_identifier);
-                dhcp_repr.parameter_request_list = Some(PARAMETER_REQUEST_LIST);
                 net_trace!("DHCP send request to {} = {:?}", endpoint, dhcp_repr);
                 send_packet(iface, endpoint, dhcp_repr)
             }

From 1d19ff8d912d7ccdb11cf7b6247ecd621d739e4f Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Thu, 1 Apr 2021 19:49:39 +0200
Subject: [PATCH 2/2] dhcp: Clear expiration time on reset.

---
 src/dhcp/clientv4.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/dhcp/clientv4.rs b/src/dhcp/clientv4.rs
index 0d1e003..a454870 100644
--- a/src/dhcp/clientv4.rs
+++ b/src/dhcp/clientv4.rs
@@ -356,6 +356,7 @@ impl Client {
         net_trace!("DHCP reset");
         self.state = ClientState::Discovering;
         self.next_egress = now;
+        self.lease_expiration = None;
     }
 }