--- lbbs/src/net_server.c 2025/05/10 15:23:42 1.21 +++ lbbs/src/net_server.c 2025/05/13 02:20:52 1.29 @@ -33,6 +33,7 @@ #include #include #include +#include #include int net_server(const char *hostaddr, in_port_t port) @@ -41,8 +42,8 @@ int net_server(const char *hostaddr, in_ int ret; int flags; struct sockaddr_in sin; - fd_set testfds; - struct timeval timeout; + struct epoll_event ev, events[MAX_EVENTS]; + int nfds, epollfd; sigset_t nsigset; sigset_t osigset; siginfo_t siginfo; @@ -52,25 +53,35 @@ int net_server(const char *hostaddr, in_ if (socket_server < 0) { log_error("Create socket failed\n"); - exit(1); + return -1; } 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)); - exit(2); + log_error("Bind address %s:%u failed (%d)\n", + inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), errno); + return -1; } if (listen(socket_server, 10) < 0) { - log_error("Socket listen failed\n"); - exit(3); + log_error("Socket listen failed (%d)\n", errno); + return -1; } strncpy(hostaddr_server, inet_ntoa(sin.sin_addr), sizeof(hostaddr_server) - 1); @@ -86,22 +97,40 @@ int net_server(const char *hostaddr, in_ sigaddset(&nsigset, SIGCHLD); sigaddset(&nsigset, SIGTERM); + epollfd = epoll_create1(0); + if (epollfd < 0) + { + log_error("epoll_create1() error (%d)\n", errno); + return -1; + } + + ev.events = EPOLLIN; + ev.data.fd = socket_server; + if (epoll_ctl(epollfd, EPOLL_CTL_ADD, socket_server, &ev) == -1) + { + log_error("epoll_ctl(socket_server) error (%d)\n", errno); + return -1; + } + + flags = fcntl(socket_server, F_GETFL, 0); + fcntl(socket_server, F_SETFL, flags | O_NONBLOCK); + while (!SYS_server_exit || SYS_child_process_count > 0) { 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 +140,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); @@ -134,26 +164,17 @@ int net_server(const char *hostaddr, in_ sigprocmask(SIG_SETMASK, &osigset, NULL); - 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); + nfds = epoll_wait(epollfd, events, MAX_EVENTS, 100); // 0.1 second - if (ret < 0) + if (nfds < 0) { if (errno != EINTR) { - log_error("Accept connection error: %d\n", errno); + log_error("epoll_wait() error (%d)\n", errno); + break; } continue; } - else if (ret == 0) // timeout - { - continue; - } // Stop accept new connection on exit if (SYS_server_exit) @@ -161,47 +182,53 @@ int net_server(const char *hostaddr, in_ continue; } - if (FD_ISSET(socket_server, &testfds)) + for (int i = 0; i < nfds; i++) { - flags = fcntl(socket_server, F_GETFL, 0); - fcntl(socket_server, F_SETFL, flags | O_NONBLOCK); - while ((socket_client = - accept(socket_server, (struct sockaddr *)&sin, &namelen)) < 0) + if (events[i].data.fd == socket_server) { - if (errno != EWOULDBLOCK && errno != ECONNABORTED && errno != EINTR) + while (!SYS_server_exit) // Accept all incoming connections until error { - log_error("Accept connection error\n"); - break; + socket_client = accept(socket_server, (struct sockaddr *)&sin, &namelen); + if (socket_client < 0) + { + if (errno == EAGAIN || errno == EWOULDBLOCK) + { + break; + } + else if (errno == EINTR) + { + continue; + } + else + { + log_error("accept(socket_server) error (%d)\n", errno); + break; + } + } + + strncpy(hostaddr_client, inet_ntoa(sin.sin_addr), sizeof(hostaddr_client) - 1); + hostaddr_client[sizeof(hostaddr_client) - 1] = '\0'; + + port_client = ntohs(sin.sin_port); + + log_std("Accept connection from %s:%d\n", hostaddr_client, port_client); + + if (fork_server() < 0) + { + log_error("fork_server() error\n"); + } + + if (close(socket_client) == -1) + { + log_error("close(socket_lient) error (%d)\n", errno); + } } } - fcntl(socket_server, F_SETFL, flags); - } - - if (socket_client < 0) - { - log_error("Accept connection error\n"); - continue; - } - - strncpy(hostaddr_client, inet_ntoa(sin.sin_addr), sizeof(hostaddr_client) - 1); - hostaddr_client[sizeof(hostaddr_client) - 1] = '\0'; - - port_client = ntohs(sin.sin_port); - - log_std("Accept connection from %s:%d\n", hostaddr_client, - port_client); - - if (fork_server() < 0) - { - log_error("Fork error\n"); - } - - if (close(socket_client) == -1) - { - log_error("Close client socket failed\n"); } } + fcntl(socket_server, F_SETFL, flags); + if (close(socket_server) == -1) { log_error("Close server socket failed\n");