Fix LISTEN state socker regression shooting RST

Author: danielinux

src/test/unit/unit_tests_tcp_flow.c

@@ -3921,6 +3921,13 @@ START_TEST(test_tcp_input_listen_accept_final_ack_does_not_send_rst)
     ck_assert_uint_eq(last_frame_sent_size, 0U);
     ck_assert_int_eq(listen_ts->sock.tcp.state, TCP_LISTEN);
     ck_assert_int_eq(client_ts->sock.tcp.state, TCP_ESTABLISHED);
+
+    inject_tcp_segment(&s, TEST_PRIMARY_IF, 0x0A000002U, 0x0A000001U,
+            4321, 1234, client_ts->sock.tcp.ack, client_ts->sock.tcp.seq, TCP_FLAG_ACK);
+
+    ck_assert_uint_eq(last_frame_sent_size, 0U);
+    ck_assert_int_eq(listen_ts->sock.tcp.state, TCP_LISTEN);
+    ck_assert_int_eq(client_ts->sock.tcp.state, TCP_ESTABLISHED);
 }
 END_TEST
 

src/wolfip.c

@@ -3772,7 +3772,7 @@ static void tcp_ack(struct tsocket *t, const struct wolfIP_tcp_seg *tcp)
 
 }
 
-static int tcp_listen_ack_matches_pending_child(struct wolfIP *S,
+static int tcp_listen_ack_matches_child_socket(struct wolfIP *S,
         const struct tsocket *listener, const struct wolfIP_tcp_seg *tcp)
 {
     int i;
@@ -3786,7 +3786,7 @@ static int tcp_listen_ack_matches_pending_child(struct wolfIP *S,
 
         if (t == listener || t->proto == 0 || t->S == NULL)
             continue;
-        if (t->sock.tcp.state != TCP_SYN_RCVD)
+        if (t->sock.tcp.state <= TCP_LISTEN)
             continue;
         if (t->src_port != local_port || t->dst_port != remote_port)
             continue;
@@ -3877,7 +3877,7 @@ static void tcp_input(struct wolfIP *S, unsigned int if_idx,
                 if (tcp->flags & TCP_FLAG_RST)
                     continue;
                 if (tcp->flags & TCP_FLAG_ACK) {
-                    if (!tcp_listen_ack_matches_pending_child(S, t, tcp))
+                    if (!tcp_listen_ack_matches_child_socket(S, t, tcp))
                         tcp_send_reset_reply(S, if_idx, tcp);
                     continue;
                 }