Changeset 389 for vtcross/trunk/src/lib/socketcomm/socketcomm.cpp

Timestamp:

07/28/09 23:23:14 (15 years ago)

Author:

trnewman

Message:

Added DSA CBR reference implementation.
Added simple python example application for DSA CBR.
Added GNUradio python application that uses CROSS and the DSA CBR.

Fixed several bugs in the socket interface.

Files:

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

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

@@ -34 +34 @@
 // TODO also, it appears that this function can, at maximum, receive 256 bytes
 // without causing a buffer overflow. can someone confirm/deny?
-void
+int32_t
 ReadMessage(int32_t socketFD, char* msgBuffer)
 {
@@ -41 +41 @@
     // Messages are termination with a "\0" to denote EOM.
     ssize_t msgLength = recv(socketFD, msgBuffer, 256, MSG_PEEK);
-    if(msgLength < 0)
-        ERROR(1, "Error reading from socket.\n");
-    if(msgLength == 0)
-        ERROR(1, "Remote component closed connection. 1\n");
-
+    if(msgLength <= 0) {
+        //ERROR(1, "Remote component closed connection. 1\n");
+        //LOG("Client closed connection.\n");
+        return -1;
+    }
     size_t i;
     for(i = 0; i < 256; i++) {
@@ -54 +54 @@
     // Read the message into msgBuffer
     msgLength = recv(socketFD, msgBuffer, i + 1, 0);
-    if(msgLength < 0)
-        ERROR(1, "Error reading from socket.\n");
-    if(msgLength == 0)
-        ERROR(1, "Remote component closed connection. 2\n");
+    if(msgLength <= 0) {
+        //ERROR(1, "Remote component closed connection. 1\n");
+        //LOG("Client closed connection.\n");
+        return -1;
+    }
+
+    return 1;
 }
 
@@ -93 +96 @@
 
     
-/* TODO I'm fairly certain this function is unnecessary, see function below for more details...
-int32_t
-SendMessage(int32_t socketFD, char* message) 
-{
-     
-    // TODO explain this. What, exactly, does the below line do and how does it
-    // affect the rest of the function?
-    strcat(message, "\0000");
-
-    ssize_t numSentBytes = send(socketFD, message, (strlen(message) + 1), 0);
-    if(numSentBytes < 0) {
-        ERROR(1, "Error sending to server.");
-    }
-    else if(numSentBytes == 0) {
-        LOG("socket_comm::SendMessage - Server closed the socket.\n");
-    }
-   
-    return numSentBytes;
-}
-*/
-
 // TODO this function is here to handle calls to send const char* messages. Note
 // that the std::string.c_str() function auto-appends a null character at the
@@ -217 +199 @@
     if(clientSocket < 0) { 
         //WARNING("ALERT: Could not establish connection with client socket.\n");
-        return -1;
+        return clientSocket;
     }
     //LOG("Handling client %s\n", inet_ntoa(echoClientAddr.sin_addr));