--- lbbs/src/net_server.c 2025/05/11 01:54:00 1.22 +++ lbbs/src/net_server.c 2025/05/25 08:15:03 1.41 @@ -24,6 +24,7 @@ #include "io.h" #include "fork.h" #include "menu.h" +#include "file_loader.h" #include #include #include @@ -33,7 +34,9 @@ #include #include #include +#include #include +#include int net_server(const char *hostaddr, in_port_t port) { @@ -41,36 +44,46 @@ int net_server(const char *hostaddr, in_ int ret; int flags; struct sockaddr_in sin; - fd_set testfds; - struct timeval timeout; - sigset_t nsigset; - sigset_t osigset; + struct epoll_event ev, events[MAX_EVENTS]; + int nfds, epollfd; 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; - sin.sin_addr.s_addr = - (strnlen(hostaddr, sizeof(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)); - exit(2); + log_error("Bind address %s:%u failed (%d)\n", + inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), errno); + return -1; } if (listen(socket_server, 10) < 0) { - log_error("Socket listen failed\n"); - exit(3); + log_error("Socket listen failed (%d)\n", errno); + return -1; } strncpy(hostaddr_server, inet_ntoa(sin.sin_addr), sizeof(hostaddr_server) - 1); @@ -81,27 +94,57 @@ 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) + { + log_error("epoll_create1() error (%d)\n", errno); + return -1; + } + + 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) @@ -118,43 +161,70 @@ 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 { + 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"); - FD_ZERO(&testfds); - FD_SET(socket_server, &testfds); + 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]); + } + } - timeout.tv_sec = 0; - timeout.tv_usec = 100 * 1000; // 0.1 second + log_std("Reload data files successfully\n"); + sd_notify(0, "READY=1"); + } - ret = select(FD_SETSIZE, &testfds, NULL, NULL, &timeout); + nfds = epoll_wait(epollfd, events, MAX_EVENTS, 100); // 0.1 second - if (ret < 0) + if (nfds < 0) { if (errno != EINTR) { - log_error("Accept connection error: %d\n", errno); + log_error("epoll_wait() error (%d)\n", errno); + break; } continue; } - else if (ret == 0) // timeout - { - continue; - } // Stop accept new connection on exit if (SYS_server_exit) @@ -162,47 +232,58 @@ int net_server(const char *hostaddr, in_ continue; } - if (FD_ISSET(socket_server, &testfds)) + for (int i = 0; i < nfds; i++) { - flags = fcntl(socket_server, F_GETFL, 0); - fcntl(socket_server, F_SETFL, flags | O_NONBLOCK); - while ((socket_client = - accept(socket_server, (struct sockaddr *)&sin, &namelen)) < 0) + if (events[i].data.fd == socket_server) { - if (errno != EWOULDBLOCK && errno != ECONNABORTED && errno != EINTR) + while (!SYS_server_exit) // Accept all incoming connections until error { - log_error("Accept connection error\n"); - break; + socket_client = accept(socket_server, (struct sockaddr *)&sin, &namelen); + if (socket_client < 0) + { + if (errno == EAGAIN || errno == EWOULDBLOCK) + { + break; + } + else if (errno == EINTR) + { + continue; + } + else + { + log_error("accept(socket_server) error (%d)\n", errno); + break; + } + } + + 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, port_client); + + if (fork_server() < 0) + { + log_error("fork_server() error\n"); + } + + if (close(socket_client) == -1) + { + log_error("close(socket_lient) error (%d)\n", errno); + } } } - fcntl(socket_server, F_SETFL, flags); - } - - if (socket_client < 0) - { - log_error("Accept connection error\n"); - continue; - } - - 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, - port_client); - - if (fork_server() < 0) - { - log_error("Fork error\n"); } + } - if (close(socket_client) == -1) - { - log_error("Close client socket failed\n"); - } + if (close(epollfd) < 0) + { + log_error("close(epoll) error (%d)\n"); } + fcntl(socket_server, F_SETFL, flags); + if (close(socket_server) == -1) { log_error("Close server socket failed\n");