Changeset 1644

Timestamp:

06/27/08 17:37:47 (2 months ago)

Author:

xkovah

Message:

It works with the globVisitor kludge, and I still don't understand why the notifyListeners method isn't working…

Files:

• capture-mod/trunk/ApplicationPlugins/InternetExplorer/Application_InternetExplorer.vcproj (modified) (1 diff)
• capture-mod/trunk/ApplicationPlugins/InternetExplorer/InternetExplorerInstance.h (modified) (1 diff)
• capture-mod/trunk/CaptureClient.cpp (modified) (2 diffs)
• capture-mod/trunk/CaptureClient.sln (modified) (1 diff)
• capture-mod/trunk/CaptureClient.vcproj (modified) (2 diffs)
• capture-mod/trunk/EventController.cpp (modified) (1 diff)
• capture-mod/trunk/EventController.h (modified) (1 diff)
• capture-mod/trunk/MySoapServer.cpp (modified) (5 diffs)
• capture-mod/trunk/MySoapServer.h (modified) (1 diff)
• capture-mod/trunk/ProcessMonitor.h (modified) (1 diff)
• capture-mod/trunk/Thread.h (modified) (3 diffs)
• capture-mod/trunk/Visitor.cpp (modified) (6 diffs)
• capture-mod/trunk/Visitor.h (modified) (3 diffs)
• capture-mod/trunk/install/CaptureBAT.exe (modified) (previous)
• capture-mod/trunk/soapC.cpp (modified) (1 diff)
• capture-mod/trunk/soapClient.cpp (modified) (1 diff)
• capture-mod/trunk/soapServer.cpp (modified) (1 diff)

capture-mod/trunk/ApplicationPlugins/InternetExplorer/Application_InternetExplorer.vcproj

@@ -65 +65 @@
-                AdditionalDependencies="comsuppw.lib Version.lib Advapi32.lib"
-                LinkIncremental="2"
-
+F:\WinDDK\6000\lib\wxp\i386;
-                GenerateDebugInformation="true"
-                SubSystem="1"

capture-mod/trunk/ApplicationPlugins/InternetExplorer/InternetExplorerInstance.h

@@ -25 +25 @@
-    /* Below are various methods we must implement for DWebBrowserEvents.
-       Just ignore most of them as they are just stubs. The important ones
-
+
+
-    HRESULT STDMETHODCALLTYPE QueryInterface( 
-                /* [in] */ REFIID riid,

capture-mod/trunk/CaptureClient.cpp

@@ -50 +50 @@
-
-        hStopRunning = CreateEvent(NULL, FALSE, FALSE, NULL);
-        //XENO - Right here, set up the standalone SOAP server
-        MySoapServer a = MySoapServer();
-
-        wstring serverIp = OptionsManager::getInstance()->getOption(L"server");
@@ -63 +61 @@
-        /* Start running the Capture Client */
-        visitor = new Visitor();
-
-
+
+
+
-        Thread* captureClientThread = new Thread(this);
-        captureClientThread->start("CaptureClient");

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
-        {AE2C8E80-7D21-47AD-987B-43E0708AE549}.Debug|Win32.ActiveCfg = Debug|Win32
-        {AE2C8E80-7D21-47AD-987B-43E0708AE549}.Debug|Win32.Build.0 = Debug|Win32
-        {AE2C8E80-7D21-47AD-987B-43E0708AE549}.Release|Win32.ActiveCfg = Release|Win32
-        {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
-        {C57EC146-60B3-499B-BDFA-5BB5504FDB89}.Debug|Win32.ActiveCfg = Debug|Win32
-        {C57EC146-60B3-499B-BDFA-5BB5504FDB89}.Debug|Win32.Build.0 = Debug|Win32
-        {C57EC146-60B3-499B-BDFA-5BB5504FDB89}.Release|Win32.ActiveCfg = Release|Win32
-        {C57EC146-60B3-499B-BDFA-5BB5504FDB89}.Release|Win32.Build.0 = Release|Win32

capture-mod/trunk/CaptureClient.vcproj

@@ -122 +122 @@
-                Name="VCCLCompilerTool"
-                Optimization="3"
-D:\WpdPack\Include;D:\expatpp\src_pp;D:\WinDDK\6000\inc;D:\boost\boost_1_34_0;D:\expatpp\expat\lib;"D:\Microsoft Platform SDK for Windows Server 2003 R2
+F:\Boost;"F:\Program Files\Microsoft Platform SDK\Include";F:\WinDDK\6000\inc\api;"F:\capture-mod\expatpp\src_pp";"F:\capture-mod\expatpp\expat\lib";"F:\capture-mod\WpdPack_4_0_1\WpdPack
-                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-                RuntimeLibrary="2"
@@ -144 +144 @@
-                AdditionalDependencies="kernel32.lib Ws2_32.lib Advapi32.lib Psapi.lib fltLib.lib shlwapi.lib expatpp.lib shell32.lib Urlmon.lib $(NOINHERIT)"
-                LinkIncremental="1"
-D:\WinDDK\6000\lib\wxp\i386;D:\expatpp\vc_pp\expatpp\ReleaseMTDLL;"D:\Microsoft Platform SDK for Windows Server 2003 R2\Lib";D:\boost\boost_1_34_0\lib
+F:\boost_1_34_0\lib;"F:\Program Files\Microsoft Platform SDK\Lib";F:\WinDDK\6000\lib\wxp\i386;"F:\capture-mod\expatpp\expat\lib";"F:\capture-mod\expatpp\vc_pp\expatpp\ReleaseMT"
-                GenerateDebugInformation="true"
-                SubSystem="1"

capture-mod/trunk/EventController.cpp

@@ -51 +51 @@
-EventController::notifyListeners()
-{
+    if(pCurrentElement != NULL)
+    {
+        stdext::hash_map<wstring, signal_serverEvent*>::iterator it;
+        it = onServerEventMap.find(pCurrentElement->name);
+        if(it != onServerEventMap.end())
+        {
+            signal_serverEvent* signal_onServerEvent = it->second;
+            (*signal_onServerEvent)(pCurrentElement);
+        }   
+        if(pCurrentElement->data != NULL)
+        {
+            free(pCurrentElement->data);
+        }
+        delete pCurrentElement;
+        pCurrentElement = NULL;
+    }
+}
+
+void
+EventController::notifyListeners(pElement pInputElement)
+{
+
+    pCurrentElement = (Element *)pInputElement;
-    if(pCurrentElement != NULL)
-    {

capture-mod/trunk/EventController.h

@@ -78 +78 @@
-
-    void receiveServerEvent(const char* xmlDocument);
+    void notifyListeners(pElement pInputElement);
-private:
-    static bool instanceCreated;

capture-mod/trunk/MySoapServer.cpp

@@ -9 +9 @@
-#include "calculator.nsmap" 
-
-
-
+
+
+
+
+
+
+
-    MySoapServerThread = new Thread(this);
-    MySoapServerThread->start("MySoapServer");
@@ -25 +30 @@
-   struct soap soap;
-   SOCKET m, s; // master and slave sockets
+
+   ///loadClientPlugins();
-
-   soap_init(&soap);
@@ -57 +64 @@
-
-// Implementation of the "add" remote method: 
-//int ns__add(struct soap *soap, int a, int b, int &result) 
-int ns__add(struct soap *soap, int a, int b, int &result) 
-{ 
-   //printf("add got %d and %d\n", a, b);
-   result = a + b;
+
-   return SOAP_OK;
-} 
+
+void MySoapServer::test(){
+
+//  printf("myVisitor = %#x\n", MySoapServer::myVisitor);
+
+}
-
-int ns__ping(struct soap *soap, char * a, char ** result) 
@@ -69 +82 @@
-   printf("%s\n", a);
-   *result = "pong";
+
+    //Build my own new-fangled Element to pass to Visitor:onServerEvent which I think will open 
+    typedef boost::signal<void (Element*)> signal_serverEvent;
+    Attribute att;
+    att.name = L"url";
+    att.value = L"http://slashdot.org";
+    Element e;
+    e.name = L"iexplore";
+    e.attributes.push_back(att);
+    e.data = NULL;
+    e.dataLength = 0;
+//  printf("trying with notifyListeners\n");
+//  EventController::getInstance()->notifyListeners(&e);
+    printf("trying with globVisitor\n");
+    globVisitor->onServerEvent(&e);
+
-   return SOAP_OK; 
-}
@@ -79 +108 @@
-}
-
+void
+MySoapServer::loadClientPlugins()
+{
+    WIN32_FIND_DATA FindFileData;
+    HANDLE hFind = INVALID_HANDLE_VALUE;
+    wchar_t pluginDirectoryPath[1024];
+
+    GetFullPathName(L"plugins\\Application_*.dll", 1024, pluginDirectoryPath, NULL);
+    DebugPrint(L"Capture-SOAP Server: Plugin directory - %ls\n", pluginDirectoryPath);
+    hFind = FindFirstFile(pluginDirectoryPath, &FindFileData);
+
+    if (hFind != INVALID_HANDLE_VALUE) 
+    {
+        typedef void (*AppPlugin)(void*);
+        do
+        {
+            wstring pluginDir = L"plugins\\";
+            pluginDir += FindFileData.cFileName;            
+            HMODULE hPlugin = LoadLibrary(pluginDir.c_str());
+
+            if(hPlugin != NULL)
+            {
+                list<ApplicationPlugin*>* apps = new std::list<ApplicationPlugin*>();
+                applicationPlugins.insert(PluginPair(hPlugin, apps));
+                ApplicationPlugin* applicationPlugin = createApplicationPluginObject(hPlugin);
+                if(applicationPlugin == NULL) {
+                    FreeLibrary(hPlugin);
+                } else {
+                    printf("Loaded plugin: %ls\n", FindFileData.cFileName);
+                    unsigned int g = applicationPlugin->getPriority();
+                    wchar_t** supportedApplications = applicationPlugin->getSupportedApplicationNames();
+                    for(int i = 0; supportedApplications[i] != NULL; i++)
+                    {
+                        stdext::hash_map<wstring, ApplicationPlugin*>::iterator it;
+                        it = applicationMap.find(supportedApplications[i]);
+                        /* Check he application isn't already being handled by a plugin */
+                        if(it != applicationMap.end())
+                        {
+                            /* Check the priority of the existing application plugin */
+                            unsigned int p = it->second->getPriority();
+                            if(applicationPlugin->getPriority() > p)
+                            {
+                                /* Over ride the exisiting plugin if the priority of the loaded one
+                                   is greater */
+                                applicationMap.erase(supportedApplications[i]);
+                                printf("\toverride: added application: %ls\n", supportedApplications[i]);
+                                applicationMap.insert(ApplicationPair(supportedApplications[i], applicationPlugin));
+                            } else {
+                                printf("\tplugin overridden: not adding application: %ls\n", supportedApplications[i]);
+                            }
+                        } else {
+                            printf("\tinserted: added application: %ls\n", supportedApplications[i]);
+                            applicationMap.insert(ApplicationPair(supportedApplications[i], applicationPlugin)); 
+                        }
+                    }
+                }
+            }
+        } while(FindNextFile(hFind, &FindFileData) != 0);
+        FindClose(hFind);
+    }
+    
+}
+
+ApplicationPlugin*
+MySoapServer::createApplicationPluginObject(HMODULE hPlugin)
+{
+    typedef void (*PluginExportInterface)(void*);
+    PluginExportInterface pluginCreateInstance = NULL;
+    ApplicationPlugin* applicationPlugin = NULL;
+    /* Get the function address to create a plugin object */
+    pluginCreateInstance = (PluginExportInterface)GetProcAddress(hPlugin,"New");
+    /* Create a new plugin object in the context of the plugin */
+    pluginCreateInstance(&applicationPlugin);
+    /* If the object was created then add it to a list so we can track it */
+    if(applicationPlugin != NULL)
+    {
+        stdext::hash_map<HMODULE, std::list<ApplicationPlugin*>*>::iterator it;
+        it = applicationPlugins.find(hPlugin);
+        if(it != applicationPlugins.end())
+        {
+            list<ApplicationPlugin*>* apps = it->second;
+            apps->push_back(applicationPlugin);
+        }
+    }
+    return applicationPlugin;
+}
+
+void
+MySoapServer::onServerEvent(Element* pElement)
+{
+    wstring applicationName = L"iexplore";
+    wstring url = L"";
+    int time = 30;
+    vector<Attribute>::iterator it;
+    for(it = pElement->attributes.begin(); it != pElement->attributes.end(); it++)
+    {
+        if(it->name == L"url") {
+            url = it->value;
+        } else if(it->name == L"program") {
+            applicationName = it->value;
+        } else if(it->name == L"time") {
+            time = boost::lexical_cast<int>(it->value);
+        }
+    }
+    if(url != L"")
+    {
+        url = CaptureGlobal::urlDecode(url);
+        stdext::hash_map<wstring, ApplicationPlugin*>::iterator vit;
+        vit = applicationMap.find(applicationName);
+        if(vit != applicationMap.end())
+        {
+            ApplicationPlugin* applicationPlugin = vit->second;
+            Url* visiturl = new Url(url, applicationName, time);
+            DWORD minorErrorCode = 0;
+            DWORD majorErrorCode = 0;
+            printf("Visiting: %ls -> %ls\n", visiturl->getApplicationName().c_str(), visiturl->getUrl().c_str());
+        
+            /* Pass the actual visitation process of to the application plugin */
+            majorErrorCode = applicationPlugin->visitUrl(visiturl, &minorErrorCode);
+            ///toVisit.push(VisitPair(applicationPlugin, visiturl));
+            ///SetEvent(hQueueNotEmpty);
+        } else {
+            printf("MySoapServer-onServerEvent: ERROR could not find client %ls path, url not queued for visitation\n", applicationName.c_str());
+        }
+    } else {
+        printf("MySoapServer-onServerEvent: ERROR no url specified for visit event\n");
+    }
+}

capture-mod/trunk/MySoapServer.h

@@ -3 +3 @@
-*/
-
+#pragma once
-#include "captureGSOAP.h"
-#include "Thread.h"
+
+#include "CaptureGlobal.h"
+#include <string>
+#include <queue>
+#include <list>
+#include <iostream>
+#include <fstream>
+#include <vector>
+#include <hash_map>
+#include <boost/signal.hpp>
+#include <boost/bind.hpp>
+#include <boost\regex.hpp>
+#include <boost/algorithm/string/classification.hpp>
+#include <boost/algorithm/string/find_iterator.hpp>
+#include <boost/algorithm/string/finder.hpp> 
+#include <boost/lexical_cast.hpp>
+#include <boost/tokenizer.hpp>
+#include "Url.h"
+#include "ApplicationPlugin.h"
+#include "Visitor.h"
+
+using namespace std;
+using namespace boost;
+
+typedef split_iterator<string::iterator> sf_it;
+
-
-class MySoapServer : public Runnable
-{
-public:
-
+
+
+
+
+
+
-    ~MySoapServer();
-
-    void run();
-
+    //Stolen from Visitor
+    void loadClientPlugins();
+    ApplicationPlugin* createApplicationPluginObject(HMODULE hPlugin);
+    void onServerEvent(Element* pElement);
+
-    Thread * MySoapServerThread;
+    signal_visitEvent signalVisitEvent;
+    stdext::hash_map<HMODULE, std::list<ApplicationPlugin*>*> applicationPlugins;
+    boost::signals::connection onServerVisitEventConnection;
+    stdext::hash_map<wstring, ApplicationPlugin*> applicationMap;
+
+    static void test();
+    static Visitor * myVisitor;
-
-};

capture-mod/trunk/ProcessMonitor.h

@@ -58 +58 @@
-    are attached to the onProcessEvent slot
-
-I
+
-*/
-class ProcessMonitor : public Runnable, public Monitor

capture-mod/trunk/Thread.h

@@ -28 +28 @@
-    Class: Thread
-
-I
+
-    for creating a thread (threadProc) and creates an OO way to initialise, start, and stop a thread.
-*/
@@ -55 +55 @@
-        Constructor: Thread
-
-I
+
-    */
-    Thread(Runnable *ptr) {
@@ -111 +111 @@
-        Variable: _threadObj
-
-I
+
-    */
-    Runnable *_threadObj;

capture-mod/trunk/Visitor.cpp

@@ -1 +1 @@
-#include "Visitor.h"
-
+unsigned int threadCount = 0;
+
-Visitor::Visitor(void)
-{
@@ -6 +8 @@
-
-    hQueueNotEmpty = CreateEvent(NULL, FALSE, FALSE, NULL);
+    printf("Visitor: boost that sucka\n");
-    onServerVisitEventConnection=EventController::getInstance()->connect_onServerEvent(L"visit", boost::bind(&Visitor::onServerEvent, this, _1));
-
-    loadClientPlugins();
-
+//  threadname = new char[10];
+//  sprintf(threadname, "Visitor%d\n", threadCount);
+//  threadCount++;
-    visitorThread = new Thread(this);
-    visitorThread->start("Visitor");
@@ -19 +25 @@
-    CloseHandle(hQueueNotEmpty);
-    unloadClientPlugins();
+    delete threadname;
-    // TODO free items in toVisit queue
-}
@@ -33 +40 @@
-    while(true)
-    {
+        printf("Visitor::run, waiting\n");
-        WaitForSingleObject(hQueueNotEmpty, INFINITE);
+        printf("Visitor::run, runing\n");
-        VisitPair visit = toVisit.front();
-        toVisit.pop();
@@ -82 +91 @@
-        {
-            wstring pluginDir = L"plugins\\";
-           
+
-            HMODULE hPlugin = LoadLibrary(pluginDir.c_str());
-
@@ -174 +183 @@
-Visitor::onServerEvent(Element* pElement)
-{
+    printf("Visitor::onServerEvent");
-    wstring applicationName = L"iexplore";
-    wstring url = L"";

capture-mod/trunk/Visitor.h

@@ -68 +68 @@
-
-    boost::signals::connection onVisitEvent(const signal_visitEvent::slot_type& s);
+    void onServerEvent(Element* pElement);
-private:
-    void loadClientPlugins();
@@ -74 +75 @@
-    void run();
-
-
+
-
-    ApplicationPlugin* createApplicationPluginObject(HMODULE hPlugin);
@@ -86 +87 @@
-    boost::signals::connection onServerVisitEventConnection;
-    stdext::hash_map<wstring, ApplicationPlugin*> applicationMap;
+
+    char * threadname;
+    ///int count;
-};

capture-mod/trunk/soapC.cpp

@@ -8 +8 @@
-#include "soapH.h"
-
-5-20 05:48:22
+6-27 05:00:35
-
-

capture-mod/trunk/soapClient.cpp

@@ -7 +7 @@
-#include "soapH.h"
-
-5-20 05:48:22
+6-27 05:00:35
-
-

capture-mod/trunk/soapServer.cpp

@@ -7 +7 @@
-#include "soapH.h"
-
-5-20 05:48:22
+6-27 05:00:35
-
-