Changeset 216

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.

Location:

vtcross/trunk/src

Files:

• include/vtcross/socketcomm.h (modified) (4 diffs)
• lib/socketcomm/socketcomm.cpp (modified) (2 diffs)

vtcross/trunk/src/include/vtcross/socketcomm.h

@@ -20 +20 @@
 void ReadMessage(int32_t socketFD, char* msgBuffer);
 
-
 /* TODO
  */
 //int32_t SendMessage(int32_t socketFD, char* message);
 int32_t SendMessage(int32_t socketFD, const char* message) ;
-
 
 /* TODO
@@ -32 +30 @@
         struct Radio_Info *radio_info);
 
-
 /* TODO
  */
 int32_t GetRequest(int32_t socketFD, struct Parameter pList[], \
         struct Radio_Info *radio_info);
-
 
 /* This is the original function that does what the above function is supposed
@@ -44 +40 @@
 int32_t ClientSocket(const char* serverName, const char* portNumber);
 
-
 /* TODO
  */
 int32_t  AcceptTCPConnection(int32_t servSock);
-
 
 /* TODO
@@ -54 +48 @@
 int32_t CreateTCPServerSocket(uint16_t port);
 
-
 /* TODO
  */
-void HandleTCPClient(int32_t socketfd, Utility* uList[], Parameter* pList[], \
-        Observable* oList[], Radio_Info* radio_info);
-
 int32_t InitializeTCPServerPort(int32_t servSock);
 

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;
     }