--- lbbs/src/net_server.c 2025/11/17 06:41:18 1.88 +++ lbbs/src/net_server.c 2025/11/17 09:42:52 1.90 @@ -38,8 +38,8 @@ #include #include #include +#include #include -#include #include #include @@ -509,7 +509,6 @@ int net_server(const char *hostaddr, in_ #endif int nfds; - siginfo_t siginfo; int notify_child_exit = 0; time_t tm_notify_child_exit = time(NULL); MENU_SET bbs_menu_new; @@ -567,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) { @@ -640,22 +641,21 @@ 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, NULL, WNOHANG); + if (pid > 0) { SYS_child_exit = 1; // Retry waitid SYS_child_process_count--; - log_common("Child process (%d) exited\n", siginfo.si_pid); + log_common("Child process (%d) exited\n", pid); - if (siginfo.si_pid != section_list_loader_pid) + 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 { @@ -665,21 +665,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; } }