--- lbbs/src/net_server.c	2025/04/28 03:31:00	1.13
+++ lbbs/src/net_server.c	2025/05/11 02:42:38	1.23
@@ -1,34 +1,51 @@
 /***************************************************************************
 						  net_server.c  -  description
 							 -------------------
-	begin                : Mon Oct 11 2004
-	copyright            : (C) 2004 by Leaflet
-	email                : leaflet@leafok.com
+	Copyright            : (C) 2004-2025 by Leaflet
+	Email                : leaflet@leafok.com
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
+ *   the Free Software Foundation; either version 3 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
+#define _XOPEN_SOURCE 500
+#define _POSIX_C_SOURCE 200809L
+#define _GNU_SOURCE
+
+#include "net_server.h"
 #include "common.h"
+#include "log.h"
 #include "io.h"
-#include "tcplib.h"
+#include "fork.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>
-#include <netinet/in.h>
+#include <sys/wait.h>
 #include <arpa/inet.h>
 
-int net_server(const char *hostaddr, unsigned int port)
+int net_server(const char *hostaddr, in_port_t port)
 {
-	int namelen, seq, netint, result, flags;
+	unsigned int namelen;
+	int ret;
+	int flags;
 	struct sockaddr_in sin;
-	char temp[256];
 	fd_set testfds;
 	struct timeval timeout;
+	sigset_t nsigset;
+	sigset_t osigset;
+	siginfo_t siginfo;
 
 	socket_server = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
 
@@ -39,45 +56,118 @@ int net_server(const char *hostaddr, uns
 	}
 
 	sin.sin_family = AF_INET;
-	sin.sin_addr.s_addr =
-		(strlen(hostaddr) > 0 ? inet_addr(hostaddr) : INADDR_ANY);
+	sin.sin_addr.s_addr = (hostaddr[0] != '\0' ? inet_addr(hostaddr) : INADDR_ANY);
 	sin.sin_port = htons(port);
 
+	// Reuse address and port
+	flags = 1;
+	if (setsockopt(socket_server, SOL_SOCKET, SO_REUSEADDR, &flags, sizeof(flags)) < 0)
+	{
+		log_error("setsockopt SO_REUSEADDR error (%d)\n", errno);
+	}
+	if (setsockopt(socket_server, SOL_SOCKET, SO_REUSEPORT, &flags, sizeof(flags)) < 0)
+	{
+		log_error("setsockopt SO_REUSEPORT error (%d)\n", errno);
+	}
+
 	if (bind(socket_server, (struct sockaddr *)&sin, sizeof(sin)) < 0)
 	{
-		log_error("Bind address %s:%u failed\n",
-				  inet_ntoa(sin.sin_addr), ntohs(sin.sin_port));
+		log_error("Bind address %s:%u failed (%d)\n",
+				  inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), errno);
 		exit(2);
 	}
 
 	if (listen(socket_server, 10) < 0)
 	{
-		log_error("Socket listen failed\n");
+		log_error("Socket listen failed (%d)\n", errno);
 		exit(3);
 	}
 
-	strcpy(hostaddr_server, inet_ntoa(sin.sin_addr));
+	strncpy(hostaddr_server, inet_ntoa(sin.sin_addr), sizeof(hostaddr_server) - 1);
+	hostaddr_server[sizeof(hostaddr_server) - 1] = '\0';
+
 	port_server = ntohs(sin.sin_port);
+	namelen = sizeof(sin);
 
 	log_std("Listening at %s:%d\n", hostaddr_server, port_server);
 
-	namelen = sizeof(sin);
-	while (!SYS_exit)
+	sigemptyset(&nsigset);
+	sigaddset(&nsigset, SIGHUP);
+	sigaddset(&nsigset, SIGCHLD);
+	sigaddset(&nsigset, SIGTERM);
+
+	while (!SYS_server_exit || SYS_child_process_count > 0)
 	{
+		sigprocmask(SIG_BLOCK, &nsigset, &osigset);
+
+		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_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)
+			{
+				log_error("Error in waitid: %d\n", errno);
+				break;
+			}
+		}
+
+		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)
+			{
+				log_error("Reload menu failed\n");
+			}
+			else
+			{
+				log_std("Reload menu successfully\n");
+			}
+			SYS_menu_reload = 0;
+		}
+
+		sigprocmask(SIG_SETMASK, &osigset, NULL);
+
 		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);
 
-		result = SignalSafeSelect(FD_SETSIZE, &testfds, NULL, NULL, &timeout);
-		if (result < 0)
+		if (ret < 0)
+		{
+			if (errno != EINTR)
+			{
+				log_error("Accept connection error: %d\n", errno);
+			}
+			continue;
+		}
+		else if (ret == 0) // timeout
 		{
-			log_error("Accept connection error\n");
 			continue;
 		}
 
-		if (result == 0)
+		// Stop accept new connection on exit
+		if (SYS_server_exit)
 		{
 			continue;
 		}
@@ -104,7 +194,9 @@ int net_server(const char *hostaddr, uns
 			continue;
 		}
 
-		strcpy(hostaddr_client, (const char *)inet_ntoa(sin.sin_addr));
+		strncpy(hostaddr_client, inet_ntoa(sin.sin_addr), sizeof(hostaddr_client) - 1);
+		hostaddr_client[sizeof(hostaddr_client) - 1] = '\0';
+
 		port_client = ntohs(sin.sin_port);
 
 		log_std("Accept connection from %s:%d\n", hostaddr_client,