Changeset 224 for Evidence/Bridge.cc

Timestamp:

06/17/10 09:00:51 (14 years ago)

Author:

ogrimm

Message:

Message severity encoded now using standard DIM structure, other updates

File:

• Evidence/Bridge.cc (modified) (10 diffs)

Evidence/Bridge.cc

@@ -7 +7 @@
   thus serialized by DIM and no Mutex is necessary.
 
-  Oliver Grimm, May 2010
+  Remote procedure calls are bridged through their underlying services
+  and commands.
+  
+  Oliver Grimm, June 2010
 
 \********************************************************************/
@@ -21 +24 @@
 using namespace std;
 
+
 // Class declaration
 class Bridge: public DimClient, public EvidenceServer {
 
         struct Item {
+          string Name;
+          DimCommand *Command;
           DimStampedInfo *DataItem;
           DimService *Service;
@@ -34 +40 @@
         
     void infoHandler();
-        void AddService(string, const char *);
+    void commandHandler();
+        void AddService(string, char *, int);
         void RemoveService(string);
    
@@ -42 +49 @@
 }; 
 
-//
 // Constructor
-//
 Bridge::Bridge(char *Name, int Port): EvidenceServer(SERVER_NAME) {
 
@@ -54 +59 @@
 }
 
-//
+
 // Destructor: Delete all subscriptions and services
-//
 Bridge::~Bridge() {
 
-  while (List.size() != 0) RemoveService(List[0].DataItem->getName());  
+  while (List.size() != 0) RemoveService(List[0].Name);  
   delete ServerList;
 }
 
-//
+
 // Service subscription and repeating
-//
 void Bridge::infoHandler() {
 
@@ -80 +83 @@
                 RemoveService(string(Token)+"/SERVICE_LIST");
           }
-          else AddService(string(Token)+"/SERVICE_LIST", "C");
+          else AddService(string(Token)+"/SERVICE_LIST", (char *) "C", DimSERVICE);
 
           // Skip server IP address and process ID
@@ -91 +94 @@
   // If service is SERVICE_LIST, scan and subscribe/unsubscribe to services
   if (strstr(I->getName(), "/SERVICE_LIST") != NULL) {
-        char *Type, *Name = strtok(I->getString(), "+-!|");
+        char *Format, *Name = strtok(I->getString(), "+-!|");
         while (Name != NULL) {
-          // Only consider DIM services (not commands and RPCs)
-      if (((Type = strtok(NULL, "\n")) != NULL) &&
-                  (strstr(Type, "|CMD") == NULL) && (strstr(Type, "|RPC") == NULL)) {
-            if (*I->getString() == '-' || *I->getString() == '!') RemoveService(Name);
+      if ((Format = strtok(NULL, "\n")) != NULL) {
+            // Check if service added or removed/unavailable
+            if (*I->getString() == '-' || *I->getString() == '!') {
+                  if (strstr(Format, "|RPC") != NULL) {
+                        RemoveService(string(Name)+"/RpcIn");
+                        RemoveService(string(Name)+"/RpcOut");
+                  }
+                  else RemoveService(Name);
+                }
                 else {
-                  Type[strlen(Type)-1] = '\0'; // Isolate service format
-                  AddService(Name, Type);
+                  // Determine type of service
+                  if (strstr(Format, "|CMD") != NULL) {
+                        *(strstr(Format, "|CMD")) = '\0';
+                        AddService(Name, Format, DimCOMMAND);
+                  }
+                  else if (strstr(Format, "|RPC") != NULL) {
+                        *(strstr(Format, "|RPC")) = '\0';
+                    if (strchr(Format, ',') != NULL) {
+                          *strchr(Format, ',') = '\0';
+                          AddService(string(Name)+"/RpcIn", Format, DimCOMMAND);
+                          AddService(string(Name)+"/RpcOut", Format+strlen(Format)+1, DimSERVICE);
+                        }
+                        
+                  }
+                  else {
+                        Format[strlen(Format)-1] = '\0';
+                        AddService(Name, Format, DimSERVICE);
+                  }
                 }
           }
@@ -110 +134 @@
   for (int Service=0; Service<List.size(); Service++) if (I == List[Service].DataItem) {
 
-        // Ignores repeating DIS_DNS services
-        if (List[Service].Service == NULL) break;
-
     // Copy service data
     delete[] List[Service].Data;
@@ -125 +146 @@
 }
 
-//
-// Add service subscription
-//
-void Bridge::AddService(string Name, const char *Format) {
+
+// Command repeating
+void Bridge::commandHandler() {
+ 
+  sendCommandNB(getCommand()->getName(), getCommand()->getData(), getCommand()->getSize());
+}
+
+
+// Service subscription
+void Bridge::AddService(string Name, char *Format, int Type) {
+
+  // Do not forward  DIS_DNS and History services
+  if ((Name.find("DIS_DNS/") != string::npos) || (Name.find("History/") != string::npos)) return;
 
   // Check if already subscribed to this service
   for (int i=0; i<List.size(); i++) {
-        if (Name == List[i].DataItem->getName()) return;
-  }
-
-  // Create subscription and new service to secondary DNS (do not forward DIS_DNS services)
-  struct Item New;
-  
-  New.Data = NULL;
-  if (Name.find("DIS_DNS/") != string::npos) New.Service = NULL;
-  else New.Service = new DimService(Name.c_str(), (char *) Format, New.Data, 0);
-  New.DataItem = new DimStampedInfo(Name.c_str(), NO_LINK, this);
+        if (Name == List[i].Name) return;
+  }
+
+  // Create subscription and service to secondary DNS or new command
+  struct Item New = {Name, NULL, NULL, NULL, NULL};
+
+  if  (Type == DimSERVICE) {  
+        New.Service = new DimService(Name.c_str(), (char *) Format, New.Data, 0);
+        New.DataItem = new DimStampedInfo(Name.c_str(), NO_LINK, this);
+  }
+  else if (Type == DimCOMMAND) New.Command = new DimCommand(Name.c_str(), Format, this);
+
   List.push_back(New);
 }
 
 
-//
-// Remove service from watch list
-//
+// Remove service from watch list (unused pointer are NULL)
 void Bridge::RemoveService(string Name) {
 
-  // Find service index
   vector<struct Item>::iterator E;
-  for (E=List.begin(); E<List.end(); ++E) if (Name == (*E).DataItem->getName()) {
+  for (E=List.begin(); E<List.end(); ++E) if (Name == (*E).Name) {
         delete (*E).DataItem;
         delete (*E).Service;
         delete[] (*E).Data;
+        delete (*E).Command;
+
         List.erase(E);
   }
@@ -162 +193 @@
 
 
-//          
 // Main program
-//
 int main(int argc, char *argv[]) {
 
+  // Check command line argument
   if (argc == 1) {
         printf("Usage: %s <address of primary DNS> [port] (default port %d)\n", argv[0], DEFAULT_PORT);