--- lbbs/src/net_server.c 2025/11/17 02:32:42 1.87 +++ lbbs/src/net_server.c 2025/11/18 12:12:52 1.92 @@ -38,12 +38,17 @@ #include #include #include -#include +#include #include -#include #include #include +#ifdef HAVE_SYS_EPOLL_H +#include +#else +#include +#endif + #ifdef HAVE_SYSTEMD_SD_DAEMON_H #include #endif @@ -84,7 +89,11 @@ struct channel_data_struct static int socket_server[2]; static int socket_client; + +#ifdef HAVE_SYS_EPOLL_H static int epollfd_server = -1; +#endif + static ssh_bind sshbind; static HASH_DICT *hash_dict_pid_sockaddr = NULL; @@ -318,10 +327,12 @@ static int fork_server(void) } // Child process +#ifdef HAVE_SYS_EPOLL_H if (close(epollfd_server) < 0) { log_error("close(epollfd_server) error (%d)\n"); } +#endif for (i = 0; i < 2; i++) { @@ -490,9 +501,14 @@ int net_server(const char *hostaddr, in_ int ret; int flags_server[2]; struct sockaddr_in sin; + +#ifdef HAVE_SYS_EPOLL_H struct epoll_event ev, events[MAX_EVENTS]; +#else + struct pollfd pfds[2]; +#endif + int nfds; - siginfo_t siginfo; int notify_child_exit = 0; time_t tm_notify_child_exit = time(NULL); MENU_SET bbs_menu_new; @@ -500,6 +516,7 @@ int net_server(const char *hostaddr, in_ int i, j; pid_t pid; int ssh_log_level = SSH_LOG_NOLOG; + #ifdef HAVE_SYSTEMD_SD_DAEMON_H int sd_notify_stopping = 0; #endif @@ -519,12 +536,14 @@ int net_server(const char *hostaddr, in_ return -1; } +#ifdef HAVE_SYS_EPOLL_H epollfd_server = epoll_create1(0); if (epollfd_server == -1) { log_error("epoll_create1() error (%d)\n", errno); return -1; } +#endif // Server socket for (i = 0; i < 2; i++) @@ -547,10 +566,12 @@ int net_server(const char *hostaddr, in_ { log_error("setsockopt SO_REUSEADDR error (%d)\n", errno); } +#if defined(SO_REUSEPORT) if (setsockopt(socket_server[i], SOL_SOCKET, SO_REUSEPORT, &flags_server[i], sizeof(flags_server[i])) < 0) { log_error("setsockopt SO_REUSEPORT error (%d)\n", errno); } +#endif if (bind(socket_server[i], (struct sockaddr *)&sin, sizeof(sin)) < 0) { @@ -567,6 +588,7 @@ int net_server(const char *hostaddr, in_ log_common("Listening at %s:%u\n", inet_ntoa(sin.sin_addr), ntohs(sin.sin_port)); +#ifdef HAVE_SYS_EPOLL_H ev.events = EPOLLIN; ev.data.fd = socket_server[i]; if (epoll_ctl(epollfd_server, EPOLL_CTL_ADD, socket_server[i], &ev) == -1) @@ -578,6 +600,7 @@ int net_server(const char *hostaddr, in_ } return -1; } +#endif flags_server[i] = fcntl(socket_server[i], F_GETFL, 0); fcntl(socket_server[i], F_SETFL, flags_server[i] | O_NONBLOCK); @@ -618,22 +641,32 @@ int net_server(const char *hostaddr, in_ { SYS_child_exit = 0; - siginfo.si_pid = 0; - ret = waitid(P_ALL, 0, &siginfo, WEXITED | WNOHANG); - if (ret == 0 && siginfo.si_pid > 0) + pid = waitpid(-1, &ret, WNOHANG); + if (pid > 0) { SYS_child_exit = 1; // Retry waitid - SYS_child_process_count--; - log_common("Child process (%d) exited\n", siginfo.si_pid); - if (siginfo.si_pid != section_list_loader_pid) + if (WIFEXITED(ret)) + { + log_common("Child process (%d) exited, status=%d\n", pid, WEXITSTATUS(ret)); + } + else if (WIFSIGNALED(ret)) + { + log_common("Child process (%d) is killed, status=%d\n", pid, WTERMSIG(ret)); + } + else + { + log_common("Child process (%d) exited abnormally, status=%d\n", pid, ret); + } + + if (pid != section_list_loader_pid) { j = 0; - ret = hash_dict_get(hash_dict_pid_sockaddr, (uint64_t)siginfo.si_pid, (int64_t *)&j); + ret = hash_dict_get(hash_dict_pid_sockaddr, (uint64_t)pid, (int64_t *)&j); if (ret < 0) { - log_error("hash_dict_get(hash_dict_pid_sockaddr, %d) error\n", siginfo.si_pid); + log_error("hash_dict_get(hash_dict_pid_sockaddr, %d) error\n", pid); } else { @@ -643,21 +676,21 @@ int net_server(const char *hostaddr, in_ log_error("hash_dict_inc(hash_dict_sockaddr_count, %d, -1) error\n", j); } - ret = hash_dict_del(hash_dict_pid_sockaddr, (uint64_t)siginfo.si_pid); + ret = hash_dict_del(hash_dict_pid_sockaddr, (uint64_t)pid); if (ret < 0) { - log_error("hash_dict_del(hash_dict_pid_sockaddr, %d) error\n", siginfo.si_pid); + log_error("hash_dict_del(hash_dict_pid_sockaddr, %d) error\n", pid); } } } } - else if (ret == 0) + else if (pid == 0) { break; } - else if (ret < 0) + else if (pid < 0) { - log_error("Error in waitid: %d\n", errno); + log_error("Error in waitpid(): %d\n", errno); break; } } @@ -781,13 +814,26 @@ int net_server(const char *hostaddr, in_ #endif } +#ifdef HAVE_SYS_EPOLL_H nfds = epoll_wait(epollfd_server, events, MAX_EVENTS, 100); // 0.1 second - - if (nfds < 0) + ret = nfds; +#else + pfds[0].fd = socket_server[0]; + pfds[0].events = POLLIN; + pfds[1].fd = socket_server[1]; + pfds[1].events = POLLIN; + nfds = 2; + ret = poll(pfds, (nfds_t)nfds, 100); // 0.1 second +#endif + if (ret < 0) { if (errno != EINTR) { +#ifdef HAVE_SYS_EPOLL_H log_error("epoll_wait() error (%d)\n", errno); +#else + log_error("poll() error (%d)\n", errno); +#endif break; } continue; @@ -801,14 +847,22 @@ int net_server(const char *hostaddr, in_ for (int i = 0; i < nfds; i++) { +#ifdef HAVE_SYS_EPOLL_H if (events[i].data.fd == socket_server[0] || events[i].data.fd == socket_server[1]) +#else + if ((pfds[i].fd == socket_server[0] || pfds[i].fd == socket_server[1]) && (pfds[i].revents & POLLIN)) +#endif { +#ifdef HAVE_SYS_EPOLL_H SSH_v2 = (events[i].data.fd == socket_server[1] ? 1 : 0); +#else + SSH_v2 = (pfds[i].fd == socket_server[1] ? 1 : 0); +#endif while (!SYS_server_exit) // Accept all incoming connections until error { addrlen = sizeof(sin); - socket_client = accept(socket_server[SSH_v2], (struct sockaddr *)&sin, &addrlen); + socket_client = accept(socket_server[SSH_v2], (struct sockaddr *)&sin, (socklen_t *)&addrlen); if (socket_client < 0) { if (errno == EAGAIN || errno == EWOULDBLOCK) @@ -882,10 +936,12 @@ int net_server(const char *hostaddr, in_ } } +#ifdef HAVE_SYS_EPOLL_H if (close(epollfd_server) < 0) { log_error("close(epollfd_server) error (%d)\n"); } +#endif for (i = 0; i < 2; i++) {