diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/server/sernet.c freeciv/server/sernet.c
--- FreecivCVS/server/sernet.c	Sun Jan  2 06:32:16 2000
+++ freeciv/server/sernet.c	Sun Feb 13 09:22:41 2000
@@ -20,6 +20,7 @@
 #include <time.h>
 #include <errno.h>
 #include <signal.h>
+#include <fcntl.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -240,16 +241,17 @@
   int new_sock;
   struct sockaddr_in fromend;
   struct hostent *from;
+  int i;
 
   fromlen = sizeof fromend;
 
   new_sock = accept(sockfd, (struct sockaddr *) &fromend, &fromlen);
 
-  from=gethostbyaddr((char*)&fromend.sin_addr, sizeof(sizeof(fromend.sin_addr)), 
-		     AF_INET);
-
   if(new_sock!=-1) {
-    int i;
+    from=gethostbyaddr((char*)&fromend.sin_addr,
+		       sizeof(sizeof(fromend.sin_addr)),
+		       AF_INET);
+
     for(i=0; i<MAX_NUM_CONNECTIONS; i++) {
       if(!connections[i].used) {
 	connections[i].used=1;
@@ -266,6 +268,7 @@
 	return 0;
       }
     }
+
     freelog(LOG_FATAL, "maximum number of connections reached");
     return -1;
   }
@@ -315,6 +318,8 @@
     freelog(LOG_FATAL, "listen failed: %s", mystrerror(errno));
     exit(1);
   }
+
+  fcntl(sock, F_SETFL, O_NONBLOCK);
 
   return 0;
 }