--- lbbs/src/net_server.c 2025/05/16 14:09:31 1.35 +++ lbbs/src/net_server.c 2025/06/05 09:04:55 1.53 @@ -22,9 +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 @@ -36,91 +38,116 @@ #include #include #include +#include #include -int net_server(const char *hostaddr, in_port_t port) +struct process_sockaddr_t { - unsigned int namelen; + 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[]) +{ + unsigned int addrlen; int ret; - int flags; + int flags[2]; struct sockaddr_in sin; 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) + int i, j; + pid_t pid; + int ssh_log_level = SSH_LOG_NOLOG; + + ssh_init(); + + sshbind = ssh_bind_new(); + + if (ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_BINDADDR, hostaddr) < 0 || + ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_BINDPORT, &port) < 0 || + ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_HOSTKEY, SSH_HOST_KEYFILE) < 0 || + ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_LOG_VERBOSITY, &ssh_log_level) < 0) { - log_error("Create socket failed\n"); + log_error("Error setting SSH bind options: %s\n", ssh_get_error(sshbind)); + ssh_bind_free(sshbind); return -1; } - sin.sin_family = AF_INET; - 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) + epollfd = epoll_create1(0); + if (epollfd < 0) { - log_error("Bind address %s:%u failed (%d)\n", - inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), errno); + log_error("epoll_create1() error (%d)\n", errno); return -1; } - if (listen(socket_server, 10) < 0) + // Server socket + for (i = 0; i < 2; i++) { - log_error("Socket listen failed (%d)\n", errno); - return -1; - } + socket_server[i] = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - strncpy(hostaddr_server, inet_ntoa(sin.sin_addr), sizeof(hostaddr_server) - 1); - hostaddr_server[sizeof(hostaddr_server) - 1] = '\0'; + if (socket_server[i] < 0) + { + log_error("Create socket_server error (%d)\n", errno); + return -1; + } - port_server = ntohs(sin.sin_port); - namelen = sizeof(sin); + sin.sin_family = AF_INET; + sin.sin_addr.s_addr = (hostaddr[0] != '\0' ? inet_addr(hostaddr) : INADDR_ANY); + sin.sin_port = htons(port[i]); + + // Reuse address and port + flags[i] = 1; + if (setsockopt(socket_server[i], SOL_SOCKET, SO_REUSEADDR, &flags[i], sizeof(flags[i])) < 0) + { + log_error("setsockopt SO_REUSEADDR error (%d)\n", errno); + } + if (setsockopt(socket_server[i], SOL_SOCKET, SO_REUSEPORT, &flags[i], sizeof(flags[i])) < 0) + { + log_error("setsockopt SO_REUSEPORT error (%d)\n", errno); + } - log_std("Listening at %s:%d\n", hostaddr_server, port_server); + if (bind(socket_server[i], (struct sockaddr *)&sin, sizeof(sin)) < 0) + { + log_error("Bind address %s:%u error (%d)\n", + inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), errno); + return -1; + } - epollfd = epoll_create1(0); - if (epollfd < 0) - { - log_error("epoll_create1() error (%d)\n", errno); - return -1; - } + if (listen(socket_server[i], 10) < 0) + { + log_error("Telnet socket listen 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_common("Listening at %s:%u\n", inet_ntoa(sin.sin_addr), ntohs(sin.sin_port)); + + ev.events = EPOLLIN; + ev.data.fd = socket_server[i]; + if (epoll_ctl(epollfd, EPOLL_CTL_ADD, socket_server[i], &ev) == -1) { - log_error("close(epoll) error (%d)\n"); + log_error("epoll_ctl(socket_server[%d]) error (%d)\n", i, errno); + if (close(epollfd) < 0) + { + log_error("close(epoll) error (%d)\n"); + } + return -1; } - return -1; - } - flags = fcntl(socket_server, F_GETFL, 0); - fcntl(socket_server, F_SETFL, flags | O_NONBLOCK); + flags[i] = fcntl(socket_server[i], F_GETFL, 0); + fcntl(socket_server[i], F_SETFL, flags[i] | O_NONBLOCK); + } // Startup complete sd_notifyf(0, "READY=1\n" - "STATUS=Listening at %s:%d\n" + "STATUS=Listening at %s:%d (Telnet) and %s:%d (SSH2)\n" "MAINPID=%d", - hostaddr_server, port_server, getpid()); + hostaddr, port[0], hostaddr, port[1], getpid()); while (!SYS_server_exit || SYS_child_process_count > 0) { @@ -129,6 +156,7 @@ int net_server(const char *hostaddr, in_ 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; @@ -140,7 +168,24 @@ 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); + + 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) { @@ -155,7 +200,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); @@ -164,9 +209,16 @@ int net_server(const char *hostaddr, in_ 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) { - SYS_menu_reload = 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) @@ -177,36 +229,49 @@ int net_server(const char *hostaddr, in_ { 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_shm(p_bbs_menu_new); - 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"); + 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_mmap(data_files_load_startup[i]) < 0) + 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"); + log_common("Reload data files successfully\n"); + sd_notify(0, "READY=1"); + } + + 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 @@ -229,11 +294,14 @@ int net_server(const char *hostaddr, in_ for (int i = 0; i < nfds; i++) { - if (events[i].data.fd == socket_server) + if (events[i].data.fd == socket_server[0] || events[i].data.fd == socket_server[1]) { + SSH_v2 = (events[i].data.fd == socket_server[1] ? 1 : 0); + while (!SYS_server_exit) // Accept all incoming connections until error { - socket_client = accept(socket_server, (struct sockaddr *)&sin, &namelen); + addrlen = sizeof(sin); + socket_client = accept(socket_server[SSH_v2], (struct sockaddr *)&sin, &addrlen); if (socket_client < 0) { if (errno == EAGAIN || errno == EWOULDBLOCK) @@ -256,11 +324,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) @@ -277,12 +390,18 @@ int net_server(const char *hostaddr, in_ log_error("close(epoll) error (%d)\n"); } - fcntl(socket_server, F_SETFL, flags); - - if (close(socket_server) == -1) + for (i = 0; i < 2; i++) { - log_error("Close server socket failed\n"); + fcntl(socket_server[i], F_SETFL, flags[i]); + + if (close(socket_server[i]) == -1) + { + log_error("Close server socket failed\n"); + } } + ssh_bind_free(sshbind); + ssh_finalize(); + return 0; }