--- lbbs/src/net_server.c 2025/05/12 04:08:08 1.27 +++ lbbs/src/net_server.c 2025/06/04 14:41:17 1.50 @@ -22,8 +22,11 @@ #include "common.h" #include "log.h" #include "io.h" +#include "init.h" #include "fork.h" #include "menu.h" +#include "file_loader.h" +#include "section_list_loader.h" #include #include #include @@ -35,8 +38,17 @@ #include #include #include +#include +#include -#define MAX_EVENTS 10 +struct process_sockaddr_t +{ + pid_t pid; + in_addr_t s_addr; +}; +typedef struct process_sockaddr_t PROCESS_SOCKADDR; + +static PROCESS_SOCKADDR process_sockaddr_pool[MAX_CLIENT_LIMIT]; int net_server(const char *hostaddr, in_port_t port) { @@ -46,9 +58,11 @@ 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; + int i, j; + pid_t pid; socket_server = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); @@ -92,12 +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); - - sigemptyset(&nsigset); - sigaddset(&nsigset, SIGHUP); - sigaddset(&nsigset, SIGCHLD); - sigaddset(&nsigset, SIGTERM); + log_common("Listening at %s:%d\n", hostaddr_server, port_server); epollfd = epoll_create1(0); if (epollfd < 0) @@ -106,33 +115,67 @@ 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); + log_common("Child process (%d) exited\n", siginfo.si_pid); + + if (siginfo.si_pid != section_list_loader_pid) + { + i = 0; + for (; i < BBS_max_client; i++) + { + 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); + } + } } else if (ret == 0) { - SYS_child_exit = 0; break; } else if (ret < 0) @@ -144,27 +187,79 @@ 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); } + + sd_notifyf(0, "STATUS=Waiting for %d child process to exit", SYS_child_process_count); } - if (SYS_menu_reload && !SYS_server_exit) + if (SYS_conf_reload && !SYS_server_exit) { - if (reload_menu(&bbs_menu) < 0) + SYS_conf_reload = 0; + sd_notify(0, "RELOADING=1"); + + // Reload configuration + if (load_conf(CONF_BBSD) < 0) + { + log_error("Reload conf failed\n"); + } + + 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("Reload menu successfully\n"); + unload_menu(p_bbs_menu); + free(p_bbs_menu); + + p_bbs_menu = p_bbs_menu_new; + p_bbs_menu_new = NULL; + + log_common("Reload menu successfully\n"); + } + + sd_notify(0, "READY=1"); + } + + 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]); + } } - SYS_menu_reload = 0; + + log_common("Reload data files successfully\n"); + sd_notify(0, "READY=1"); } - sigprocmask(SIG_SETMASK, &osigset, NULL); + if (SYS_section_list_reload && !SYS_server_exit) + { + SYS_section_list_reload = 0; + + if (section_list_loader_reload() < 0) + { + log_error("ksection_list_loader_reload() failed\n"); + } + } nfds = epoll_wait(epollfd, events, MAX_EVENTS, 100); // 0.1 second @@ -188,16 +283,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); @@ -205,11 +308,56 @@ 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) + { + j = 0; + for (i = 0; i < BBS_max_client; i++) + { + if (process_sockaddr_pool[i].pid != 0 && process_sockaddr_pool[i].s_addr == sin.sin_addr.s_addr) + { + j++; + if (j >= BBS_max_client_per_ip) + { + log_common("Too many client connections (%d) from %s\n", j, hostaddr_client); + break; + } + } + } - if (fork_server() < 0) + if (j < BBS_max_client_per_ip) + { + if ((pid = fork_server()) < 0) + { + log_error("fork_server() error\n"); + } + else if (pid > 0) + { + i = 0; + for (; i < BBS_max_client; i++) + { + if (process_sockaddr_pool[i].pid == 0) + { + break; + } + } + + if (i >= BBS_max_client) + { + log_error("Process sockaddr pool depleted\n"); + } + else + { + process_sockaddr_pool[i].pid = pid; + process_sockaddr_pool[i].s_addr = sin.sin_addr.s_addr; + } + } + } + } + else { - log_error("fork_server() error\n"); + log_error("Rejected client connection over limit (%d)\n", SYS_child_process_count - 1); } if (close(socket_client) == -1) @@ -221,6 +369,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)