--- lbbs/src/net_server.c 2025/11/17 09:42:52 1.90 +++ lbbs/src/net_server.c 2025/11/19 14:47:08 1.94 @@ -511,8 +511,6 @@ int net_server(const char *hostaddr, in_ int nfds; 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_log_level = SSH_LOG_NOLOG; @@ -641,13 +639,24 @@ int net_server(const char *hostaddr, in_ { SYS_child_exit = 0; - pid = waitpid(-1, NULL, WNOHANG); + 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", 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) { @@ -693,7 +702,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); } @@ -707,7 +716,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); } @@ -748,29 +757,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++) @@ -780,20 +784,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); } @@ -851,7 +850,7 @@ int net_server(const char *hostaddr, in_ 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)