--- lbbs/src/net_server.c	2025/05/12 03:59:46	1.26
+++ lbbs/src/net_server.c	2025/05/25 08:10:48	1.40
@@ -24,6 +24,7 @@
 #include "io.h"
 #include "fork.h"
 #include "menu.h"
+#include "file_loader.h"
 #include <errno.h>
 #include <fcntl.h>
 #include <string.h>
@@ -35,8 +36,7 @@
 #include <sys/wait.h>
 #include <sys/epoll.h>
 #include <arpa/inet.h>
-
-#define MAX_EVENTS 10
+#include <systemd/sd-daemon.h>
 
 int net_server(const char *hostaddr, in_port_t port)
 {
@@ -46,16 +46,16 @@ int net_server(const char *hostaddr, in_
 	struct sockaddr_in sin;
 	struct epoll_event ev, events[MAX_EVENTS];
 	int nfds, epollfd;
-	sigset_t nsigset;
-	sigset_t osigset;
 	siginfo_t siginfo;
+	int sd_notify_stopping = 0;
+	MENU_SET *p_bbs_menu_new;
 
 	socket_server = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
 
 	if (socket_server < 0)
 	{
 		log_error("Create socket failed\n");
-		exit(1);
+		return -1;
 	}
 
 	sin.sin_family = AF_INET;
@@ -77,13 +77,13 @@ int net_server(const char *hostaddr, in_
 	{
 		log_error("Bind address %s:%u failed (%d)\n",
 				  inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), errno);
-		exit(2);
+		return -1;
 	}
 
 	if (listen(socket_server, 10) < 0)
 	{
 		log_error("Socket listen failed (%d)\n", errno);
-		exit(3);
+		return -1;
 	}
 
 	strncpy(hostaddr_server, inet_ntoa(sin.sin_addr), sizeof(hostaddr_server) - 1);
@@ -94,11 +94,6 @@ int net_server(const char *hostaddr, in_
 
 	log_std("Listening at %s:%d\n", hostaddr_server, port_server);
 
-	sigemptyset(&nsigset);
-	sigaddset(&nsigset, SIGHUP);
-	sigaddset(&nsigset, SIGCHLD);
-	sigaddset(&nsigset, SIGTERM);
-
 	epollfd = epoll_create1(0);
 	if (epollfd < 0)
 	{
@@ -106,33 +101,50 @@ int net_server(const char *hostaddr, in_
 		return -1;
 	}
 
-	ev.events = EPOLLIN | EPOLLET;
+	ev.events = EPOLLIN;
 	ev.data.fd = socket_server;
 	if (epoll_ctl(epollfd, EPOLL_CTL_ADD, socket_server, &ev) == -1)
 	{
 		log_error("epoll_ctl(socket_server) error (%d)\n", errno);
+		if (close(epollfd) < 0)
+		{
+			log_error("close(epoll) error (%d)\n");
+		}
 		return -1;
 	}
 
 	flags = fcntl(socket_server, F_GETFL, 0);
 	fcntl(socket_server, F_SETFL, flags | O_NONBLOCK);
 
+	// Startup complete
+	sd_notifyf(0, "READY=1\n"
+				  "STATUS=Listening at %s:%d\n"
+				  "MAINPID=%d",
+			   hostaddr_server, port_server, getpid());
+
 	while (!SYS_server_exit || SYS_child_process_count > 0)
 	{
-		sigprocmask(SIG_BLOCK, &nsigset, &osigset);
+		if (SYS_server_exit && !sd_notify_stopping)
+		{
+			sd_notify(0, "STOPPING=1");
+			sd_notify_stopping = 1;
+		}
 
 		while ((SYS_child_exit || SYS_server_exit) && SYS_child_process_count > 0)
 		{
+			SYS_child_exit = 0;
+
 			siginfo.si_pid = 0;
 			ret = waitid(P_ALL, 0, &siginfo, WEXITED | WNOHANG);
 			if (ret == 0 && siginfo.si_pid > 0)
 			{
+				SYS_child_exit = 1; // Retry waitid
+
 				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)
@@ -149,22 +161,60 @@ int net_server(const char *hostaddr, in_
 			{
 				log_error("Send SIGTERM signal failed (%d)\n", errno);
 			}
+
+			sd_notifyf(0, "STATUS=Waiting for %d child process to exit", SYS_child_process_count);
 		}
 
 		if (SYS_menu_reload && !SYS_server_exit)
 		{
-			if (reload_menu(&bbs_menu) < 0)
+			SYS_menu_reload = 0;
+			sd_notify(0, "RELOADING=1");
+
+			p_bbs_menu_new = calloc(1, sizeof(MENU_SET));
+			if (p_bbs_menu_new == NULL)
 			{
+				log_error("OOM: calloc(MENU_SET)\n");
+			}
+			else if (load_menu(p_bbs_menu_new, CONF_MENU) < 0)
+			{
+				unload_menu(p_bbs_menu_new);
+				free(p_bbs_menu_new);
+				p_bbs_menu_new = NULL;
+
 				log_error("Reload menu failed\n");
 			}
 			else
 			{
+				log_std("Debug: trie dict nodes used = %d, limit = %d\n", trie_dict_used_nodes(), TRIE_NODE_PER_POOL);
+
+				unload_menu(p_bbs_menu);
+				free(p_bbs_menu);
+
+				p_bbs_menu = p_bbs_menu_new;
+				p_bbs_menu_new = NULL;
+
 				log_std("Reload menu successfully\n");
 			}
-			SYS_menu_reload = 0;
+
+			sd_notify(0, "READY=1");
 		}
 
-		sigprocmask(SIG_SETMASK, &osigset, NULL);
+		if (SYS_data_file_reload && !SYS_server_exit)
+		{
+			SYS_data_file_reload = 0;
+			sd_notify(0, "RELOADING=1");
+
+			for (int i = 0; i < data_files_load_startup_count; i++)
+			{
+				if (load_file(data_files_load_startup[i]) < 0)
+				{
+					log_error("load_file_mmap(%s) error\n", data_files_load_startup[i]);
+				}
+			}
+
+			log_std("Reload data files successfully\n");
+			sd_notify(0, "READY=1");
+		}
 
 		nfds = epoll_wait(epollfd, events, MAX_EVENTS, 100); // 0.1 second
 
@@ -188,16 +238,24 @@ int net_server(const char *hostaddr, in_
 		{
 			if (events[i].data.fd == socket_server)
 			{
-				while (1) // Accept all incoming connections until error
+				while (!SYS_server_exit) // Accept all incoming connections until error
 				{
 					socket_client = accept(socket_server, (struct sockaddr *)&sin, &namelen);
 					if (socket_client < 0)
 					{
-						if (errno != EAGAIN && errno != EWOULDBLOCK && errno != ECONNABORTED && errno != EINTR)
+						if (errno == EAGAIN || errno == EWOULDBLOCK)
+						{
+							break;
+						}
+						else if (errno == EINTR)
+						{
+							continue;
+						}
+						else
 						{
 							log_error("accept(socket_server) error (%d)\n", errno);
+							break;
 						}
-						break;
 					}
 
 					strncpy(hostaddr_client, inet_ntoa(sin.sin_addr), sizeof(hostaddr_client) - 1);
@@ -221,6 +279,11 @@ int net_server(const char *hostaddr, in_
 		}
 	}
 
+	if (close(epollfd) < 0)
+	{
+		log_error("close(epoll) error (%d)\n");
+	}
+
 	fcntl(socket_server, F_SETFL, flags);
 
 	if (close(socket_server) == -1)