Changeset 216 for vtcross/trunk/src/lib

Timestamp:

03/26/09 13:40:19 (15 years ago)

Author:

bhilburn

Message:

Applying style/semantic fixes to socketcomm.cpp. Removed
unimplemented/unused function decleration from socketcomm.h.

Files:

• vtcross/trunk/src/lib/socketcomm/socketcomm.cpp (modified) (2 diffs)

vtcross/trunk/src/lib/socketcomm/socketcomm.cpp

@@ -210 +210 @@
     int32_t clientSocket = accept(serverSock, NULL, NULL);
     if(clientSocket < 0) { 
-        //ERROR(1, "Could not establish connection with client socket.\n");
+        LOG("ALERT: Could not establish connection with client socket.\n");
         return -1;
     }
@@ -249 +249 @@
 InitializeTCPServerPort(int32_t servSock)
 {
-
     int32_t rc, on = 1;
 
     rc = setsockopt(servSock, SOL_SOCKET, SO_REUSEADDR, (char*)&on, sizeof(on));
-    if(rc < 0)
-    {
+    if(rc < 0) {
+        shutdown(servSock, 2);
+        close(servSock);
         ERROR(1,"setsockopt() failed\n");
+    }
+
+    rc = ioctl(servSock, FIONBIO, (char*)&on);
+    if(rc < 0) {
+        shutdown(servSock, 2);
         close(servSock);
-        return -1;
-    }
-
-    rc = ioctl(servSock, FIONBIO, (char*)&on);
-    if(rc < 0)
-    {
         ERROR(1,"ioctl() failed\n");
-        close(servSock);
-        return -1;
     }