Changeset 250

Timestamp:

05/13/09 17:06:09 (15 years ago)

Author:

wrodgers

Message:

Fixed SML compile errors

Files:

• vtcross/branches/wrodgers/ServiceManagementLayer.cpp (modified) (10 diffs)

vtcross/branches/wrodgers/ServiceManagementLayer.cpp

@@ -7 +7 @@
 /* DESCRIPTION OF FILE.
  */
-test
 
 #include <cstdlib>
@@ -38 +37 @@
 #include <sys/wait.h>
 
-#include "tinyxml/tinyxml.h"
-#include "tinyxml/tinystr.h"
-
-#include <sqlite3.h>
-#include <sqlite3ext.h>
-
-uint32_t Current_ID = 0;
-uint32_t numCogEnginesPresent = 0;
-bool cogEnginePresent = false;
+#include "../../trunk/src/include/tinyxml/tinyxml.h"
+#include "../../trunk/src/include/tinyxml/tinystr.h"
+
+
 
 
@@ -53 +47 @@
     LOG("Creating Service Management Layer.\n");
     shellSocketFD = -1;
+    numberOfCognitiveEngines = 0;
+    CE_Present = false;
+    cogEngSrv = 1;
+
+    Current_ID = 0;
     LoadConfiguration();
-    numberOfCognitiveEngines = 0;
 }
 
@@ -150 +148 @@
 }
 
-void
-ServiceManagementLayer::RegisterCognitiveEngine(int32_t ID)
-{
-    LOG("Cognitive Radio Shell:: Received registration message from Cognitive Engine.\n");
-   
-    TransferRadioConfiguration(ID);
-    TransferExperience(ID);
-
-    numberOfCognitiveEngines++;
-    CE_present = true;
-}
-
-
-void 
-ServiceManagementLayer::DeregisterCognitiveEngine(int32_t socketFD)
-{
-    LOG("Cognitive Radio Shell:: Received deregistration message from Cognitive Engine.\n");
-
-    numberOfCognitiveEngines--;
-    if(numberOfCognitiveEngines == 0)
-        CE_present = false;
-
-    SendMessage(socketFD, "deregister_ack");
-    shutdown(socketFD, 2);
-    close(socketFD);
-    LOG("Cognitive Radio Shell:: Socket closed.\n");
-}
 
 
@@ -261 +232 @@
 ServiceManagementLayer::RegisterCognitiveEngine(int32_t socketFD)
 {
-    SendMessage(commandSocketFD, "register_engine_cognitive");
+    SendMessage(shellSocketFD, "register_engine_cognitive");
     LOG("Cognitive Engine:: Registration message sent to shell.\n");
 
@@ -268 +239 @@
 
     numberOfCognitiveEngines++;
-    CE_present = true;
+    CE_Present = true;
 }
 
@@ -279 +250 @@
     numberOfCognitiveEngines--;
     if(numberOfCognitiveEngines == 0)
-        CE_present = false;
+        CE_Present = false;
 
     SendMessage(socketFD, "deregister_ack");
@@ -295 +266 @@
     int32_t desc_ready = 1;
     int32_t timeout = 10;
-    fd_set sockSet[1];
+    fd_set sockSet;
 
     cogEngSrv = CreateTCPServerSocket(CEPort);
     int32_t maxDescriptor = cogEngSrv;
 
-    if(InitianumberOfCognitiveEngineslizeTCPServerPort(cogEngSrv) == -1)
+    if(InitializeTCPServerPort(cogEngSrv) == -1)
         ERROR(1,"Error initializing primary port\n");
 
@@ -325 +296 @@
             char buffer[256];
             memset(buffer, 0, 256);
-            sockaddr_in sock_addr = new sockaddr_in;
+            struct sockaddr_in sock_addr;
+            memset((void *) &sock_addr, 0, sizeof(sock_addr));
             //Peak at the next message on the socket to determine its address of orgin
-            recvfrom(cogEngSrv, buffer, 256, MSG_PEAK, (struct sockaddr*) &sock_addr, NULL);
+            recvfrom(cogEngSrv, buffer, 256, MSG_PEEK, (struct sockaddr*) &sock_addr, NULL);
             bool found = false;
             //Is it from a previously logged address?
             for(int i = 0; i < Current_ID; i++){
-                if(CE_List[i].(*sock_ptr).sin_addr.s_addr == sock_addr.sin_addr.s_addr){
+                if((*CE_List[i].sock_ptr).sin_addr.s_addr == sock_addr.sin_addr.s_addr){
                         //If so, pass the ID number of that component into the signal handler to process the message
+                        found=true;
                         CESignalHandler(i);
-                        found=true;
                 }
             }
@@ -342 +314 @@
                 CE_List[Current_ID].ID_num = Current_ID;
                 CESignalHandler(Current_ID);
-                CurrentID++;
+                Current_ID++;
             }
         }