--- lbbs/src/net_server.c 2025/05/10 15:23:42 1.21 +++ lbbs/src/net_server.c 2025/05/11 02:42:38 1.23 @@ -56,20 +56,30 @@ int net_server(const char *hostaddr, in_ } sin.sin_family = AF_INET; - sin.sin_addr.s_addr = - (strnlen(hostaddr, sizeof(hostaddr)) > 0 ? inet_addr(hostaddr) : INADDR_ANY); + 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) { - log_error("Bind address %s:%u failed\n", - inet_ntoa(sin.sin_addr), ntohs(sin.sin_port)); + log_error("Bind address %s:%u failed (%d)\n", + inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), errno); exit(2); } if (listen(socket_server, 10) < 0) { - log_error("Socket listen failed\n"); + log_error("Socket listen failed (%d)\n", errno); exit(3); } @@ -90,18 +100,18 @@ int net_server(const char *hostaddr, in_ { sigprocmask(SIG_BLOCK, &nsigset, &osigset); - while (SYS_child_exit_count > 0) + while ((SYS_child_exit || SYS_server_exit) && SYS_child_process_count > 0) { siginfo.si_pid = 0; ret = waitid(P_ALL, 0, &siginfo, WEXITED | WNOHANG); if (ret == 0 && siginfo.si_pid > 0) { - SYS_child_exit_count--; SYS_child_process_count--; log_std("Child process (%d) exited\n", siginfo.si_pid); } else if (ret == 0) { + SYS_child_exit = 0; break; } else if (ret < 0) @@ -111,8 +121,9 @@ int net_server(const char *hostaddr, in_ } } - if (SYS_server_exit && SYS_child_exit_count == 0) + 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); if (kill(0, SIGTERM) < 0) { log_error("Send SIGTERM signal failed (%d)\n", errno); @@ -136,10 +147,10 @@ int net_server(const char *hostaddr, in_ FD_ZERO(&testfds); FD_SET(socket_server, &testfds); - + timeout.tv_sec = 0; timeout.tv_usec = 100 * 1000; // 0.1 second - + ret = select(FD_SETSIZE, &testfds, NULL, NULL, &timeout); if (ret < 0)