Changeset 185

Timestamp:

03/22/09 15:00:49 (15 years ago)

Author:

bhilburn

Message:

PolicyEngine? code now compiling with new RemoteComponent? struct changes. Still
using old ClientSocket? function.

Location:

vtcross/trunk/src

Files:

• include/vtcross/components.h (modified) (1 diff)
• policy_engines/PolicyEngine.cpp (modified) (4 diffs)

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

@@ -245 +245 @@
         struct SML_Info *SML;
 
+
+        /* The RemoteComponent struct represents either the VTCROSS shell or the
+         * VTCROSS SML.  If 'SML_present' is false, it is the former. Otherwise,
+         * it is the latter.
+         */
+        bool SML_present;
+        struct RemoteComponent *control;
+
 };
 

vtcross/trunk/src/policy_engines/PolicyEngine.cpp

@@ -24 +24 @@
 {
     LOG("Creating Policy Engine.\n");
-    SML = NULL;
+    SML_present = false;
+    control = new RemoteComponent;
     LoadPolicies();
 }
@@ -31 +32 @@
 PolicyEngine::~PolicyEngine()
 {
-    if(SML)
-        delete SML;
+    delete control;
 }
 
@@ -40 +40 @@
     LOG("Creating Policy Engine.\n");
 
-    SML = new SML_Info;
-    SML->hostname = std::string(serverName);
-    SML->port = std::string(portNumber);
+    SML_present = true;
+    control = new RemoteComponent;
+    control->serverName = std::string(serverName);
+    control->serverPort = atoi(portNumber);
 
-    SML->socketFD = ClientSocket(serverName, portNumber);
-    RegisterServices(SML->socketFD);
+    control->socketFD = ClientSocket(serverName, portNumber);
+    RegisterServices(control->socketFD);
 
     LOG("Policy Engine connected to SML at %s.\n", serverName);
@@ -82 +83 @@
 PolicyEngine::Shutdown()
 {
-    if(SML)
-        DeregisterServices(SML->socketFD);
+    if(SML_present)
+        DeregisterServices(control->socketFD);
     // TODO otherwise, deregister from shell
 }