--- lbbs/src/net_server.c	2025/05/09 11:21:11	1.19
+++ lbbs/src/net_server.c	2025/05/11 01:54:00	1.22
@@ -23,9 +23,12 @@
 #include "log.h"
 #include "io.h"
 #include "fork.h"
-#include "tcplib.h"
 #include "menu.h"
+#include <errno.h>
+#include <fcntl.h>
+#include <string.h>
 #include <signal.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <sys/syscall.h>
 #include <sys/socket.h>
@@ -87,18 +90,18 @@ int net_server(const char *hostaddr, in_
 	{
 		sigprocmask(SIG_BLOCK, &nsigset, &osigset);
 
-		while (SYS_child_exit_count > 0)
+		while ((SYS_child_exit || SYS_server_exit) && SYS_child_process_count > 0)
 		{
 			siginfo.si_pid = 0;
 			ret = waitid(P_ALL, 0, &siginfo, WEXITED | WNOHANG);
 			if (ret == 0 && siginfo.si_pid > 0)
 			{
-				SYS_child_exit_count--;
 				SYS_child_process_count--;
 				log_std("Child process (%d) exited\n", siginfo.si_pid);
 			}
 			else if (ret == 0)
 			{
+				SYS_child_exit = 0;
 				break;
 			}
 			else if (ret < 0)
@@ -108,7 +111,16 @@ int net_server(const char *hostaddr, in_
 			}
 		}
 
-		if (SYS_menu_reload)
+		if (SYS_server_exit && !SYS_child_exit && SYS_child_process_count > 0)
+		{
+			log_std("Notify %d child process to exit\n", SYS_child_process_count);
+			if (kill(0, SIGTERM) < 0)
+			{
+				log_error("Send SIGTERM signal failed (%d)\n", errno);
+			}
+		}
+
+		if (SYS_menu_reload && !SYS_server_exit)
 		{
 			if (reload_menu(&bbs_menu) < 0)
 			{
@@ -126,8 +138,8 @@ int net_server(const char *hostaddr, in_
 		FD_ZERO(&testfds);
 		FD_SET(socket_server, &testfds);
 
-		timeout.tv_sec = 1;
-		timeout.tv_usec = 0;
+		timeout.tv_sec = 0;
+		timeout.tv_usec = 100 * 1000; // 0.1 second
 
 		ret = select(FD_SETSIZE, &testfds, NULL, NULL, &timeout);