--- lbbs/src/net_server.c	2005/03/19 14:44:21	1.9
+++ lbbs/src/net_server.c	2005/05/07 09:28:12	1.11
@@ -17,6 +17,7 @@
 
 #include "common.h"
 #include "io.h"
+#include "tcplib.h"
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -24,9 +25,11 @@
 int
 net_server (const char *hostaddr, unsigned int port)
 {
-  int namelen, seq, netint;
+  int namelen, seq, netint, result, flags;
   struct sockaddr_in sin;
   char temp[256];
+  fd_set testfds;
+  struct timeval timeout;
 
   socket_server = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
 
@@ -41,10 +44,10 @@ net_server (const char *hostaddr, unsign
     (strlen (hostaddr) > 0 ? inet_addr (hostaddr) : INADDR_ANY);
   sin.sin_port = htons (port);
 
-  if (bind (socket_server, (struct sockaddr *)&sin, sizeof(sin)) < 0)
+  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));
+		 inet_ntoa (sin.sin_addr), ntohs (sin.sin_port));
       exit (2);
     }
 
@@ -54,39 +57,74 @@ net_server (const char *hostaddr, unsign
       exit (3);
     }
 
-  strcpy(hostaddr_server, inet_ntoa(sin.sin_addr));
-  port_server = ntohs(sin.sin_port);
-  
+  strcpy (hostaddr_server, inet_ntoa (sin.sin_addr));
+  port_server = ntohs (sin.sin_port);
+
   log_std ("Listening at %s:%d\n", hostaddr_server, port_server);
 
   namelen = sizeof (sin);
-  while(1)
+  while (1)
     {
-      if ((socket_client = accept (socket_server, (struct sockaddr *) &sin, &namelen)) < 0)
-        {
-          log_error ("Accept connection error\n");
-          continue;
-        }
+      FD_ZERO (&testfds);
+      FD_SET (socket_server, &testfds);
 
-      strcpy (hostaddr_client, (const char *)inet_ntoa(sin.sin_addr));
-      port_client = ntohs(sin.sin_port);
+      timeout.tv_sec = 1;
+      timeout.tv_usec = 0;
 
-      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)
+      result = SignalSafeSelect (FD_SETSIZE, &testfds, NULL, NULL, &timeout);
+      if (result < 0)
+	 {
+	   log_error ("Accept connection error\n");
+	   continue;
+	 }
+
+      if (result == 0)
+	 {
+	   continue;
+	 }
+
+      if (FD_ISSET (socket_server, &testfds))
         {
-          log_error("Close client socket failed\n");
+          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 (errno != EWOULDBLOCK && errno != ECONNABORTED && errno != EINTR)
+		{
+	  	  log_error ("Accept connection error\n");
+	  	  break;
+		}
+	    }
+          fcntl (socket_server, F_SETFL, flags);
         }
+
+      if (socket_client < 0)
+	 {
+	   log_error ("Accept connection error\n");
+	   continue;
+	 }
+
+      strcpy (hostaddr_client, (const char *) inet_ntoa (sin.sin_addr));
+      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");
+	}
     }
 
-  if (close(socket_server) == -1)
+  if (close (socket_server) == -1)
     {
-      log_error("Close server socket failed\n");
+      log_error ("Close server socket failed\n");
     }
 
   return 0;