DHCP fixes (copilot's review)

Author: danielinux

src/test/unit/unit_tests_dns_dhcp.c

@@ -3876,6 +3876,7 @@ START_TEST(test_regression_dhcp_lease_expiry_deconfigures_address)
 {
     struct wolfIP s;
     struct ipconf *primary;
+    uint32_t stale_timeout_count;
 
     wolfIP_init(&s);
     mock_link_init(&s);
@@ -3890,26 +3891,37 @@ START_TEST(test_regression_dhcp_lease_expiry_deconfigures_address)
     s.dhcp_server_ip = 0x0A000001U;
     s.last_tick = 1000U;
     s.dhcp_lease_expires = s.last_tick;
+    s.dhcp_timeout_count = 3U;
+    stale_timeout_count = s.dhcp_timeout_count;
 
     s.dhcp_state = DHCP_BOUND;
     dhcp_timer_cb(&s);
     ck_assert_int_eq(s.dhcp_state, DHCP_DISCOVER_SENT);
     ck_assert_uint_eq(primary->ip, 0U);
     ck_assert_uint_eq(primary->mask, 0U);
     ck_assert_uint_eq(primary->gw, 0U);
+    ck_assert_uint_eq(s.dhcp_ip, 0U);
+    ck_assert_uint_eq(s.dhcp_server_ip, 0U);
+    ck_assert_uint_ne(stale_timeout_count, 0U);
+    ck_assert_uint_eq(s.dhcp_timeout_count, 0U);
     ck_assert_uint_ne(s.dhcp_timer, NO_TIMER);
 
     wolfIP_ipconfig_set(&s, 0x0A000064U, 0xFFFFFF00U, 0x0A000001U);
     s.dhcp_ip = primary->ip;
+    s.dhcp_server_ip = 0x0A000001U;
     s.last_tick = 2000U;
     s.dhcp_lease_expires = s.last_tick;
+    s.dhcp_timeout_count = 2U;
 
     s.dhcp_state = DHCP_REBINDING;
     dhcp_timer_cb(&s);
     ck_assert_int_eq(s.dhcp_state, DHCP_DISCOVER_SENT);
     ck_assert_uint_eq(primary->ip, 0U);
     ck_assert_uint_eq(primary->mask, 0U);
     ck_assert_uint_eq(primary->gw, 0U);
+    ck_assert_uint_eq(s.dhcp_ip, 0U);
+    ck_assert_uint_eq(s.dhcp_server_ip, 0U);
+    ck_assert_uint_eq(s.dhcp_timeout_count, 0U);
     ck_assert_uint_ne(s.dhcp_timer, NO_TIMER);
 }
 END_TEST

src/wolfip.c

@@ -5491,6 +5491,7 @@ static int dhcp_send_discover(struct wolfIP *s);
 static int dhcp_send_request(struct wolfIP *s);
 static void dhcp_timer_cb(void *arg);
 static void dhcp_cancel_timer(struct wolfIP *s);
+static void dhcp_deconfigure_lease(struct wolfIP *s);
 
 static void dhcp_schedule_timer_at(struct wolfIP *s, uint64_t when)
 {
@@ -5601,7 +5602,7 @@ static void dhcp_timer_cb(void *arg)
         case DHCP_BOUND:
             if (s->dhcp_lease_expires != 0 && s->last_tick >= s->dhcp_lease_expires) {
                 dhcp_cancel_timer(s);
-                wolfIP_ipconfig_set(s, 0, 0, 0);
+                dhcp_deconfigure_lease(s);
                 s->dhcp_state = DHCP_OFF;
                 dhcp_send_discover(s);
                 break;
@@ -5626,7 +5627,7 @@ static void dhcp_timer_cb(void *arg)
         case DHCP_REBINDING:
             if (s->dhcp_lease_expires != 0 && s->last_tick >= s->dhcp_lease_expires) {
                 dhcp_cancel_timer(s);
-                wolfIP_ipconfig_set(s, 0, 0, 0);
+                dhcp_deconfigure_lease(s);
                 s->dhcp_state = DHCP_OFF;
                 dhcp_send_discover(s);
                 break;
@@ -5642,16 +5643,23 @@ static void dhcp_timer_cb(void *arg)
 
 static void dhcp_cancel_timer(struct wolfIP *s)
 {
+    s->dhcp_timeout_count = 0;
     if (s->dhcp_timer != NO_TIMER) {
         timer_binheap_cancel(&s->timers, s->dhcp_timer);
         s->dhcp_timer = NO_TIMER;
-        s->dhcp_timeout_count = 0;
     }
     s->dhcp_renew_at = 0;
     s->dhcp_rebind_at = 0;
     s->dhcp_lease_expires = 0;
 }
 
+static void dhcp_deconfigure_lease(struct wolfIP *s)
+{
+    wolfIP_ipconfig_set(s, 0, 0, 0);
+    s->dhcp_ip = 0;
+    s->dhcp_server_ip = 0;
+}
+
 #define DHCP_OPT_data_to_u32(opt)                    \
    (((uint32_t)(opt)->data[0] << 24) |               \
     ((uint32_t)(opt)->data[1] << 16) |               \
@@ -5957,7 +5965,7 @@ static int dhcp_poll(struct wolfIP *s)
          * it must restart the configuration process. */
         if (dhcp_msg_type(s, &msg, (uint32_t)len) == DHCP_NAK) {
             dhcp_cancel_timer(s);
-            wolfIP_ipconfig_set(s, 0, 0, 0);
+            dhcp_deconfigure_lease(s);
             s->dhcp_state = DHCP_OFF;
             dhcp_send_discover(s);
             return 0;