tests: net: tcp: Fix a few issues with TCP tests

The net_context-based TCP tests required some adjustments/fixes:

* seq number was not incremented for the final ACK after FIN
* accepted net_context was not dereferenced (with net_context_put())
* net_context_put() should be used instead of net_tcp_put(), as it's the
  net_context that is allocated in the test (with net_context_get())
* out of order tests depend on each other, therefore it must be assured
  they're executed in the correct order

Signed-off-by: Robert Lubos <[email protected]>

Author: rlubos

tests/net/tcp/src/main.c

@@ -714,6 +714,8 @@ static void test_tcp_recv_cb(struct net_context *context,
 	}
 }
 
+static struct net_context *accepted_ctx;
+
 static void test_tcp_accept_cb(struct net_context *ctx,
 			       struct sockaddr *addr,
 			       socklen_t addrlen,
@@ -726,6 +728,10 @@ static void test_tcp_accept_cb(struct net_context *ctx,
 
 	/* set callback on newly created context */
 	ctx->recv_cb = test_tcp_recv_cb;
+	accepted_ctx = ctx;
+
+	/* Ref the context on the app behalf. */
+	net_context_ref(ctx);
 
 	test_sem_give();
 }
@@ -755,6 +761,8 @@ ZTEST(net_tcp, test_server_ipv4)
 		zassert_true(false, "Failed to get net_context");
 	}
 
+	net_context_ref(ctx);
+
 	ret = net_context_bind(ctx, (struct sockaddr *)&my_addr_s,
 			       sizeof(struct sockaddr_in));
 	if (ret < 0) {
@@ -790,7 +798,11 @@ ZTEST(net_tcp, test_server_ipv4)
 	/* Trigger the peer to send FIN after timeout */
 	k_work_reschedule(&test_server, K_NO_WAIT);
 
+	/* Let the receiving thread run */
+	k_msleep(50);
+
 	net_context_put(ctx);
+	net_context_put(accepted_ctx);
 }
 
 /* Test case scenario IPv4
@@ -818,6 +830,8 @@ ZTEST(net_tcp, test_server_with_options_ipv4)
 		zassert_true(false, "Failed to get net_context");
 	}
 
+	net_context_ref(ctx);
+
 	ret = net_context_bind(ctx, (struct sockaddr *)&my_addr_s,
 			       sizeof(struct sockaddr_in));
 	if (ret < 0) {
@@ -853,7 +867,11 @@ ZTEST(net_tcp, test_server_with_options_ipv4)
 	/* Trigger the peer to send FIN after timeout */
 	k_work_reschedule(&test_server, K_NO_WAIT);
 
+	/* Let the receiving thread run */
+	k_msleep(50);
+
 	net_context_put(ctx);
+	net_context_put(accepted_ctx);
 }
 
 /* Test case scenario IPv6
@@ -881,6 +899,8 @@ ZTEST(net_tcp, test_server_ipv6)
 		zassert_true(false, "Failed to get net_context");
 	}
 
+	net_context_ref(ctx);
+
 	ret = net_context_bind(ctx, (struct sockaddr *)&my_addr_v6_s,
 			       sizeof(struct sockaddr_in6));
 	if (ret < 0) {
@@ -916,7 +936,11 @@ ZTEST(net_tcp, test_server_ipv6)
 	/* Trigger the peer to send FIN after timeout */
 	k_work_reschedule(&test_server, K_NO_WAIT);
 
+	/* Let the receiving thread run */
+	k_msleep(50);
+
 	net_context_put(ctx);
+	net_context_put(accepted_ctx);
 }
 
 static void handle_syn_resend(void)
@@ -950,6 +974,8 @@ ZTEST(net_tcp, test_client_syn_resend)
 		zassert_true(false, "Failed to get net_context");
 	}
 
+	net_context_ref(ctx);
+
 	ret = net_context_connect(ctx, (struct sockaddr *)&peer_addr_s,
 				  sizeof(struct sockaddr_in),
 				  NULL,
@@ -1075,7 +1101,7 @@ ZTEST(net_tcp, test_client_fin_wait_2_ipv4)
 	/* Peer will release the semaphore after it sends ACK for data */
 	test_sem_take(K_MSEC(100), __LINE__);
 
-	net_tcp_put(ctx);
+	net_context_put(ctx);
 
 	/* Peer will release the semaphore after it receives
 	 * proper ACK to FIN | ACK
@@ -1125,6 +1151,7 @@ static void handle_client_closing_test(sa_family_t af, struct tcphdr *th)
 	case T_CLOSING:
 		test_verify_flags(th, ACK);
 		t_state = T_FIN_ACK;
+		seq++;
 		reply = prepare_ack_packet(af, htons(MY_PORT), th->th_sport);
 		break;
 	default:
@@ -1196,7 +1223,7 @@ ZTEST(net_tcp, test_client_closing_ipv6)
 	/* Peer will release the semaphore after it sends ACK for data */
 	test_sem_take(K_MSEC(100), __LINE__);
 
-	net_tcp_put(ctx);
+	net_context_put(ctx);
 
 	/* Peer will release the semaphore after it receives
 	 * proper ACK to FIN | ACK
@@ -1225,6 +1252,8 @@ static struct net_context *create_server_socket(uint32_t my_seq,
 		zassert_true(false, "Failed to get net_context");
 	}
 
+	net_context_ref(ctx);
+
 	ret = net_context_bind(ctx, (struct sockaddr *)&my_addr_v6_s,
 			       sizeof(struct sockaddr_in6));
 	if (ret < 0) {
@@ -1309,7 +1338,8 @@ static void check_rst_succeed(struct net_context *ctx,
 		      "RST packet skipped (before %d, after %d)",
 		      rsterr_before, rsterr_after);
 
-	net_tcp_put(ctx);
+	net_context_put(ctx);
+	net_context_put(accepted_ctx);
 }
 
 ZTEST(net_tcp, test_client_invalid_rst)
@@ -1332,7 +1362,7 @@ ZTEST(net_tcp, test_client_invalid_rst)
 	check_rst_succeed(NULL, 0);
 	check_rst_succeed(NULL, 1);
 
-	net_tcp_put(ctx);
+	/* net_context is released within check_rst_succeed() */
 }
 
 #define MAX_DATA 100
@@ -1431,13 +1461,15 @@ static void checklist_based_out_of_order_test(struct out_of_order_check_struct *
 	}
 }
 
-ZTEST(net_tcp, test_server_recv_out_of_order_data)
+static void test_server_recv_out_of_order_data(void)
 {
 	/* Only run the tests if queueing is enabled */
 	if (CONFIG_NET_TCP_RECV_QUEUE_TIMEOUT == 0) {
 		return;
 	}
 
+	k_sem_reset(&test_sem);
+
 	/* Start the sequence numbering so that we will wrap it (just for
 	 * testing purposes)
 	 */
@@ -1466,7 +1498,7 @@ struct out_of_order_check_struct reorder_timeout_list[] = {
  * test_server_recv_out_of_order_data(), so this test must be run after that
  * test.
  */
-ZTEST(net_tcp, test_server_timeout_out_of_order_data)
+static void test_server_timeout_out_of_order_data(void)
 {
 	if (CONFIG_NET_TCP_RECV_QUEUE_TIMEOUT == 0) {
 		return;
@@ -1478,7 +1510,14 @@ ZTEST(net_tcp, test_server_timeout_out_of_order_data)
 					  ARRAY_SIZE(reorder_timeout_list),
 					  OUT_OF_ORDER_SEQ_INIT + 1);
 
-	net_tcp_put(ooo_ctx);
+	net_context_put(ooo_ctx);
+	net_context_put(accepted_ctx);
+}
+
+ZTEST(net_tcp, test_server_out_of_order_data)
+{
+	test_server_recv_out_of_order_data();
+	test_server_timeout_out_of_order_data();
 }
 
 ZTEST_SUITE(net_tcp, NULL, presetup, NULL, NULL, NULL);