Skip to content

Commit cc0aea1

Browse files
committed
Fix forward-interface short-circuit return
F/1319
1 parent 84d92b6 commit cc0aea1

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

src/test/unit/unit_tests_tcp_ack.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ START_TEST(test_dns_abort_query_null_noop)
44
}
55
END_TEST
66

7+
78
START_TEST(test_tcp_input_ttl_zero_local_ack_still_processes)
89
{
910
struct wolfIP s;
@@ -1148,7 +1149,7 @@ START_TEST(test_forward_interface_variants)
11481149
ck_assert_int_eq((int)out_if, -1);
11491150

11501151
s.if_count = 1;
1151-
ck_assert_uint_eq(wolfIP_forward_interface(&s, TEST_PRIMARY_IF, 0x0A000099U), 1U);
1152+
ck_assert_int_eq(wolfIP_forward_interface(&s, TEST_PRIMARY_IF, 0x0A000099U), -1);
11521153
}
11531154
END_TEST
11541155

@@ -1183,11 +1184,11 @@ START_TEST(test_forward_interface_short_circuit_cases)
11831184
{
11841185
struct wolfIP s;
11851186

1186-
ck_assert_int_eq(wolfIP_forward_interface(NULL, 0, 0x0A000001U), 0);
1187+
ck_assert_int_eq(wolfIP_forward_interface(NULL, 0, 0x0A000001U), -1);
11871188

11881189
wolfIP_init(&s);
11891190
s.if_count = 1;
1190-
ck_assert_uint_eq(wolfIP_forward_interface(&s, 0, 0x0A000001U), 1U);
1191+
ck_assert_int_eq(wolfIP_forward_interface(&s, 0, 0x0A000001U), -1);
11911192
}
11921193
END_TEST
11931194

@@ -4142,4 +4143,3 @@ START_TEST(test_tcp_ack_no_sack_three_dupacks_with_zero_rwnd_triggers_retransmit
41424143
ck_assert_int_ne(desc->flags & PKT_FLAG_RETRANS, 0);
41434144
}
41444145
END_TEST
4145-

src/wolfip.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1446,7 +1446,7 @@ static int wolfIP_forward_interface(struct wolfIP *s, unsigned int in_if, ip4 de
14461446
{
14471447
int i;
14481448
if (!s || s->if_count < 2)
1449-
return s ? s->if_count : 0;
1449+
return -1;
14501450
for (i = 0; i < (int)s->if_count; i++) {
14511451
struct ipconf *conf = &s->ipconf[i];
14521452
if (i == (int)in_if)

0 commit comments

Comments
 (0)