--- lbbs/src/net_server.c 2025/11/17 02:32:42 1.87 +++ lbbs/src/net_server.c 2025/12/01 14:01:36 1.99 @@ -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++) { @@ -411,6 +422,8 @@ static int fork_server(void) log_error("Error setting SSH options: %s\n", ssh_get_error(SSH_session)); goto cleanup; } + + ssh_set_blocking(SSH_session, 0); } // Redirect Input @@ -435,6 +448,13 @@ static int fork_server(void) SYS_child_process_count = 0; + // BWF compile + if (bwf_compile() < 0) + { + log_error("bwf_compile() error\n"); + goto cleanup; + } + bbs_main(); cleanup: @@ -471,6 +491,9 @@ cleanup: ssh_free(SSH_session); ssh_finalize(); + // BWF cleanup + bwf_cleanup(); + // Close Input and Output for client io_cleanup(); close(STDIN_FILENO); @@ -490,16 +513,21 @@ 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; - MENU_SET top10_menu_new; int i, j; pid_t pid; + int ssh_key_valid = 0; int ssh_log_level = SSH_LOG_NOLOG; + #ifdef HAVE_SYSTEMD_SD_DAEMON_H int sd_notify_stopping = 0; #endif @@ -508,10 +536,41 @@ int net_server(const char *hostaddr, in_ sshbind = ssh_bind_new(); + if (ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_HOSTKEY, SSH_HOST_RSA_KEY_FILE) < 0) + { + log_error("Error loading SSH RSA key: %s\n", SSH_HOST_RSA_KEY_FILE); + } + else + { + ssh_key_valid = 1; + } + if (ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_HOSTKEY, SSH_HOST_ED25519_KEY_FILE) < 0) + { + log_error("Error loading SSH ED25519 key: %s\n", SSH_HOST_ED25519_KEY_FILE); + } + else + { + ssh_key_valid = 1; + } + if (ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_HOSTKEY, SSH_HOST_ECDSA_KEY_FILE) < 0) + { + log_error("Error loading SSH ECDSA key: %s\n", SSH_HOST_ECDSA_KEY_FILE); + } + else + { + ssh_key_valid = 1; + } + + if (!ssh_key_valid) + { + log_error("Error: no valid SSH host key\n"); + ssh_bind_free(sshbind); + return -1; + } + 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_HOSTKEY_ALGORITHMS, "ssh-rsa,rsa-sha2-512,rsa-sha2-256") < 0 || + ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_HOSTKEY_ALGORITHMS, "+ssh-rsa") < 0 || ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_LOG_VERBOSITY, &ssh_log_level) < 0) { log_error("Error setting SSH bind options: %s\n", ssh_get_error(sshbind)); @@ -519,12 +578,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 +608,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 +630,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,11 +642,14 @@ 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); } + ssh_bind_set_blocking(sshbind, 0); + hash_dict_pid_sockaddr = hash_dict_create(MAX_CLIENT_LIMIT); if (hash_dict_pid_sockaddr == NULL) { @@ -618,22 +685,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 +720,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; } } @@ -671,7 +748,7 @@ int net_server(const char *hostaddr, in_ log_common("Notify %d child process to exit\n", SYS_child_process_count); #endif - if (kill(-getpid(), SIGTERM) < 0) + if (kill(0, SIGTERM) < 0) { log_error("Send SIGTERM signal failed (%d)\n", errno); } @@ -685,7 +762,7 @@ int net_server(const char *hostaddr, in_ sd_notifyf(0, "STATUS=Kill %d child process", SYS_child_process_count); #endif - if (kill(-getpid(), SIGKILL) < 0) + if (kill(0, SIGKILL) < 0) { log_error("Send SIGKILL signal failed (%d)\n", errno); } @@ -726,29 +803,24 @@ int net_server(const char *hostaddr, in_ log_error("Reload BWF conf failed\n"); } - if (load_menu(&bbs_menu_new, CONF_MENU) < 0) + if (detach_menu_shm(&bbs_menu) < 0) { - unload_menu(&bbs_menu_new); - log_error("Reload bbs menu failed\n"); + log_error("detach_menu_shm(bbs_menu) error\n"); } - else + if (load_menu(&bbs_menu, CONF_MENU) < 0) { + log_error("load_menu(bbs_menu) error\n"); unload_menu(&bbs_menu); - memcpy(&bbs_menu, &bbs_menu_new, sizeof(bbs_menu_new)); - log_common("Reload bbs menu successfully\n"); } - if (load_menu(&top10_menu_new, CONF_TOP10_MENU) < 0) + if (detach_menu_shm(&top10_menu) < 0) { - unload_menu(&top10_menu_new); - log_error("Reload top10 menu failed\n"); + log_error("detach_menu_shm(top10_menu) error\n"); } - else + if (load_menu(&top10_menu, CONF_TOP10_MENU) < 0) { + log_error("load_menu(top10_menu) error\n"); unload_menu(&top10_menu); - top10_menu_new.allow_exit = 1; - memcpy(&top10_menu, &top10_menu_new, sizeof(top10_menu_new)); - log_common("Reload top10 menu successfully\n"); } for (int i = 0; i < data_files_load_startup_count; i++) @@ -758,20 +830,15 @@ int net_server(const char *hostaddr, in_ log_error("load_file(%s) error\n", data_files_load_startup[i]); } } - log_common("Reload data files successfully\n"); // Load section config and gen_ex if (load_section_config_from_db(1) < 0) { log_error("load_section_config_from_db(1) error\n"); } - else - { - log_common("Reload section config and gen_ex successfully\n"); - } // Notify child processes to reload configuration - if (kill(-getpid(), SIGUSR1) < 0) + if (kill(0, SIGUSR1) < 0) { log_error("Send SIGUSR1 signal failed (%d)\n", errno); } @@ -781,13 +848,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 +881,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 +970,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++) {