--- lbbs/src/net_server.c	2025/05/11 04:09:08	1.24
+++ lbbs/src/net_server.c	2025/05/12 04:08:08	1.27
@@ -33,16 +33,19 @@
 #include <sys/syscall.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
+#include <sys/epoll.h>
 #include <arpa/inet.h>
 
+#define MAX_EVENTS 10
+
 int net_server(const char *hostaddr, in_port_t port)
 {
 	unsigned int namelen;
 	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,7 +55,7 @@ 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;
@@ -74,13 +77,13 @@ int net_server(const char *hostaddr, in_
 	{
 		log_error("Bind address %s:%u failed (%d)\n",
 				  inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), errno);
-		exit(2);
+		return -1;
 	}
 
 	if (listen(socket_server, 10) < 0)
 	{
 		log_error("Socket listen failed (%d)\n", errno);
-		exit(3);
+		return -1;
 	}
 
 	strncpy(hostaddr_server, inet_ntoa(sin.sin_addr), sizeof(hostaddr_server) - 1);
@@ -96,6 +99,24 @@ 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 | EPOLLET;
+	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);
@@ -145,26 +166,17 @@ int net_server(const char *hostaddr, in_
 
 		sigprocmask(SIG_SETMASK, &osigset, NULL);
 
-		FD_ZERO(&testfds);
-		FD_SET(socket_server, &testfds);
+		nfds = epoll_wait(epollfd, events, MAX_EVENTS, 100); // 0.1 second
 
-		timeout.tv_sec = 0;
-		timeout.tv_usec = 100 * 1000; // 0.1 second
-
-		ret = select(socket_server + 1, &testfds, NULL, NULL, &timeout);
-
-		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)
@@ -172,49 +184,45 @@ 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 (1) // 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 && errno != ECONNABORTED && errno != EINTR)
+						{
+							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");