Addressed copilot comments

Author: danielinux

src/test/unit/unit.c

@@ -654,6 +654,7 @@ Suite *wolf_suite(void)
     tcase_add_test(tc_proto, test_dns_query_and_callback_a);
     tcase_add_test(tc_proto, test_dhcp_parse_offer_and_ack);
     tcase_add_test(tc_proto, test_dhcp_schedule_lease_timer_defaults_t1_t2);
+    tcase_add_test(tc_proto, test_dhcp_schedule_lease_timer_small_lease_clamps_t1_t2);
     tcase_add_test(tc_proto, test_dhcp_parse_offer_defaults_mask_when_missing);
     tcase_add_test(tc_proto, test_dhcp_parse_offer_rejects_mismatched_xid);
     tcase_add_test(tc_proto, test_dhcp_parse_ack_rejects_mismatched_xid);

src/test/unit/unit_tests_dns_dhcp.c

@@ -103,7 +103,7 @@ START_TEST(test_dhcp_parse_offer_and_ack)
     opt->data[2] = (router_ip >> 8) & 0xFF;
     opt->data[3] = (router_ip >> 0) & 0xFF;
     opt = (struct dhcp_option *)((uint8_t *)opt + 6);
-    opt->code = 51;
+    opt->code = DHCP_OPTION_LEASE_TIME;
     opt->len = 4;
     opt->data[0] = (lease_s >> 24) & 0xFF;
     opt->data[1] = (lease_s >> 16) & 0xFF;
@@ -148,6 +148,23 @@ START_TEST(test_dhcp_schedule_lease_timer_defaults_t1_t2)
 }
 END_TEST
 
+START_TEST(test_dhcp_schedule_lease_timer_small_lease_clamps_t1_t2)
+{
+    struct wolfIP s;
+
+    wolfIP_init(&s);
+    s.last_tick = 1000U;
+
+    dhcp_schedule_lease_timer(&s, 1U, 0, 0);
+
+    ck_assert_int_ne(s.dhcp_timer, NO_TIMER);
+    ck_assert_uint_eq(s.dhcp_renew_at, 2000U);
+    ck_assert_uint_eq(s.dhcp_rebind_at, 2000U);
+    ck_assert_uint_eq(s.dhcp_lease_expires, 2000U);
+    ck_assert_uint_eq(find_timer_expiry(&s, s.dhcp_timer), s.dhcp_renew_at);
+}
+END_TEST
+
 START_TEST(test_dhcp_parse_offer_defaults_mask_when_missing)
 {
     struct wolfIP s;

src/wolfip.c

@@ -5142,12 +5142,22 @@ static void dhcp_schedule_lease_timer(struct wolfIP *s,
     if (!s || lease_s == 0)
         return;
 
-    if (renew_s == 0 || renew_s > lease_s)
+    if (renew_s == 0 || renew_s > lease_s) {
         renew_s = lease_s / 2U;
-    if (rebind_s == 0 || rebind_s > lease_s)
+        if (renew_s == 0)
+            renew_s = 1U;
+    }
+    if (rebind_s == 0 || rebind_s > lease_s) {
         rebind_s = (uint32_t)(((uint64_t)lease_s * 7U) / 8U);
+        if (rebind_s == 0)
+            rebind_s = 1U;
+    }
     if (rebind_s < renew_s)
         rebind_s = renew_s;
+    if (renew_s > lease_s)
+        renew_s = lease_s;
+    if (rebind_s > lease_s)
+        rebind_s = lease_s;
 
     lease_ms = (uint64_t)lease_s * 1000U;
     renew_ms = (uint64_t)renew_s * 1000U;