Changeset 207

Timestamp:

03/26/09 10:40:14 (15 years ago)

Author:

jgaeddert

Message:

Added CognitiveRadioShell? class and Shell demo.

Location:

vtcross/trunk/src

Files:

• include/vtcross/components.h (modified) (1 diff)
• include/vtcross/socketcomm.h (modified) (1 diff)
• lib/socketcomm/socketcomm.cpp (modified) (5 diffs)
• shell/CognitiveRadioShell.cpp (added)
• shell/Makefile.am (modified) (1 diff)
• shell/cr_shell.cpp (deleted)
• shell/shell_demo.cpp (added)

vtcross/trunk/src/include/vtcross/components.h

@@ -295 +295 @@
 };
 
+/* Cognitive Radio Shell class declaration. 
+ */
+class CognitiveRadioShell 
+{
+    public:
+        CognitiveRadioShell();
+        ~CognitiveRadioShell();
+
+
+        /* Overloaded constructor that creates a CR Shell object */ 
+        CognitiveRadioShell(const char* radioConfig, int16_t primaryPort, \
+            int16_t policyPort, int16_t commandPort);
+
+        void SendComponentType(int32_t socketFD);
+        void Shutdown();
+        void Reset();
+        
+        /* Start all the socket servers */
+        void StartShellServer();
+        int32_t LoadRadioConfiguration(const char* radioConfig, Parameter* &pList, \
+            Utility* &uList, Observable* &oList, Radio_Info* radioInfo);
+    private:
+        /* Parse and load/reload policies into the policy engine.
+         */
+        void LoadPolicies();
+        void ReloadPolicies();
+
+        /* Register and Deregister the different components */
+        void RegisterCognitiveEngine(int32_t socketFD);
+        void DeregisterCognitiveEngine(int32_t socketFD);
+        void RegisterPolicyEngine(int32_t socketFD);
+        void DeregisterPolicyEngine(int32_t socketFD);
+        void RegisterSML(int32_t socketFD);
+        void DeregisterSML(int32_t socketFD);
+
+        /* Handle a message that is received from a component */
+        void HandleMessage(int32_t socketFD);
+       
+        /* Send optimization request to primary port FD*/
+        void GetOptimalParameters(int32_t socketFD);
+
+        void SendRadioConfiguration(int32_t socketFD);
+        void SendRadioExperience(int32_t socketFD);
+ 
+        bool SML_present;
+        bool PE_present;
+        bool CE_present;
+       
+        int32_t numberOfCognitiveEngines; 
+        int16_t primaryPort;
+        int16_t policyPort;
+        int16_t commandPort;
+
+        Utility * u;
+        Parameter * p;
+        Observable * o;
+        struct Radio_Info * radio_info;
+};
+
 #endif

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

@@ -60 +60 @@
         Observable* oList[], Radio_Info* radio_info);
 
+int32_t InitializeTCPServerPort(int32_t servSock);
+
 #endif

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

@@ -12 +12 @@
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
+#include <fcntl.h>
+#include <sys/ioctl.h>
 #include <netdb.h>
 #include <netinet/in.h>
@@ -34 +37 @@
 ReadMessage(int32_t socketFD, char* msgBuffer)
 {
+
+    // Peek at the buffer to get real message length.
+    // Messages are termination with a "\0" to denote EOM.
     ssize_t msgLength = recv(socketFD, msgBuffer, 256, MSG_PEEK);
 
@@ -42 +48 @@
     }
 
+    // Read the message into msgBuffer
     msgLength = recv(socketFD, msgBuffer, i + 1, 0);
     if (msgLength < 0)
@@ -202 +209 @@
 
     int32_t clientSocket = accept(serverSock, NULL, NULL);
-    if(clientSocket < 0)
-        ERROR(1, "Could not establish connection with client socket.\n");
-   
-    LOG("Handling client %s\n", inet_ntoa(echoClientAddr.sin_addr));
+    if(clientSocket < 0) { 
+        //ERROR(1, "Could not establish connection with client socket.\n");
+        return -1;
+    }
+    //LOG("Handling client %s\n", inet_ntoa(echoClientAddr.sin_addr));
 
     return clientSocket;
@@ -238 +246 @@
 }
 
+int32_t
+InitializeTCPServerPort(int32_t servSock)
+{
+
+    int32_t rc, on = 1;
+
+    rc = setsockopt(servSock, SOL_SOCKET, SO_REUSEADDR, (char*)&on, sizeof(on));
+    if(rc < 0)
+    {
+        ERROR(1,"setsockopt() failed\n");
+        close(servSock);
+        return -1;
+    }
+
+    rc = ioctl(servSock, FIONBIO, (char*)&on);
+    if(rc < 0)
+    {
+        ERROR(1,"ioctl() failed\n");
+        close(servSock);
+        return -1;
+    }
+
+    return 1;
+}

vtcross/trunk/src/shell/Makefile.am

@@ -5 +5 @@
 bin_PROGRAMS = shell_demo
 
-shell_demo_SOURCES = cr_shell.cpp
+shell_demo_SOURCES = CognitiveRadioShell.cpp shell_demo.cpp
 shell_demo_LDADD = ../lib/tinyxml/libtinyxml.a ../lib/socketcomm/libsocketcomm.a