Skip to content

More various fixes (F-*) #109

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
danielinux merged 4 commits into from
May 7, 2026
Merged

More various fixes (F-*) #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
84eaf6d
Add a 127/8 source filter alongside the existing 127/8 destination dr…
gasbytes May 6, 2026
81f25d9
Tighten ip_recv's forwarding TTL<=1 precondition to len >= ETH_HEADER…
gasbytes May 6, 2026
93f4c6d
Add wolfIP_if_for_local_ip dst check to icmp_input's ECHO_REQUEST pat…
gasbytes May 6, 2026
698779f
Add four test_icmp_input_dest_unreach_port_unreachable_mismatched_ori…
gasbytes May 6, 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
7 changes: 7 additions & 0 deletions src/test/unit/unit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,6 +681,7 @@ Suite *wolf_suite(void)
tcase_add_test(tc_proto, test_send_ttl_exceeded_sets_df);
#if WOLFIP_ENABLE_FORWARDING
tcase_add_test(tc_proto, test_wolfip_forward_ttl_exceeded_short_len_does_not_send);
tcase_add_test(tc_proto, test_regression_forward_ttl_exceeded_short_len_with_options_no_send);
#endif
tcase_add_test(tc_proto, test_arp_request_filter_drop);
tcase_add_test(tc_proto, test_arp_request_invalid_interface);
Expand Down Expand Up @@ -791,6 +792,8 @@ Suite *wolf_suite(void)
tcase_add_test(tc_proto, test_forward_packet_eth_filter_drop);
tcase_add_test(tc_proto, test_loopback_dest_not_forwarded);
tcase_add_test(tc_proto, test_regression_forwarding_rpf_drops_spoofed_source);
tcase_add_test(tc_proto, test_regression_loopback_source_dropped_on_non_loopback_iface);
tcase_add_test(tc_proto, test_regression_icmp_echo_request_non_local_dst_no_reply);
tcase_add_test(tc_proto, test_tcp_listen_rejects_wrong_interface);
tcase_add_test(tc_proto, test_tcp_listen_accepts_bound_interface);
tcase_add_test(tc_proto, test_tcp_listen_accepts_any_interface);
Expand All @@ -814,6 +817,10 @@ Suite *wolf_suite(void)
tcase_add_test(tc_proto, test_icmp_input_dest_unreach_frag_needed_below_floor_preserves_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_icmp_input_dest_unreach_port_unreachable_mismatched_orig_src_ip_ignored);
tcase_add_test(tc_proto, test_icmp_input_dest_unreach_port_unreachable_mismatched_orig_dst_ip_ignored);
tcase_add_test(tc_proto, test_icmp_input_dest_unreach_port_unreachable_mismatched_orig_src_port_ignored);
tcase_add_test(tc_proto, test_icmp_input_dest_unreach_port_unreachable_mismatched_orig_dst_port_ignored);
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 Down
210 changes: 210 additions & 0 deletions src/test/unit/unit_tests_dns_dhcp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1738,6 +1738,7 @@ START_TEST(test_icmp_input_echo_request_reply_sent)
wolfIP_init(&s);
mock_link_init(&s);
s.dhcp_state = DHCP_OFF;
wolfIP_ipconfig_set(&s, 0x0A000001U, 0xFFFFFF00U, 0);
wolfIP_filter_set_callback(NULL, NULL);
last_frame_sent_size = 0;

Expand Down Expand Up @@ -1768,6 +1769,7 @@ START_TEST(test_icmp_input_echo_reply_sets_df)
wolfIP_init(&s);
mock_link_init(&s);
s.dhcp_state = DHCP_OFF;
wolfIP_ipconfig_set(&s, 0x0A000001U, 0xFFFFFF00U, 0);
wolfIP_filter_set_callback(NULL, NULL);
last_frame_sent_size = 0;

Expand Down Expand Up @@ -1834,6 +1836,7 @@ START_TEST(test_icmp_input_echo_request_odd_len_reply_checksum)
wolfIP_init(&s);
mock_link_init(&s);
s.dhcp_state = DHCP_OFF;
wolfIP_ipconfig_set(&s, 0x0A000001U, 0xFFFFFF00U, 0);
wolfIP_filter_set_callback(NULL, NULL);
last_frame_sent_size = 0;

Expand Down Expand Up @@ -1985,6 +1988,7 @@ START_TEST(test_icmp_input_echo_request_filter_drop)
wolfIP_init(&s);
mock_link_init(&s);
s.dhcp_state = DHCP_OFF;
wolfIP_ipconfig_set(&s, 0x0A000001U, 0xFFFFFF00U, 0);
filter_block_reason = WOLFIP_FILT_SENDING;
wolfIP_filter_set_callback(test_filter_cb_block, NULL);
wolfIP_filter_set_icmp_mask(WOLFIP_FILT_MASK(WOLFIP_FILT_SENDING));
Expand Down Expand Up @@ -2015,6 +2019,7 @@ START_TEST(test_icmp_input_echo_request_ip_filter_drop)
wolfIP_init(&s);
mock_link_init(&s);
s.dhcp_state = DHCP_OFF;
wolfIP_ipconfig_set(&s, 0x0A000001U, 0xFFFFFF00U, 0);
filter_block_reason = WOLFIP_FILT_SENDING;
wolfIP_filter_set_callback(test_filter_cb_block, NULL);
wolfIP_filter_set_ip_mask(WOLFIP_FILT_MASK(WOLFIP_FILT_SENDING));
Expand Down Expand Up @@ -2045,6 +2050,7 @@ START_TEST(test_icmp_input_echo_request_eth_filter_drop)
wolfIP_init(&s);
mock_link_init(&s);
s.dhcp_state = DHCP_OFF;
wolfIP_ipconfig_set(&s, 0x0A000001U, 0xFFFFFF00U, 0);
filter_block_reason = WOLFIP_FILT_SENDING;
wolfIP_filter_set_callback(test_filter_cb_block, NULL);
wolfIP_filter_set_eth_mask(WOLFIP_FILT_MASK(WOLFIP_FILT_SENDING));
Expand Down Expand Up @@ -2370,6 +2376,210 @@ START_TEST(test_icmp_input_dest_unreach_port_unreachable_quoted_ip_options_keep_
}
END_TEST

START_TEST(test_icmp_input_dest_unreach_port_unreachable_mismatched_orig_src_ip_ignored)
{
struct wolfIP s;
struct tsocket *ts;
struct wolfIP_icmp_dest_unreachable_packet icmp;
struct wolfIP_tcp_wire_prefix *orig;
uint32_t frame_len;

wolfIP_init(&s);
mock_link_init(&s);
wolfIP_ipconfig_set(&s, 0x0A000001U, 0xFFFFFF00U, 0);

ts = &s.tcpsockets[0];
memset(ts, 0, sizeof(*ts));
ts->proto = WI_IPPROTO_TCP;
ts->S = &s;
ts->sock.tcp.state = TCP_SYN_SENT;
ts->local_ip = 0x0A000001U;
ts->remote_ip = 0x0A000002U;
ts->src_port = 1234;
ts->dst_port = 4321;

memset(&icmp, 0, sizeof(icmp));
icmp.ip.src = ee32(0x0A0000FEU);
icmp.ip.dst = ee32(ts->local_ip);
icmp.ip.ttl = 64;
icmp.ip.proto = WI_IPPROTO_ICMP;
icmp.ip.len = ee16(IP_HEADER_LEN + ICMP_DEST_UNREACH_SIZE);
icmp.type = ICMP_DEST_UNREACH;
icmp.code = ICMP_PORT_UNREACH;

orig = (struct wolfIP_tcp_wire_prefix *)icmp.orig_packet;
orig->ip.ver_ihl = 0x45;
orig->ip.proto = WI_IPPROTO_TCP;
orig->ip.src = ee32(0x0A000099U);
orig->ip.dst = ee32(ts->remote_ip);
orig->ip.len = ee16(IP_HEADER_LEN + 8U);
orig->src_port = ee16(ts->src_port);
orig->dst_port = ee16(ts->dst_port);

icmp.csum = ee16(icmp_checksum((struct wolfIP_icmp_packet *)&icmp,
ICMP_DEST_UNREACH_SIZE));
frame_len = (uint32_t)(ETH_HEADER_LEN + IP_HEADER_LEN + ICMP_DEST_UNREACH_SIZE);

icmp_input(&s, TEST_PRIMARY_IF, (struct wolfIP_ip_packet *)&icmp, frame_len);

ck_assert_uint_eq(ts->proto, WI_IPPROTO_TCP);
ck_assert_int_eq(ts->sock.tcp.state, TCP_SYN_SENT);
}
END_TEST

START_TEST(test_icmp_input_dest_unreach_port_unreachable_mismatched_orig_dst_ip_ignored)
{
struct wolfIP s;
struct tsocket *ts;
struct wolfIP_icmp_dest_unreachable_packet icmp;
struct wolfIP_tcp_wire_prefix *orig;
uint32_t frame_len;

wolfIP_init(&s);
mock_link_init(&s);
wolfIP_ipconfig_set(&s, 0x0A000001U, 0xFFFFFF00U, 0);

ts = &s.tcpsockets[0];
memset(ts, 0, sizeof(*ts));
ts->proto = WI_IPPROTO_TCP;
ts->S = &s;
ts->sock.tcp.state = TCP_SYN_SENT;
ts->local_ip = 0x0A000001U;
ts->remote_ip = 0x0A000002U;
ts->src_port = 1234;
ts->dst_port = 4321;

memset(&icmp, 0, sizeof(icmp));
icmp.ip.src = ee32(0x0A0000FEU);
icmp.ip.dst = ee32(ts->local_ip);
icmp.ip.ttl = 64;
icmp.ip.proto = WI_IPPROTO_ICMP;
icmp.ip.len = ee16(IP_HEADER_LEN + ICMP_DEST_UNREACH_SIZE);
icmp.type = ICMP_DEST_UNREACH;
icmp.code = ICMP_PORT_UNREACH;

orig = (struct wolfIP_tcp_wire_prefix *)icmp.orig_packet;
orig->ip.ver_ihl = 0x45;
orig->ip.proto = WI_IPPROTO_TCP;
orig->ip.src = ee32(ts->local_ip);
orig->ip.dst = ee32(0x0A0000AAU);
orig->ip.len = ee16(IP_HEADER_LEN + 8U);
orig->src_port = ee16(ts->src_port);
orig->dst_port = ee16(ts->dst_port);

icmp.csum = ee16(icmp_checksum((struct wolfIP_icmp_packet *)&icmp,
ICMP_DEST_UNREACH_SIZE));
frame_len = (uint32_t)(ETH_HEADER_LEN + IP_HEADER_LEN + ICMP_DEST_UNREACH_SIZE);

icmp_input(&s, TEST_PRIMARY_IF, (struct wolfIP_ip_packet *)&icmp, frame_len);

ck_assert_uint_eq(ts->proto, WI_IPPROTO_TCP);
ck_assert_int_eq(ts->sock.tcp.state, TCP_SYN_SENT);
}
END_TEST

START_TEST(test_icmp_input_dest_unreach_port_unreachable_mismatched_orig_src_port_ignored)
{
struct wolfIP s;
struct tsocket *ts;
struct wolfIP_icmp_dest_unreachable_packet icmp;
struct wolfIP_tcp_wire_prefix *orig;
uint32_t frame_len;

wolfIP_init(&s);
mock_link_init(&s);
wolfIP_ipconfig_set(&s, 0x0A000001U, 0xFFFFFF00U, 0);

ts = &s.tcpsockets[0];
memset(ts, 0, sizeof(*ts));
ts->proto = WI_IPPROTO_TCP;
ts->S = &s;
ts->sock.tcp.state = TCP_SYN_SENT;
ts->local_ip = 0x0A000001U;
ts->remote_ip = 0x0A000002U;
ts->src_port = 1234;
ts->dst_port = 4321;

memset(&icmp, 0, sizeof(icmp));
icmp.ip.src = ee32(0x0A0000FEU);
icmp.ip.dst = ee32(ts->local_ip);
icmp.ip.ttl = 64;
icmp.ip.proto = WI_IPPROTO_ICMP;
icmp.ip.len = ee16(IP_HEADER_LEN + ICMP_DEST_UNREACH_SIZE);
icmp.type = ICMP_DEST_UNREACH;
icmp.code = ICMP_PORT_UNREACH;

orig = (struct wolfIP_tcp_wire_prefix *)icmp.orig_packet;
orig->ip.ver_ihl = 0x45;
orig->ip.proto = WI_IPPROTO_TCP;
orig->ip.src = ee32(ts->local_ip);
orig->ip.dst = ee32(ts->remote_ip);
orig->ip.len = ee16(IP_HEADER_LEN + 8U);
orig->src_port = ee16((uint16_t)(ts->src_port + 1U));
orig->dst_port = ee16(ts->dst_port);

icmp.csum = ee16(icmp_checksum((struct wolfIP_icmp_packet *)&icmp,
ICMP_DEST_UNREACH_SIZE));
frame_len = (uint32_t)(ETH_HEADER_LEN + IP_HEADER_LEN + ICMP_DEST_UNREACH_SIZE);

icmp_input(&s, TEST_PRIMARY_IF, (struct wolfIP_ip_packet *)&icmp, frame_len);

ck_assert_uint_eq(ts->proto, WI_IPPROTO_TCP);
ck_assert_int_eq(ts->sock.tcp.state, TCP_SYN_SENT);
}
END_TEST

START_TEST(test_icmp_input_dest_unreach_port_unreachable_mismatched_orig_dst_port_ignored)
{
struct wolfIP s;
struct tsocket *ts;
struct wolfIP_icmp_dest_unreachable_packet icmp;
struct wolfIP_tcp_wire_prefix *orig;
uint32_t frame_len;

wolfIP_init(&s);
mock_link_init(&s);
wolfIP_ipconfig_set(&s, 0x0A000001U, 0xFFFFFF00U, 0);

ts = &s.tcpsockets[0];
memset(ts, 0, sizeof(*ts));
ts->proto = WI_IPPROTO_TCP;
ts->S = &s;
ts->sock.tcp.state = TCP_SYN_SENT;
ts->local_ip = 0x0A000001U;
ts->remote_ip = 0x0A000002U;
ts->src_port = 1234;
ts->dst_port = 4321;

memset(&icmp, 0, sizeof(icmp));
icmp.ip.src = ee32(0x0A0000FEU);
icmp.ip.dst = ee32(ts->local_ip);
icmp.ip.ttl = 64;
icmp.ip.proto = WI_IPPROTO_ICMP;
icmp.ip.len = ee16(IP_HEADER_LEN + ICMP_DEST_UNREACH_SIZE);
icmp.type = ICMP_DEST_UNREACH;
icmp.code = ICMP_PORT_UNREACH;

orig = (struct wolfIP_tcp_wire_prefix *)icmp.orig_packet;
orig->ip.ver_ihl = 0x45;
orig->ip.proto = WI_IPPROTO_TCP;
orig->ip.src = ee32(ts->local_ip);
orig->ip.dst = ee32(ts->remote_ip);
orig->ip.len = ee16(IP_HEADER_LEN + 8U);
orig->src_port = ee16(ts->src_port);
orig->dst_port = ee16((uint16_t)(ts->dst_port + 1U));

icmp.csum = ee16(icmp_checksum((struct wolfIP_icmp_packet *)&icmp,
ICMP_DEST_UNREACH_SIZE));
frame_len = (uint32_t)(ETH_HEADER_LEN + IP_HEADER_LEN + ICMP_DEST_UNREACH_SIZE);

icmp_input(&s, TEST_PRIMARY_IF, (struct wolfIP_ip_packet *)&icmp, frame_len);

ck_assert_uint_eq(ts->proto, WI_IPPROTO_TCP);
ck_assert_int_eq(ts->sock.tcp.state, TCP_SYN_SENT);
}
END_TEST

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