Changeset 1777

Timestamp:

08/29/08 16:35:43 (3 months ago)

Author:

xkovah

Message:

This was when I was trying to send the events back in the visit. But I've decided to give up for now, since visit doesn't block. Thus the Manager can just poll Capture as frequently as it wants to see if any events have been seen yet.

Files:

• capture-mod/trunk/CaptureClient.sln (modified) (2 diffs)
• capture-mod/trunk/CaptureSoapServer.cpp (modified) (21 diffs)
• capture-mod/trunk/capture.wsdl (modified) (1 diff)
• capture-mod/trunk/captureGSOAP.h (modified) (1 diff)
• capture-mod/trunk/soapC.cpp (modified) (1 diff)
• capture-mod/trunk/soapClient.cpp (modified) (8 diffs)
• capture-mod/trunk/soapServer.cpp (modified) (1 diff)

capture-mod/trunk/CaptureClient.sln

@@ -17 +17 @@
-    GlobalSection(ProjectConfigurationPlatforms) = postSolution
-        {4A258E9F-0B4B-40EF-B6C6-E69C630E5CAC}.Debug|Win32.ActiveCfg = Debug|Win32
+        {4A258E9F-0B4B-40EF-B6C6-E69C630E5CAC}.Debug|Win32.Build.0 = Debug|Win32
-        {4A258E9F-0B4B-40EF-B6C6-E69C630E5CAC}.Release|Win32.ActiveCfg = Release|Win32
-        {4A258E9F-0B4B-40EF-B6C6-E69C630E5CAC}.Release|Win32.Build.0 = Release|Win32
@@ -23 +24 @@
-        {AE2C8E80-7D21-47AD-987B-43E0708AE549}.Release|Win32.Build.0 = Release|Win32
-        {4EF34E6D-B30C-46E5-9FC5-967ECEADE2CD}.Debug|Win32.ActiveCfg = Debug|Win32
+        {4EF34E6D-B30C-46E5-9FC5-967ECEADE2CD}.Debug|Win32.Build.0 = Debug|Win32
-        {4EF34E6D-B30C-46E5-9FC5-967ECEADE2CD}.Release|Win32.ActiveCfg = Release|Win32
-        {4EF34E6D-B30C-46E5-9FC5-967ECEADE2CD}.Release|Win32.Build.0 = Release|Win32

capture-mod/trunk/CaptureSoapServer.cpp

@@ -48 +48 @@
-   //The below code is taken mostly from the gsoap standalone server example page
-   soap_init(&soap);
-FIXME TODO: This needs to be configurable
-192.168.0.131
+TODO: change this to the desired port
+0.0.0.0
-   if (m < 0)
-      soap_print_fault(&soap, stderr);
@@ -86 +86 @@
-{
-    char debug = 0;
-
+if(debug) 
-
-    //now begins the arduous process of converting the values into char *s
-    //TODO: use a soap function to make r
-    ns__regEvent_t r;
-    r.time = (char *)malloc(time.length()+1);
@@ -117 +116 @@
-    sprintf(r.valueData, "%ls", extra.at(3).c_str());
-    
-
-
-
+
+
+
+
+
-    }
-
-    regList.push_back(r);
-
+if(debug) 
-}
-
@@ -133 +134 @@
-{
-    char debug = 0;
-
+if(debug) 
-    ns__fileEvent_t f;
-    f.time = (char *)malloc(time.length()+1);
@@ -159 +160 @@
-    }
-    fileList.push_back(f);
-
+if(debug) 
-
-}
@@ -167 +168 @@
-                                        DWORD processId, wstring process)
-{
-
+
+
-    ns__procEvent_t p;
-    p.time = (char *)malloc(time.length()+1);
@@ -191 +193 @@
-
-    procList.push_back(p);
-
+if(debug) 
-
-}
@@ -206 +208 @@
-//Give it a url to browse to
-int ns__visitURL(struct soap *soap, char * url, struct ns__allEvents &result){
+    char debug = 1;
-    wchar_t xURL[1024];
-    wsprintf(xURL, L"%hs", url);
@@ -218 +221 @@
-    e.data = NULL;
-    e.dataLength = 0;
-
+
+
+
-    //TODO: We currently run the browser visit event as a black box.
-    //In the future we will want to be able to report back about events before
-    //it times out or it's cleanly done with the browse.
-
-
-
-
-
+
+
+
+
+
+
+
-    if(!regList.empty() || !fileList.empty() || !procList.empty()){
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    else{
@@ -236 +262 @@
-
-int ns__sendFileBase64(struct soap *soap, char * fileName, char * data, unsigned int encodedLength, unsigned int decodedLength, int &result){
-
-
-
+
+
+
+
-        data[0], data[1], data[2], data[3]);
-
@@ -263 +290 @@
-    BOOL b = WriteFile(myHandle, decodedData, decodedLength, &numWrote, NULL);
-    if(b){
-
+if(debug) 
-    }
-    CloseHandle(myHandle);
@@ -312 +339 @@
-    unsigned int encodedLength = (unsigned int)b64::b64_encode(buffer, fileSize, NULL, NULL);
-    if(debug) printf("encodedLength = %d\n", encodedLength);
+    //TODO: make this a soap_malloc()
-    char * encodedData = new char[encodedLength];
-    memset(encodedData, 0, encodedLength);
@@ -346 +374 @@
-// have an 'unsigned int' type by default, and I didn't want to make one. Make sure you cast it to DWORD.
-int ns__openDocument(struct soap *soap, char * fileName, int waitTimeMillisec, int &result){
-1
+0
-    if(debug) printf("in ns__openDocument, waitTimeMillisec = %d\n", waitTimeMillisec);
-
@@ -373 +401 @@
-    }
-    
-
+.
-    b = AssignProcessToJobObject(myJobObj, procInfo.hProcess);
-    if(!b){
@@ -387 +415 @@
-    //TODO: Before we terminate the jobs, see if it created any events. If so, let it run, and tell the
-    //HC Manager about it. The Manager should then request the information about events separately.
+    //This is the sort of check we would like for browsing as well
-
-    b = TerminateJobObject(myJobObj, 0);
@@ -393 +422 @@
-        return SOAP_ERR;
-    }
-    //Just incase. I don't know if this is still needed
-    CloseHandle(procInfo.hProcess);
-    CloseHandle(procInfo.hThread);
@@ -403 +431 @@
-//If maxEventsReturned == -1, then then send as many as possible.
-int ns__returnEvents(struct soap *soap, int maxEventsToReturn, struct ns__allEvents &result){
-1
+0
-
-    struct ns__allEvents * all = soap_new_ns__allEvents(soap, 1);
@@ -425 +453 @@
-            dRegArray->__size = maxEventsToReturn;
-        }
-
+if(debug) 
-
-        //Allocate a flat array to hold our ns__regEvents in
@@ -464 +492 @@
-            dFileArray->__size = maxEventsToReturn;
-        }
-
+if(debug) 
-
-        struct ns__fileEvent * ns__fileEventArray = (struct ns__fileEvent *)soap_malloc(soap, dFileArray->__size*sizeof(struct ns__fileEvent));
@@ -489 +517 @@
-            dProcArray->__size = maxEventsToReturn;
-        }
-
+if(debug) 
-
-        struct ns__procEvent * ns__procEventArray = (struct ns__procEvent *)soap_malloc(soap, dProcArray->__size*sizeof(struct ns__procEvent));
@@ -502 +530 @@
-
-    result = *all;
-
-
-
-
+
+
-
-    return SOAP_OK;

capture-mod/trunk/capture.wsdl

@@ -257 +257 @@
- <documentation>gSOAP 2.7.10 generated service definition</documentation>
- <port name="capture" binding="tns:capture">
-192.168.0.131
+0.0.0.0
- </port>
-</service>

capture-mod/trunk/captureGSOAP.h

@@ -7 +7 @@
-//gsoap ns service style: rpc
-//gsoap ns service encoding: encoded
-192.168.0.131
+0.0.0.0
-//gsoap ns service namespace: capture
-

capture-mod/trunk/soapC.cpp

@@ -8 +8 @@
-#include "soapH.h"
-
-3:46:42
+8:12:30
-
-

capture-mod/trunk/soapClient.cpp

@@ -7 +7 @@
-#include "soapH.h"
-
-3:46:42
+8:12:30
-
-
@@ -14 +14 @@
-    struct ns__pingResponse *soap_tmp_ns__pingResponse;
-    if (!soap_endpoint)
-192.168.0.131
+0.0.0.0
-    soap->encodingStyle = "";
-    soap_tmp_ns__ping.a = a;
@@ -66 +66 @@
-{   struct ns__visitURL soap_tmp_ns__visitURL;
-    if (!soap_endpoint)
-192.168.0.131
+0.0.0.0
-    soap->encodingStyle = "";
-    soap_tmp_ns__visitURL.URL = URL;
@@ -117 +117 @@
-    struct ns__sendFileBase64Response *soap_tmp_ns__sendFileBase64Response;
-    if (!soap_endpoint)
-192.168.0.131
+0.0.0.0
-    soap->encodingStyle = "";
-    soap_tmp_ns__sendFileBase64.fileName = fileName;
@@ -171 +171 @@
-{   struct ns__receiveFileBase64 soap_tmp_ns__receiveFileBase64;
-    if (!soap_endpoint)
-192.168.0.131
+0.0.0.0
-    soap->encodingStyle = "";
-    soap_tmp_ns__receiveFileBase64.fileName = fileName;
@@ -222 +222 @@
-    struct ns__openDocumentResponse *soap_tmp_ns__openDocumentResponse;
-    if (!soap_endpoint)
-192.168.0.131
+0.0.0.0
-    soap->encodingStyle = "";
-    soap_tmp_ns__openDocument.fileName = fileName;
@@ -274 +274 @@
-{   struct ns__returnEvents soap_tmp_ns__returnEvents;
-    if (!soap_endpoint)
-192.168.0.131
+0.0.0.0
-    soap->encodingStyle = "";
-    soap_tmp_ns__returnEvents.maxEventsToReturn = maxEventsToReturn;
@@ -325 +325 @@
-    struct ns__sendMIMEResponse *soap_tmp_ns__sendMIMEResponse;
-    if (!soap_endpoint)
-192.168.0.131
+0.0.0.0
-    soap->encodingStyle = "";
-    soap_tmp_ns__sendMIME.magicNumber = magicNumber;

capture-mod/trunk/soapServer.cpp

@@ -7 +7 @@
-#include "soapH.h"
-
-3:46:42
+8:12:30
-
-