Skip to content

Fixes 20260330 #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gasbytes merged 20 commits into from
Mar 30, 2026
Merged

Fixes 20260330 #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
fe53230
allow TCP send in close-wait
danielinux Mar 30, 2026
3329b84
Fix DHCP option byte order handling
danielinux Mar 30, 2026
055457d
Fix PAWS timestamp wrap comparison
danielinux Mar 30, 2026
712094d
Fix TCP fast recovery ACK handling
danielinux Mar 30, 2026
10f4014
Handle inbound ICMP dest-unreach for TCP
danielinux Mar 30, 2026
54a1785
fix ICMP writable-space threshold
danielinux Mar 30, 2026
7e77973
Fix UDP and ICMP sendto FIFO guard
danielinux Mar 30, 2026
fb080b0
Reject truncated DNS UDP responses
danielinux Mar 30, 2026
fdb84ae
Add FIN_WAIT_2 socket timeout
danielinux Mar 30, 2026
9f9becf
Set DHCP secs from elapsed process time
danielinux Mar 30, 2026
a6661cd
Validate DHCP reply op field
danielinux Mar 30, 2026
5a1ec92
Reject BOOT_REQUEST DHCP NAKs
danielinux Mar 30, 2026
c33a48c
Reject DHCP OFFER without server ID
danielinux Mar 30, 2026
e123441
Reject DHCPACK packets without server ID
danielinux Mar 30, 2026
9547338
reject forward DNS compression pointers
danielinux Mar 30, 2026
f98e46b
Replace magic numbers in DNS implementation
danielinux Mar 30, 2026
0f9024d
Fix overflow in test + add correct structures for encapsulation of
danielinux Mar 30, 2026
cb3e80c
Fixed overflows in dns-dhcp test
danielinux Mar 30, 2026
1a79582
Fixed null-deref (cppcheck) + addressed copilot comment
danielinux Mar 30, 2026
a77fe9d
Addressed review
danielinux Mar 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion src/test/unit/unit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ Suite *wolf_suite(void)
tcase_add_test(tc_utils, test_wolfip_getdev_ex_api);
tcase_add_test(tc_utils, test_wolfip_ll_frame_mtu_enforces_minimum);
tcase_add_test(tc_utils, test_transport_capacity_helpers_cover_guard_paths);
tcase_add_test(tc_utils, test_tx_has_writable_space_icmp_accepts_minimal_packet);
tcase_add_test(tc_utils, test_wolfip_if_for_local_ip_single_interface_falls_back_to_zero);
tcase_add_test(tc_utils, test_wolfip_mtu_set_get_api);
tcase_add_test(tc_utils, test_wolfip_ll_at_and_ipconf_at_invalid);
Expand Down Expand Up @@ -209,6 +210,7 @@ Suite *wolf_suite(void)
tcase_add_test(tc_utils, test_sock_sendto_error_paths);
tcase_add_test(tc_utils, test_sock_sendto_null_buf_or_len_zero);
tcase_add_test(tc_utils, test_sock_sendto_tcp_not_established);
tcase_add_test(tc_utils, test_sock_sendto_tcp_close_wait_allowed);
tcase_add_test(tc_utils, test_sock_recvfrom_tcp_states);
tcase_add_test(tc_utils, test_sock_recvfrom_tcp_close_wait_empty_returns_zero);
tcase_add_test(tc_utils, test_sock_recvfrom_tcp_close_wait_with_data);
Expand Down Expand Up @@ -319,6 +321,7 @@ Suite *wolf_suite(void)
tcase_add_test(tc_utils, test_dhcp_send_request_rebinding_broadcasts_to_lease_expiry);
tcase_add_test(tc_utils, test_dhcp_send_request_send_failure_retries_next_tick);
tcase_add_test(tc_utils, test_dhcp_send_discover_send_failure_retries_next_tick);
tcase_add_test(tc_utils, test_dhcp_messages_set_secs_from_process_start);
tcase_add_test(tc_utils, test_dhcp_poll_offer_and_ack);
tcase_add_test(tc_utils, test_dhcp_poll_renewing_ack_binds_client);
tcase_add_test(tc_utils, test_dhcp_poll_rebinding_ack_binds_client);
Expand All @@ -333,6 +336,7 @@ Suite *wolf_suite(void)
tcase_add_test(tc_utils, test_udp_try_recv_unmatched_port_sends_icmp_unreachable);
tcase_add_test(tc_utils, test_udp_try_recv_unmatched_nonlocal_dst_does_not_send_icmp);
tcase_add_test(tc_utils, test_dns_callback_bad_flags);
tcase_add_test(tc_utils, test_dns_callback_truncated_response_aborts_query);
tcase_add_test(tc_utils, test_dns_callback_bad_name);
tcase_add_test(tc_utils, test_dns_callback_short_header_ignored);
tcase_add_test(tc_utils, test_dns_callback_wrong_id_ignored);
Expand All @@ -348,16 +352,20 @@ Suite *wolf_suite(void)
tcase_add_test(tc_utils, test_dhcp_parse_offer_len_lt_four_rejected);
tcase_add_test(tc_utils, test_dhcp_parse_offer_ignores_short_unknown_option);
tcase_add_test(tc_utils, test_dhcp_parse_offer_ignores_zero_len_unknown_option);
tcase_add_test(tc_utils, test_dhcp_parse_offer_missing_server_id_rejected);
tcase_add_test(tc_utils, test_dhcp_parse_offer_missing_end_rejected);
tcase_add_test(tc_utils, test_dhcp_parse_offer_msg_type_len_ne_1_rejected);
tcase_add_test(tc_utils, test_dhcp_parse_ack_truncated_option_rejected);
tcase_add_test(tc_utils, test_dhcp_parse_ack_ignores_short_unknown_option);
tcase_add_test(tc_utils, test_dhcp_parse_ack_msg_type_len_ne_1_rejected);
tcase_add_test(tc_utils, test_dhcp_parse_ack_len_lt_four_rejected);
tcase_add_test(tc_utils, test_dhcp_parse_ack_ignores_zero_len_unknown_option);
tcase_add_test(tc_utils, test_dhcp_parse_ack_missing_server_id_rejected);
tcase_add_test(tc_utils, test_dhcp_parse_ack_missing_end_rejected);
tcase_add_test(tc_utils, test_dhcp_parse_offer_bad_magic_rejected);
tcase_add_test(tc_utils, test_dhcp_parse_ack_bad_magic_rejected);
tcase_add_test(tc_utils, test_dhcp_parse_offer_rejects_boot_request_op);
tcase_add_test(tc_utils, test_dhcp_parse_ack_rejects_boot_request_op);
tcase_add_test(tc_utils, test_dhcp_parse_offer_zero_len_option_rejected);
tcase_add_test(tc_utils, test_dhcp_parse_ack_zero_len_option_rejected);
tcase_add_test(tc_utils, test_dhcp_poll_no_data_and_wrong_state);
Expand Down Expand Up @@ -410,7 +418,7 @@ Suite *wolf_suite(void)
tcase_add_test(tc_utils, test_tcp_ctrl_state_needs_rto_fin_wait_1_waits_for_payload_drain);
tcase_add_test(tc_utils, test_tcp_rto_cb_fin_wait_1_with_data_uses_data_recovery);
tcase_add_test(tc_utils, test_tcp_rto_cb_fin_wait_1_no_data_requeues_finack);
tcase_add_test(tc_utils, test_tcp_ack_fin_wait_1_ack_of_fin_moves_to_fin_wait_2_and_stops_timer);
tcase_add_test(tc_utils, test_tcp_ack_fin_wait_1_ack_of_fin_moves_to_fin_wait_2_and_arms_timeout);
tcase_add_test(tc_utils, test_tcp_ack_closing_ack_of_fin_moves_to_time_wait_and_stops_timer);
tcase_add_test(tc_utils, test_tcp_rto_cb_control_retry_cap_closes_socket);
tcase_add_test(tc_utils, test_tcp_rto_cb_cancels_existing_timer);
Expand Down Expand Up @@ -688,6 +696,10 @@ Suite *wolf_suite(void)
tcase_add_test(tc_proto, test_icmp_input_echo_request_ip_filter_drop);
tcase_add_test(tc_proto, test_icmp_input_echo_request_eth_filter_drop);
tcase_add_test(tc_proto, test_icmp_input_filter_drop_receiving);
tcase_add_test(tc_proto, test_icmp_input_dest_unreach_port_unreachable_keeps_established_tcp_socket);
tcase_add_test(tc_proto, test_icmp_input_dest_unreach_frag_needed_reduces_tcp_peer_mss);
tcase_add_test(tc_proto, test_icmp_input_dest_unreach_port_unreachable_closes_syn_sent_tcp_socket);
tcase_add_test(tc_proto, test_icmp_input_dest_unreach_port_unreachable_quoted_ip_options_keep_established_tcp_socket);
tcase_add_test(tc_proto, test_udp_sendto_and_recvfrom);
tcase_add_test(tc_proto, test_udp_sendto_respects_mtu_api);
tcase_add_test(tc_proto, test_udp_recvfrom_sets_remote_ip);
Expand All @@ -696,6 +708,7 @@ Suite *wolf_suite(void)
tcase_add_test(tc_proto, test_udp_recvfrom_null_addrlen);
tcase_add_test(tc_proto, test_udp_recvfrom_src_equals_local_ip_does_not_persist_remote);
tcase_add_test(tc_proto, test_dns_query_and_callback_a);
tcase_add_test(tc_proto, test_dhcp_option_u32_macros_round_trip_wire_order);
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);
Expand All @@ -717,7 +730,9 @@ Suite *wolf_suite(void)
tcase_add_test(tc_proto, test_regression_syn_on_last_ack_not_silently_processed);
tcase_add_test(tc_proto, test_regression_fast_recovery_cwnd_ssthresh_rfc5681);
tcase_add_test(tc_proto, test_regression_paws_rejects_stale_timestamp);
tcase_add_test(tc_proto, test_regression_paws_accepts_wrapped_newer_timestamp);
tcase_add_test(tc_proto, test_regression_dhcp_nak_restarts_configuration);
tcase_add_test(tc_proto, test_regression_dhcp_boot_request_nak_ignored);
tcase_add_test(tc_proto, test_regression_dns_rcode_error_aborts_query);
tcase_add_test(tc_proto, test_regression_udp_checksum_zero_substituted_with_ffff);
tcase_add_test(tc_proto, test_regression_last_ack_rejects_out_of_window_segment);
Expand Down
39 changes: 39 additions & 0 deletions src/test/unit/unit_tests_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,6 +853,7 @@ START_TEST(test_dns_skip_and_copy_name)
{
uint8_t buf[64];
int pos = 0;
int ptr_pos;
int ret;
char out[64];

Expand All @@ -875,6 +876,15 @@ START_TEST(test_dns_skip_and_copy_name)
ret = dns_copy_name(buf, sizeof(buf), pos - 2, out, sizeof(out));
ck_assert_int_eq(ret, 0);
ck_assert_str_eq(out, "www.example.com");

/* forward pointer must be rejected */
ptr_pos = pos;
buf[pos++] = 0xC0;
buf[pos++] = (uint8_t)(ptr_pos + 2);
buf[pos++] = 3; memcpy(&buf[pos], "bad", 3); pos += 3;
buf[pos++] = 0;
ret = dns_copy_name(buf, pos, ptr_pos, out, sizeof(out));
ck_assert_int_eq(ret, -1);
}
END_TEST

Expand Down Expand Up @@ -2628,6 +2638,35 @@ START_TEST(test_sock_sendto_tcp_not_established)
}
END_TEST

START_TEST(test_sock_sendto_tcp_close_wait_allowed)
{
struct wolfIP s;
int tcp_sd;
struct tsocket *ts;
struct pkt_desc *desc;
uint8_t buf[4] = {1, 2, 3, 4};

wolfIP_init(&s);
mock_link_init(&s);

tcp_sd = wolfIP_sock_socket(&s, AF_INET, IPSTACK_SOCK_STREAM, WI_IPPROTO_TCP);
ck_assert_int_gt(tcp_sd, 0);
ts = &s.tcpsockets[SOCKET_UNMARK(tcp_sd)];
ts->sock.tcp.state = TCP_CLOSE_WAIT;
ts->sock.tcp.peer_mss = TCP_MSS;
ts->src_port = 1234;
ts->dst_port = 4321;
ts->local_ip = 0x0A000001U;
ts->remote_ip = 0x0A000002U;
fifo_init(&ts->sock.tcp.txbuf, ts->txmem, TXBUF_SIZE);

ck_assert_int_eq(wolfIP_sock_sendto(&s, tcp_sd, buf, sizeof(buf), 0, NULL, 0),
(int)sizeof(buf));
desc = fifo_peek(&ts->sock.tcp.txbuf);
ck_assert_ptr_nonnull(desc);
}
END_TEST

START_TEST(test_sock_sendto_udp_sets_dest_and_assigns)
{
struct wolfIP s;
Expand Down
Loading
Loading