From ff7e18b114c34309bc20e746ffad763447eade22 Mon Sep 17 00:00:00 2001
From: Ruihan Li <lrh2000@pku.edu.cn>
Date: Mon, 25 Dec 2023 02:17:17 +0800
Subject: [PATCH] Clean up and enable more network tests

---
 regression/apps/network/listen_backlog.c | 2 +-
 regression/apps/network/send_buf_full.c  | 7 ++-----
 regression/apps/scripts/network.sh       | 4 ++++
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/regression/apps/network/listen_backlog.c b/regression/apps/network/listen_backlog.c
index 2ffdacd48..a54c79b96 100644
--- a/regression/apps/network/listen_backlog.c
+++ b/regression/apps/network/listen_backlog.c
@@ -27,7 +27,7 @@ static int new_connected_socket(struct sockaddr_in *addr)
 {
     int sockfd;
 
-    sockfd = socket(AF_INET, SOCK_STREAM, 0);
+    sockfd = socket(PF_INET, SOCK_STREAM, 0);
     if (sockfd < 0) {
         perror("new_connected_socket: socket");
         return -1;
diff --git a/regression/apps/network/send_buf_full.c b/regression/apps/network/send_buf_full.c
index f1f431f5a..23b5388b3 100644
--- a/regression/apps/network/send_buf_full.c
+++ b/regression/apps/network/send_buf_full.c
@@ -31,7 +31,7 @@ static int new_connected_socket(struct sockaddr_in *addr)
 {
     int sockfd;
 
-    sockfd = socket(AF_INET, SOCK_STREAM, 0);
+    sockfd = socket(PF_INET, SOCK_STREAM, 0);
     if (sockfd < 0) {
         perror("new_connected_socket: socket");
         return -1;
@@ -199,8 +199,7 @@ int test_full_send_buffer(struct sockaddr_in *addr)
 
         // Ensure that the parent executes send() first, then the child
         // executes recv().
-        for (i = 0; i < 10; ++i)
-            sched_yield();
+        sleep(1);
 
         fprintf(stderr, "Start receiving...\n");
         recv_len = receive_all(recvfd);
@@ -262,8 +261,6 @@ out_listen:
 int main(void)
 {
     struct sockaddr_in addr;
-    int backlog;
-    int err = 0;
 
     addr.sin_family = AF_INET;
     addr.sin_port = htons(8080);
diff --git a/regression/apps/scripts/network.sh b/regression/apps/scripts/network.sh
index ec3988535..1fabf14b7 100755
--- a/regression/apps/scripts/network.sh
+++ b/regression/apps/scripts/network.sh
@@ -4,7 +4,9 @@ set -e
 
 NETTEST_DIR=/regression/network
 cd ${NETTEST_DIR}
+
 echo "Start network test......"
+
 ./tcp_server &
 ./tcp_client
 ./udp_server &
@@ -12,5 +14,7 @@ echo "Start network test......"
 ./unix_server &
 ./unix_client
 ./socketpair
+./listen_backlog
+./send_buf_full
 
 echo "All network test passed"