Changeset 2341 for branches/blt4

Timestamp:

Aug 9, 2011, 8:26:41 PM (13 years ago)

Author:

gah

Message:

 

File:

• branches/blt4/packages/vizservers/nanoscale/server2.c (modified) (9 diffs)

branches/blt4/packages/vizservers/nanoscale/server2.c

@@ -110 +110 @@
     }
 
-    // Create a socket for listening.
+    /* Create a socket for listening. */
     f = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
     if (f < 0) {
@@ -118 +118 @@
     }
   
-    // If program is killed, drop the socket address reservation immediately.
+    /* If program is killed, drop the socket address reservation
+     * immediately. */
     bool = TRUE;
     status = setsockopt(f, SOL_SOCKET, SO_REUSEADDR, &bool, sizeof(bool));
@@ -179 +180 @@
     int status;
     struct sockaddr_in recvAddr;
-    int serverFds[FD_SETSIZE];
+    int serverFds[FD_SETSIZE], maxFd;
     int n;
     char displaySetting[200];
@@ -220 +221 @@
             break;
         case 'd':                       /* Debug  */
-            debugFlag = 1;
+            debugFlag = TRUE;
             break;
 
@@ -230 +231 @@
             fprintf(stderr,"Don't know what option '%c'.\n", c);
             Help(argv[0]);
-            return 1;
+            exit(1);
         }
     }
@@ -242 +243 @@
         exit(0);
     }
-
 
     if (!debugFlag) {
@@ -253 +253 @@
     /* Build the array of servers listener file descriptors. */
     FD_ZERO(&serverFds);
+    maxFd = -1;
     for (hPtr = Tcl_FirstHashEntry(&serverTable, &iter); hPtr != NULL;
          hPtr = Tcl_NextHashEntry(&iter)) {
@@ -260 +261 @@
         FD_SET(serverPtr->listenerFd, &serverFds);
         if (serverPtr->listenerFd > maxFd) {
-            maxFs = serverPtr->listenerFd;
+            maxFd = serverPtr->listenerFd;
         }
     }
@@ -333 +334 @@
         } 
     } 
-}
-
+    ERROR("select failed: ", strerror(errno));
+    exit(1);
+}
+