--- lbbs/src/net_server.c 2025/06/01 03:07:42 1.44 +++ lbbs/src/net_server.c 2025/06/04 13:42:53 1.49 @@ -38,6 +38,7 @@ #include #include #include +#include #include struct process_sockaddr_t @@ -47,7 +48,7 @@ struct process_sockaddr_t }; typedef struct process_sockaddr_t PROCESS_SOCKADDR; -static PROCESS_SOCKADDR process_sockaddr_pool[MAX_CLIENTS_LIMIT]; +static PROCESS_SOCKADDR process_sockaddr_pool[MAX_CLIENT_LIMIT]; int net_server(const char *hostaddr, in_port_t port) { @@ -105,7 +106,7 @@ int net_server(const char *hostaddr, in_ port_server = ntohs(sin.sin_port); namelen = sizeof(sin); - log_std("Listening at %s:%d\n", hostaddr_server, port_server); + log_common("Listening at %s:%d\n", hostaddr_server, port_server); epollfd = epoll_create1(0); if (epollfd < 0) @@ -154,20 +155,23 @@ int net_server(const char *hostaddr, in_ SYS_child_exit = 1; // Retry waitid SYS_child_process_count--; - log_std("Child process (%d) exited\n", siginfo.si_pid); + log_common("Child process (%d) exited\n", siginfo.si_pid); - i = 0; - for (; i < BBS_max_client; i++) + if (siginfo.si_pid != section_list_loader_pid) { - if (process_sockaddr_pool[i].pid == siginfo.si_pid) + i = 0; + for (; i < BBS_max_client; i++) { - process_sockaddr_pool[i].pid = 0; - break; + if (process_sockaddr_pool[i].pid == siginfo.si_pid) + { + process_sockaddr_pool[i].pid = 0; + break; + } + } + if (i >= BBS_max_client) + { + log_error("Child process (%d) not found in process sockaddr pool\n", siginfo.si_pid); } - } - if (i >= BBS_max_client) - { - log_error("Child process (%d) not found in process sockaddr pool\n", siginfo.si_pid); } } else if (ret == 0) @@ -183,7 +187,7 @@ int net_server(const char *hostaddr, in_ 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); + log_common("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); @@ -224,7 +228,7 @@ int net_server(const char *hostaddr, in_ p_bbs_menu = p_bbs_menu_new; p_bbs_menu_new = NULL; - log_std("Reload menu successfully\n"); + log_common("Reload menu successfully\n"); } sd_notify(0, "READY=1"); @@ -243,7 +247,7 @@ int net_server(const char *hostaddr, in_ } } - log_std("Reload data files successfully\n"); + log_common("Reload data files successfully\n"); sd_notify(0, "READY=1"); } @@ -304,7 +308,7 @@ int net_server(const char *hostaddr, in_ port_client = ntohs(sin.sin_port); - log_std("Accept connection from %s:%d\n", hostaddr_client, port_client); + log_common("Accept connection from %s:%d\n", hostaddr_client, port_client); if (SYS_child_process_count - 1 < BBS_max_client) {