Changeset 1773

Timestamp:

08/28/08 12:34:20 (3 months ago)

Author:

xkovah

Message:

sending back all event lists at once now. But I just noticed that if I make 2 reg events and then ask for 1 in one query and then ask for 1 in a second query, the second query has junk data. I think it's probably cause I didn't yet make the elements which go into the lists be soap-allocated…so I will try that and see what happens

Files:

• capture-mod/trunk/CaptureSoapServer.cpp (modified) (9 diffs)
• capture-mod/trunk/CaptureSoapServer.h (modified) (2 diffs)
• capture-mod/trunk/install/CaptureBAT.exe (modified) (previous)

capture-mod/trunk/CaptureSoapServer.cpp

@@ -86 +86 @@
-
-    //now begins the arduous process of converting the values into char *s
+    //TODO: use a soap function to make r
-    ns__regEvent_t r;
-
-
+
-    sprintf(r.time, "%ls", time.c_str());
-
-
-
+
+
-    sprintf(r.eventType, "%ls", registryEventType.c_str());
-
-malloc(
+soap_malloc(&soap,
-    sprintf(tmp, "%ls", extra.at(0).c_str());
-    r.procPID = atoi(tmp);
-    printf("r.procPID = %d\n", r.procPID);
-    free(tmp);
-
-malloc(
+soap_malloc(&soap,
-    sprintf(r.procName, "%ls", processPath.c_str());
-
-malloc(
+soap_malloc(&soap,
-    sprintf(r.keyName, "%ls", registryEventPath.c_str());
-
-malloc(
+soap_malloc(&soap,
-    sprintf(r.valueName, "%ls", extra.at(1).c_str());
-
-malloc(
+soap_malloc(&soap,
-    sprintf(r.valueType, "%ls", extra.at(2).c_str());
-
-malloc(
+soap_malloc(&soap,
-    sprintf(r.valueData, "%ls", extra.at(3).c_str());
-
@@ -127 +125 @@
-{
-    printf("CaptureSoapServer::onFileEvent got an event for time = %ls\n", time.c_str());
+    ns__fileEvent_t f;
+    f.time = (char *)soap_malloc(&soap,time.length()+1);
+    sprintf(f.time, "%ls", time.c_str());
+
+    f.eventType = (char *)soap_malloc(&soap,fileEventType.length()+1);
+    sprintf(f.eventType, "%ls", fileEventType.c_str());
+
+    char * tmp = (char *)malloc(extra.at(0).length()+1);
+    sprintf(tmp, "%ls", extra.at(0).c_str());
+    f.procPID = atoi(tmp);
+    free(tmp);
+
+    f.procName = (char *)soap_malloc(&soap,processPath.length()+1);
+    sprintf(f.procName, "%ls", processPath.c_str());
+
+    f.fileName = (char *)soap_malloc(&soap,fileEventPath.length()+1);
+    sprintf(f.fileName, "%ls", fileEventPath.c_str());
+
+    fileList.push_back(f);
+    printf("added one event to fileList. Now there are %d elements in the list\n", fileList.size());
+
+
-}
-
@@ -134 +154 @@
-{
-    printf("CaptureSoapServer::onProcessEvent got an event for time = %ls\n", time.c_str());
+    ns__procEvent_t p;
+    p.time = (char *)soap_malloc(&soap,time.length()+1);
+    sprintf(p.time, "%ls", time.c_str());
+
+    p.eventType = (char *)soap_malloc(&soap,11); //11 == max length == "terminated"
+    if(created){
+        sprintf(p.eventType, "created");
+    }
+    else{
+        sprintf(p.eventType, "terminated");
+    }
+
+    p.parentPID = parentProcessId;
+
+    p.parentName = (char *)soap_malloc(&soap,parentProcess.length()+1);
+    sprintf(p.parentName, "%ls", parentProcess.c_str());
+
+    p.procPID = processId;
+
+    p.procName = (char *)soap_malloc(&soap,process.length()+1);
+    sprintf(p.procName, "%ls", process.c_str());
+
+    procList.push_back(p);
+    printf("added one event to procList. Now there are %d elements in the list\n", procList.size());
+
-}
-
@@ -332 +377 @@
-
-//If maxEventsReturned == -1, then then send as many as possible.
-//TODO: Make SOAP::Lite understand unsigned int type, so that this (and other) ints can be set as such
-int ns__returnEvents(struct soap *soap, int maxEventsToReturn, struct ns__allEvents &result){
+    char debug = 0;
+
-    struct ns__allEvents * all = soap_new_ns__allEvents(soap, 1);
-    all->regEvents = NULL;
@@ -350 +396 @@
-        all->regEvents = dRegArray;
-
-        printf("dRegArray->__size = %d, maxEventsToReturn = %d\n", dRegArray->__size, maxEventsToReturn);
-
-        //Figure out how many entries we will send back
-
-
-
-
+
-            dRegArray->__size = maxEventsToReturn;
-        }
-
-        printf("Sending back %d registy events\n",dRegArray->__size);
-
-
+
+
-        struct ns__regEvent * ns__regEventArray = (struct ns__regEvent *)soap_malloc(soap, dRegArray->__size*sizeof(struct ns__regEvent));
-
-        dRegArray->__ptr = ns__regEventArray;
-
-        int * b = (int *) ns__regEventArray;
-        for(unsigned int i = 0; i < dRegArray->__size; i++){
+            memcpy(&ns__regEventArray[i],&regList.front(), sizeof(struct ns__regEvent));
+            regList.pop_front();
+            if(debug){
-            printf("i = %d\n", i);
-            printf("regList.front().time %s, %#x\n", regList.front().time, regList.front().time);
@@ -374 +416 @@
-            printf("regList.front().procPID %d, %#x\n", regList.front().procPID, regList.front().procPID);
-            printf("regList.front().procName %s, %#x\n", regList.front().procName, regList.front().procName);
-
-
-
-
+
-        }
-    }
@@ -392 +431 @@
-
-        //Figure out how many entries we will send back
-
-
-
-
+
-            dFileArray->__size = maxEventsToReturn;
-        }
-
-        printf("Sending back %d file events\n",dFileArray->__size);
+
-        struct ns__fileEvent * ns__fileEventArray = (struct ns__fileEvent *)soap_malloc(soap, dFileArray->__size*sizeof(struct ns__fileEvent));
-
-        dFileArray->__ptr = ns__fileEventArray;
-
-        for(unsigned int i = 0; i < dFileArray->__size; i++){
-            memcpy(&ns__fileEventArray[i],&fileList.front(), sizeof(struct ns__fileEvent));
-reg
+file
-        }
-    }
@@ -420 +455 @@
-        all->procEvents = dProcArray;
-
-
-
-
-
+
-            dProcArray->__size = maxEventsToReturn;
-        }
-
-        printf("Sending back %d process events\n",dProcArray->__size);
-
@@ -434 +465 @@
-        for(unsigned int i = 0; i < dProcArray->__size; i++){
-            memcpy(&ns__procEventArray[i],&procList.front(), sizeof(struct ns__procEvent));
-reg
+proc
-        }
-    }

capture-mod/trunk/CaptureSoapServer.h

@@ -13 +13 @@
-using namespace boost;
-
+//While we could put typedefs in the definition, they don't follow through to the auto-generated
+//soap files. Therefore you would have to include captureGSOAP.h, but that would cause double definitions
+typedef struct ns__regEvent ns__regEvent_t;
+typedef struct ns__fileEvent ns__fileEvent_t;
+typedef struct ns__procEvent ns__procEvent_t;
+
-class CaptureSoapServer : public Runnable
-{
@@ -20 +26 @@
-    boost::signals::connection onFileEventConnection;
-    boost::signals::connection onProcessEventConnection;
-    typedef struct ns__regEvent ns__regEvent_t;
-    typedef struct ns__fileEvent ns__fileEvent_t;
-    typedef struct ns__procEvent ns__procEvent_t;
-
-
-    CaptureSoapServer(Visitor *, RegistryMonitor * r, FileMonitor * f, ProcessMonitor * p);