Changeset 179

Timestamp:

03/22/09 00:38:32 (15 years ago)

Author:

bhilburn

Message:

Moved a shell-specific function back into the shell source file.

Location:

vtcross/trunk/src

Files:

• lib/socketcomm/socketcomm.cpp (modified) (3 diffs)
• shell/cr_shell.cpp (modified) (2 diffs)

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

@@ -9 +9 @@
 
 
+#include <arpa/inet.h>
 #include <cstdlib>
 #include <cstring>
@@ -217 +218 @@
       
     /* Construct the local address structure */
-    memset(&echoServAddr, 0, sizeof(echoServerAddr));
-    echoServAddr.sin_family = AF_INET;
-    echoServAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-    echoServAddr.sin_port = htons(port);
+    memset(&echoServerAddr, 0, sizeof(echoServerAddr));
+    echoServerAddr.sin_family = AF_INET;
+    echoServerAddr.sin_addr.s_addr = htonl(INADDR_ANY);
+    echoServerAddr.sin_port = htons(port);
 
     /* Bind to the local address */
@@ -234 +235 @@
 }
 
-
-void 
-HandleTCPClient(int32_t socketFD, Utility* uList[], Parameter* pList[], \
-        Observable* oList[], CE_Info* ce_info) 
-{
-    char buffer[256];
-
-    /* Receive message from client */
-    bzero(buffer, 256);
-    ReadMessage(socketFD, buffer);
-
-    LOG("Cognitive Radio:: Message Received - %s.\n\n", buffer);
-
-    if(strcmp(buffer,"c_register") == 0) 
-            InitializeCE(socketFD, uList, pList, oList, ce_info);
-
-    if(strcmp(buffer,"p_register") == 0)
-            InitializePE(socketFD, ce_info);
-
-    if(strcmp(buffer,"optimize") == 0)
-            RunSimulator(socketFD, uList, pList, oList, ce_info);
-        
-    // TODO why aren't we doing this anymore?
-    //close(socketfd);    /* Close client socket */
-}

vtcross/trunk/src/shell/cr_shell.cpp

@@ -438 +438 @@
 
         // Act like we are updating the hardware tranmission settings
-        UpdateRadioSettings();
+        //UpdateRadioSettings();
 
         // Send back fake utility values
@@ -497 +497 @@
 
         RunSimulator(socketfd, uList, pList, oList, ce_info);
+}
+
+
+void 
+HandleTCPClient(int32_t socketFD, Utility* uList[], Parameter* pList[], \
+        Observable* oList[], CE_Info* ce_info) 
+{
+    char buffer[256];
+
+    /* Receive message from client */
+    bzero(buffer, 256);
+    ReadMessage(socketFD, buffer);
+
+    LOG("Cognitive Radio:: Message Received - %s.\n\n", buffer);
+
+    if(strcmp(buffer,"c_register") == 0) 
+            InitializeCE(socketFD, uList, pList, oList, ce_info);
+
+    if(strcmp(buffer,"p_register") == 0)
+            InitializePE(socketFD, ce_info);
+
+    if(strcmp(buffer,"optimize") == 0)
+            RunSimulator(socketFD, uList, pList, oList, ce_info);
+        
+    // TODO why aren't we doing this anymore?
+    //close(socketfd);    /* Close client socket */
 }