Changeset 186

Timestamp:

03/22/09 23:35:05 (15 years ago)

Author:

bhilburn

Message:

Made the remotecomponent struct public since information hiding doesn't
make any sense here, removed unneeded info from it, worked on a couple
of policy engine functions to be smart about start-up connections.

Location:

vtcross/trunk/src

Files:

• include/vtcross/components.h (modified) (4 diffs)
• include/vtcross/containers.h (modified) (1 diff)
• lib/socketcomm/socketcomm.cpp (modified) (3 diffs)
• policy_engines/PolicyEngine.cpp (modified) (4 diffs)
• policy_engines/policy_demo.cpp (modified) (1 diff)

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

@@ -78 +78 @@
         virtual void RegisterServices(int32_t socketFD) = 0;
         virtual void DeregisterServices(int32_t socketFD) = 0;
+
+
+        /* 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;
 };
 
@@ -144 +152 @@
 
 
-        /* Overloaded constructor that creates a policy engine object with SML
-         * information pre-defined.
-         */
-        PolicyEngine(const char* serverName, const char* portNumber);
+        /* Overloaded constructor that creates a policy engine object and
+         * connects it to either the shell or an SML, depening on the SML bool.
+         */
+        PolicyEngine(const char* serverName, const char* portNumber, \
+                const bool SML);
 
         void GetRemoteComponentType(int32_t socketFD);
@@ -177 +186 @@
         void ValidateParameters(struct Parameter pList[], \
                 struct CE_Info *ce_info, int decision_array[]);
-
-
-        /* 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;
 };
 
@@ -244 +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/include/vtcross/containers.h

@@ -86 +86 @@
  */
 struct RemoteComponent {
-    struct hostent *server;
     std::string serverName;
     int32_t serverPort;

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

@@ -78 +78 @@
 
 /* TODO see notes in socketcomm.h. This function, and the RemoteComponent
- * struct, need a code review.
+ * struct, need a code review to make sure it is ready to be used rather
+ * than ClientSocket()
  */
 void
@@ -90 +91 @@
         ERROR(1, "No server found by that hostname.");
         
-    memcpy(serverInfo, server, sizeof(struct hostent));
-
     serverInfo->socketFD = socket(AF_INET, SOCK_STREAM, 0);
     if(serverInfo->socketFD < 0) 
@@ -232 +231 @@
     int32_t clientSocket = accept(serverSock, NULL, NULL);
     if(clientSocket < 0)
-        ERROR(1, "Could establish connection with client socket.\n");
+        ERROR(1, "Could not establish connection with client socket.\n");
    
     LOG("Handling client %s\n", inet_ntoa(echoClientAddr.sin_addr));

vtcross/trunk/src/policy_engines/PolicyEngine.cpp

@@ -36 +36 @@
 
 
-PolicyEngine::PolicyEngine(const char* serverName, const char* portNumber)
+PolicyEngine::PolicyEngine(const char* serverName, const char* portNumber, \
+        const bool SML)
 {
     LOG("Creating Policy Engine.\n");
 
-    SML_present = true;
+    SML_present = SML;
     control = new RemoteComponent;
     control->serverName = std::string(serverName);
@@ -46 +47 @@
 
     control->socketFD = ClientSocket(serverName, portNumber);
-    RegisterServices(control->socketFD);
 
-    LOG("Policy Engine connected to SML at %s.\n", serverName);
+    if(SML_present) {
+        RegisterServices(control->socketFD);
+        LOG("Policy Engine connected to SML at %s.\n", serverName);
+    }
+    else {
+        RegisterComponent(control->socketFD);
+        LOG("Policy Engine connected to shell at %s.\n", serverName);
+    }
 
     LoadPolicies();
@@ -85 +92 @@
     if(SML_present)
         DeregisterServices(control->socketFD);
-    // TODO otherwise, deregister from shell
+    else
+        DeregisterComponent(control->socketFD);
 }
 
@@ -92 +100 @@
 PolicyEngine::Reset()
 {
+    LOG("Resetting Policy Engine.\n");
+    SML_present = false;
+    control = new RemoteComponent;
+    LoadPolicies();
 }
 

vtcross/trunk/src/policy_engines/policy_demo.cpp

@@ -31 +31 @@
        ERROR(1, "Usage: %s hostname port\n", argv[0]);
     
-    LOG("Opening the client socket.\n");
-    int32_t socketFD = ClientSocket(argv[1], argv[2]);
-
-    PolicyEngine policyEngine;
-    policyEngine.RegisterComponent(socketFD);
+    PolicyEngine policyEngine(argv[1], argv[2], false);
 
     LOG("Waiting for signal...\n");
     while(1) {
-        policyEngine.WaitForSignal(socketFD);
+        policyEngine.WaitForSignal(policyEngine.control->socketFD);
     }