Changeset 389 for vtcross/trunk/src/shell/CognitiveRadioShell.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/shell/CognitiveRadioShell.cpp (modified) (8 diffs)

vtcross/trunk/src/shell/CognitiveRadioShell.cpp

@@ -642 +642 @@
 
 
-void
+int
 CognitiveRadioShell::HandleMessage(int32_t socketFD)
 {
     char buffer[256];
-    //printf("here\n");
-    ReadMessage(socketFD, buffer);
+    int ret = 0;
+    
+    ret = ReadMessage(socketFD, buffer);
+    if(ret == -1) {
+        return ret;
+    }
 
     // TODO trying to read this code lock makes my eyes bleed
@@ -685 +689 @@
         //GetOptimalParametersService(socketFD);  
     }
+
+    return ret;
 }
 
@@ -699 +705 @@
     int32_t desc_ready = 1;
     int32_t timeout = 10;
+    int32_t ret = 0;;
     fd_set sockSet;
+   
+
 
     int32_t *servSock = new int32_t[3];
@@ -726 +735 @@
         ERROR(1,"Error initializing command port\n");
 
+    FD_ZERO(&sockSet);
+    
     while (running) {
         /* Zero socket descriptor vector and set for server sockets */
         /* This must be reset every time select() is called */
-        //FD_ZERO(&sockSet);
         FD_SET(servSock[primary], &sockSet);
         FD_SET(servSock[policy], &sockSet);
@@ -740 +750 @@
 
         /* Suspend program until descriptor is ready or timeout */
-        //printf("Waiting for signal...\n");
-        rc = select(maxDescriptor + 1, &sockSet, NULL, NULL, NULL); 
+        rc = select(maxDescriptor + 1, &sockSet, NULL, NULL, &selTimeout); 
         if(rc == 0)
             LOG("No echo requests for %i secs...Server still alive\n", timeout);
@@ -754 +763 @@
                         do {
                             new_sd = AcceptTCPConnection(port);
-                            if(new_sd < 0) 
+                            if(new_sd < 0) {
                                 break;
+                            }
                            
                             if(port == servSock[primary])
@@ -764 +774 @@
                                 policySocketFD = new_sd;
 
-                            HandleMessage(new_sd);
-                            FD_SET(new_sd,&sockSet);
+                            ret = HandleMessage(new_sd);
+
+                            if(ret == -1) {
+                                FD_CLR(new_sd,&sockSet);
+                                close(new_sd);
+                            }
+
+                            FD_SET(new_sd,&sockSet);
                             if(new_sd > maxDescriptor) 
                                 maxDescriptor = new_sd;
-                            //LOG("New incoming connection - %i\n\n",new_sd);
                         } while(new_sd != -1);
-                    } 
+                    } 
                     else {
-                        //LOG("Request on already open descriptor.\n\n");
-                        HandleMessage(port);
+                        ret = HandleMessage(port);
+                        if(ret == -1) {
+                            FD_CLR(port,&sockSet);
+                            close(port);
+                        }
                     }
                 }
@@ -780 +798 @@
     }
 
-
+    LOG("Closing it all.\n\n");
     /* Close sockets */
     close(servSock[primary]);