Changeset 1776

Show
Ignore:
Timestamp:
08/29/08 13:23:52 (3 months ago)
Author:
xkovah
Message:

some example scripts, and I'm just cleaning some stuff up

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • capture-mod/trunk/Analyzer.cpp

    r1766 r1776  
    378378        processType = L"terminated"; 
    379379    } 
    380     //Xeno sez ? Is this comment still valid 
    381     //FIXME: use the right constructor instead 
     380    //TODO: cleanup a little 
    382381    vector<wstring> extra; 
    383382    wchar_t parentProcessIdString[11]; 
  • capture-mod/trunk/CaptureClient.sln

    r1774 r1776  
    2323        {AE2C8E80-7D21-47AD-987B-43E0708AE549}.Release|Win32.Build.0 = Release|Win32 
    2424        {4EF34E6D-B30C-46E5-9FC5-967ECEADE2CD}.Debug|Win32.ActiveCfg = Debug|Win32 
    25         {4EF34E6D-B30C-46E5-9FC5-967ECEADE2CD}.Debug|Win32.Build.0 = Debug|Win32 
    2625        {4EF34E6D-B30C-46E5-9FC5-967ECEADE2CD}.Release|Win32.ActiveCfg = Release|Win32 
    2726        {4EF34E6D-B30C-46E5-9FC5-967ECEADE2CD}.Release|Win32.Build.0 = Release|Win32 
  • capture-mod/trunk/CaptureSoapServer.cpp

    r1774 r1776  
    3131 
    3232CaptureSoapServer::~CaptureSoapServer(){ 
    33     //FIXME: I have no idea if these are appropriate here. Also need to find the correct way to cleanly shut down 
    34     //so that it doesn't output a connection error at the end. 
    3533    soap_destroy(&soap); 
    3634    soap_end(&soap); 
     
    207205 
    208206//Give it a url to browse to 
    209 int ns__visitURL(struct soap *soap, char * url, char ** result){ 
     207int ns__visitURL(struct soap *soap, char * url, struct ns__allEvents &result){ 
    210208    wchar_t xURL[1024]; 
    211209    wsprintf(xURL, L"%hs", url); 
     
    221219    e.dataLength = 0; 
    222220    printf("visiting %s\n", url); 
     221    //TODO: We currently run the browser visit event as a black box. 
     222    //In the future we will want to be able to report back about events before 
     223    //it times out or it's cleanly done with the browse. 
    223224    EventController::getInstance()->notifyListeners(&e); 
    224225 
    225     return SOAP_OK; 
     226    struct ns__allEvents all; 
     227    memset(&all, 0, sizeof(struct ns__allEvents)); 
     228 
     229    if(!regList.empty() || !fileList.empty() || !procList.empty()){ 
     230        return ns__returnEvents(soap, -1, all); 
     231    } 
     232    else{ 
     233        return SOAP_OK; 
     234    } 
    226235} 
    227236 
     
    432441                int * b = (int *)&regList.front(); 
    433442                for(int i = 0; i < 8; i++){ 
    434                     printf("r[%d] = %#x\n", i, b[i]); 
     443                    printf("b[%d] = %#x\n", i, b[i]); 
    435444                } 
    436445            } 
  • capture-mod/trunk/ExclusionLists/RegistryMonitor.exl

    r1248 r1776  
    312312+   SetValueKey C:\\WINDOWS\\system32\\spoolsv\.exe HKLM\\SYSTEM\\ControlSet001\\Control\\Print\\Printers 
    313313+   SetValueKey C:\\WINDOWS\\system32\\spoolsv\.exe HKLM\\SYSTEM\\ControlSet001\\Control\\Print\\Providers 
     314 
     315#### HONEYCLIENT AUTO EXCLUDE SCRIPT 
     316+   SetValueKey C:\\Program Files\\Internet Explorer\\iexplore\.exe HKCU\\Software\\Microsoft\\Internet Explorer\\Security\\AntiPhishing\\.+ 
     317+   SetValueKey C:\\Program Files\\Internet Explorer\\iexplore\.exe HKCU\\Software\\Microsoft\\CTF\\TIP\\.*\\LanguageProfile\\.+ 
     318+   SetValueKey C:\\Program Files\\Internet Explorer\\iexplore\.exe HKCU\\Software\\Microsoft\\Internet Explorer\\Zoom 
  • capture-mod/trunk/Makefile

    r823 r1776  
    1919    echo "   - release-bat - will build the capture-bat solution from scratch. The resulting" 
    2020    echo "                   files will be located in the install directory." 
    21      
    22 release-hpc: clean \ 
    23              prepare \ 
     21 
     22#clean \ #deleted from release-hpc and release-bat for now cause it makes it take too much longer 
     23#run it manually as necessary 
     24release-hpc:         prepare \ 
    2425             build \ 
    2526             copy-hpc \ 
  • capture-mod/trunk/capture.wsdl

    r1770 r1776  
    9797</message> 
    9898 
    99 <message name="visitURLRequest"> 
    100  <part name="a" type="xsd:string"/> 
    101 </message> 
    102  
    103 <message name="visitURLResponse"> 
    104  <part name="result" type="xsd:string"/> 
     99<message name="visitURL"> 
     100 <part name="URL" type="xsd:string"/> 
     101</message> 
     102 
     103<message name="allEvents"> 
     104 <part name="regEvents" type="ns:dynRegArray"/> 
     105 <part name="fileEvents" type="ns:dynFileArray"/> 
     106 <part name="procEvents" type="ns:dynProcArray"/> 
    105107</message> 
    106108 
     
    139141</message> 
    140142 
    141 <message name="allEvents"> 
    142  <part name="regEvents" type="ns:dynRegArray"/> 
    143  <part name="fileEvents" type="ns:dynFileArray"/> 
    144  <part name="procEvents" type="ns:dynProcArray"/> 
    145 </message> 
    146  
    147143<message name="sendMIMERequest"> 
    148144 <part name="magicNumber" type="xsd:int"/> 
     
    161157 <operation name="visitURL"> 
    162158  <documentation>Service definition of function ns__visitURL</documentation> 
    163   <input message="tns:visitURLRequest"/> 
    164   <output message="tns:visitURLResponse"/> 
     159  <input message="tns:visitURL"/> 
     160  <output message="tns:allEvents"/> 
    165161 </operation> 
    166162 <operation name="sendFileBase64"> 
  • capture-mod/trunk/captureGSOAP.h

    r1770 r1776  
    7171} ns__receiveFileStruct; 
    7272 
    73  
    7473int ns__ping(char * a, char ** result); 
    75 int ns__visitURL(char * a, char ** result); 
     74int ns__visitURL(char * URL, struct ns__allEvents &result); 
    7675int ns__sendFileBase64(char * fileName, char * data, unsigned int encodedLength, unsigned int decodedLength, int &result); 
    7776int ns__receiveFileBase64(char * fileName, ns__receiveFileStruct &result); 
     
    7978int ns__returnEvents(int maxEventsToReturn, struct ns__allEvents &result); 
    8079 
    81 //Not working 
     80//Not working, see definition comments 
    8281int ns__sendMIME(int magicNumber, int &result); 
  • capture-mod/trunk/openDoc.pl

    r1764 r1776  
    66#use SOAP::Lite; 
    77 
     8#NOTE: the first parameter of name() must exactly match the variable name in captureGSOAP.h 
    89$fileNameSOAP = SOAP::Data->name(fileName => $ARGV[0]); 
    910$waitTimeMillisecSOAP = SOAP::Data->name(waitTimeMillisec => 20000); 
  • capture-mod/trunk/soapC.cpp

    r1771 r1776  
    88#include "soapH.h" 
    99 
    10 SOAP_SOURCE_STAMP("@(#) soapC.cpp ver 2.7.10 2008-08-28 01:59:02 GMT") 
     10SOAP_SOURCE_STAMP("@(#) soapC.cpp ver 2.7.10 2008-08-29 03:46:42 GMT") 
    1111 
    1212 
     
    180180    case SOAP_TYPE_ns__visitURL: 
    181181        return soap_in_ns__visitURL(soap, NULL, NULL, "ns:visitURL"); 
    182     case SOAP_TYPE_ns__visitURLResponse: 
    183         return soap_in_ns__visitURLResponse(soap, NULL, NULL, "ns:visitURLResponse"); 
    184182    case SOAP_TYPE_ns__ping: 
    185183        return soap_in_ns__ping(soap, NULL, NULL, "ns:ping"); 
     
    275273            return soap_in_ns__visitURL(soap, NULL, NULL, NULL); 
    276274        } 
    277         if (!soap_match_tag(soap, t, "ns:visitURLResponse")) 
    278         {   *type = SOAP_TYPE_ns__visitURLResponse; 
    279             return soap_in_ns__visitURLResponse(soap, NULL, NULL, NULL); 
    280         } 
    281275        if (!soap_match_tag(soap, t, "ns:ping")) 
    282276        {   *type = SOAP_TYPE_ns__ping; 
     
    425419    case SOAP_TYPE_ns__visitURL: 
    426420        return soap_out_ns__visitURL(soap, tag, id, (const struct ns__visitURL *)ptr, "ns:visitURL"); 
    427     case SOAP_TYPE_ns__visitURLResponse: 
    428         return soap_out_ns__visitURLResponse(soap, tag, id, (const struct ns__visitURLResponse *)ptr, "ns:visitURLResponse"); 
    429421    case SOAP_TYPE_ns__ping: 
    430422        return soap_out_ns__ping(soap, tag, id, (const struct ns__ping *)ptr, "ns:ping"); 
     
    513505        soap_serialize_ns__visitURL(soap, (const struct ns__visitURL *)ptr); 
    514506        break; 
    515     case SOAP_TYPE_ns__visitURLResponse: 
    516         soap_serialize_ns__visitURLResponse(soap, (const struct ns__visitURLResponse *)ptr); 
    517         break; 
    518507    case SOAP_TYPE_ns__ping: 
    519508        soap_serialize_ns__ping(soap, (const struct ns__ping *)ptr); 
     
    608597    case SOAP_TYPE_ns__ping: 
    609598        return (void*)soap_instantiate_ns__ping(soap, -1, type, arrayType, n); 
    610     case SOAP_TYPE_ns__visitURLResponse: 
    611         return (void*)soap_instantiate_ns__visitURLResponse(soap, -1, type, arrayType, n); 
    612599    case SOAP_TYPE_ns__visitURL: 
    613600        return (void*)soap_instantiate_ns__visitURL(soap, -1, type, arrayType, n); 
     
    717704            delete[] (struct ns__ping*)p->ptr; 
    718705        break; 
    719     case SOAP_TYPE_ns__visitURLResponse: 
    720         if (p->size < 0) 
    721             delete (struct ns__visitURLResponse*)p->ptr; 
    722         else 
    723             delete[] (struct ns__visitURLResponse*)p->ptr; 
    724         break; 
    725706    case SOAP_TYPE_ns__visitURL: 
    726707        if (p->size < 0) 
     
    25172498{ 
    25182499    (void)soap; (void)a; /* appease -Wall -Werror */ 
    2519     soap_default_string(soap, &a->a); 
     2500    soap_default_string(soap, &a->URL); 
    25202501} 
    25212502 
     
    25232504{ 
    25242505    (void)soap; (void)a; /* appease -Wall -Werror */ 
    2525     soap_serialize_string(soap, &a->a); 
     2506    soap_serialize_string(soap, &a->URL); 
    25262507} 
    25272508 
     
    25382519    if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns__visitURL), type)) 
    25392520        return soap->error; 
    2540     if (soap_out_string(soap, "a", -1, &a->a, "")) 
     2521    if (soap_out_string(soap, "URL", -1, &a->URL, "")) 
    25412522        return soap->error; 
    25422523    return soap_element_end_out(soap, tag); 
     
    25532534SOAP_FMAC3 struct ns__visitURL * SOAP_FMAC4 soap_in_ns__visitURL(struct soap *soap, const char *tag, struct ns__visitURL *a, const char *type) 
    25542535{ 
    2555     short soap_flag_a = 1; 
     2536    short soap_flag_URL = 1; 
    25562537    if (soap_element_begin_in(soap, tag, 0, type)) 
    25572538        return NULL; 
     
    25642545        for (;;) 
    25652546        {   soap->error = SOAP_TAG_MISMATCH; 
    2566             if (soap_flag_a && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) 
    2567                 if (soap_in_string(soap, "a", &a->a, "xsd:string")) 
    2568                 {   soap_flag_a--; 
     2547            if (soap_flag_URL && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) 
     2548                if (soap_in_string(soap, "URL", &a->URL, "xsd:string")) 
     2549                {   soap_flag_URL--; 
    25692550                    continue; 
    25702551                } 
     
    26222603    DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying struct ns__visitURL %p -> %p\n", q, p)); 
    26232604    *(struct ns__visitURL*)p = *(struct ns__visitURL*)q; 
    2624 } 
    2625  
    2626 SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__visitURLResponse(struct soap *soap, struct ns__visitURLResponse *a) 
    2627 { 
    2628     (void)soap; (void)a; /* appease -Wall -Werror */ 
    2629     a->result = NULL; 
    2630 } 
    2631  
    2632 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns__visitURLResponse(struct soap *soap, const struct ns__visitURLResponse *a) 
    2633 { 
    2634     (void)soap; (void)a; /* appease -Wall -Werror */ 
    2635     soap_serialize_PointerTostring(soap, &a->result); 
    2636 } 
    2637  
    2638 SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns__visitURLResponse(struct soap *soap, const struct ns__visitURLResponse *a, const char *tag, const char *type) 
    2639 { 
    2640     register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ns__visitURLResponse); 
    2641     if (soap_out_ns__visitURLResponse(soap, tag, id, a, type)) 
    2642         return soap->error; 
    2643     return soap_putindependent(soap); 
    2644 } 
    2645  
    2646 SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns__visitURLResponse(struct soap *soap, const char *tag, int id, const struct ns__visitURLResponse *a, const char *type) 
    2647 { 
    2648     if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns__visitURLResponse), type)) 
    2649         return soap->error; 
    2650     if (soap_out_PointerTostring(soap, "result", -1, &a->result, "")) 
    2651         return soap->error; 
    2652     return soap_element_end_out(soap, tag); 
    2653 } 
    2654  
    2655 SOAP_FMAC3 struct ns__visitURLResponse * SOAP_FMAC4 soap_get_ns__visitURLResponse(struct soap *soap, struct ns__visitURLResponse *p, const char *tag, const char *type) 
    2656 { 
    2657     if ((p = soap_in_ns__visitURLResponse(soap, tag, p, type))) 
    2658         if (soap_getindependent(soap)) 
    2659             return NULL; 
    2660     return p; 
    2661 } 
    2662  
    2663 SOAP_FMAC3 struct ns__visitURLResponse * SOAP_FMAC4 soap_in_ns__visitURLResponse(struct soap *soap, const char *tag, struct ns__visitURLResponse *a, const char *type) 
    2664 { 
    2665     short soap_flag_result = 1; 
    2666     if (soap_element_begin_in(soap, tag, 0, type)) 
    2667         return NULL; 
    2668     a = (struct ns__visitURLResponse *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ns__visitURLResponse, sizeof(struct ns__visitURLResponse), 0, NULL, NULL, NULL); 
    2669     if (!a) 
    2670         return NULL; 
    2671     soap_default_ns__visitURLResponse(soap, a); 
    2672     if (soap->body && !*soap->href) 
    2673     { 
    2674         for (;;) 
    2675         {   soap->error = SOAP_TAG_MISMATCH; 
    2676             if (soap_flag_result && soap->error == SOAP_TAG_MISMATCH) 
    2677                 if (soap_in_PointerTostring(soap, "result", &a->result, "xsd:string")) 
    2678                 {   soap_flag_result--; 
    2679                     continue; 
    2680                 } 
    2681             if (soap->error == SOAP_TAG_MISMATCH) 
    2682                 soap->error = soap_ignore_element(soap); 
    2683             if (soap->error == SOAP_NO_TAG) 
    2684                 break; 
    2685             if (soap->error) 
    2686                 return NULL; 
    2687         } 
    2688         if (soap_element_end_in(soap, tag)) 
    2689             return NULL; 
    2690     } 
    2691     else 
    2692     {   a = (struct ns__visitURLResponse *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_ns__visitURLResponse, 0, sizeof(struct ns__visitURLResponse), 0, NULL); 
    2693         if (soap->body && soap_element_end_in(soap, tag)) 
    2694             return NULL; 
    2695     } 
    2696     return a; 
    2697 } 
    2698  
    2699 SOAP_FMAC5 struct ns__visitURLResponse * SOAP_FMAC6 soap_new_ns__visitURLResponse(struct soap *soap, int n) 
    2700 {   return soap_instantiate_ns__visitURLResponse(soap, n, NULL, NULL, NULL); 
    2701 } 
    2702  
    2703 SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ns__visitURLResponse(struct soap *soap, struct ns__visitURLResponse *p) 
    2704 {   soap_delete(soap, p); 
    2705 } 
    2706  
    2707 SOAP_FMAC3 struct ns__visitURLResponse * SOAP_FMAC4 soap_instantiate_ns__visitURLResponse(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size) 
    2708 { 
    2709     DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ns__visitURLResponse(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:"")); 
    2710     struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ns__visitURLResponse, n, soap_fdelete); 
    2711     if (!cp) 
    2712         return NULL; 
    2713     if (n < 0) 
    2714     {   cp->ptr = (void*)new struct ns__visitURLResponse; 
    2715         if (size) 
    2716             *size = sizeof(struct ns__visitURLResponse); 
    2717     } 
    2718     else 
    2719     {   cp->ptr = (void*)new struct ns__visitURLResponse[n]; 
    2720         if (!cp->ptr) 
    2721         {   soap->error = SOAP_EOM; 
    2722             return NULL; 
    2723         } 
    2724         if (size) 
    2725             *size = n * sizeof(struct ns__visitURLResponse); 
    2726     } 
    2727         DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr)); 
    2728     return (struct ns__visitURLResponse*)cp->ptr; 
    2729 } 
    2730 SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns__visitURLResponse(struct soap *soap, int st, int tt, void *p, size_t len, const void *q, size_t n) 
    2731 { 
    2732     DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying struct ns__visitURLResponse %p -> %p\n", q, p)); 
    2733     *(struct ns__visitURLResponse*)p = *(struct ns__visitURLResponse*)q; 
    27342605} 
    27352606 
  • capture-mod/trunk/soapClient.cpp

    r1771 r1776  
    77#include "soapH.h" 
    88 
    9 SOAP_SOURCE_STAMP("@(#) soapClient.cpp ver 2.7.10 2008-08-28 01:59:02 GMT") 
     9SOAP_SOURCE_STAMP("@(#) soapClient.cpp ver 2.7.10 2008-08-29 03:46:42 GMT") 
    1010 
    1111 
     
    6363} 
    6464 
    65 SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns__visitURL(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *a, char **result) 
     65SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns__visitURL(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *URL, struct ns__allEvents &result) 
    6666{   struct ns__visitURL soap_tmp_ns__visitURL; 
    67     struct ns__visitURLResponse *soap_tmp_ns__visitURLResponse; 
    68     if (!soap_endpoint) 
    69         soap_endpoint = "http://192.168.0.131:1234"; 
    70     soap->encodingStyle = ""; 
    71     soap_tmp_ns__visitURL.a = a; 
     67    if (!soap_endpoint) 
     68        soap_endpoint = "http://192.168.0.131:1234"; 
     69    soap->encodingStyle = ""; 
     70    soap_tmp_ns__visitURL.URL = URL; 
    7271    soap_begin(soap); 
    7372    soap_serializeheader(soap); 
     
    9594     || soap_end_send(soap)) 
    9695        return soap_closesock(soap); 
    97     *result = NULL; 
    98     if (soap_begin_recv(soap) 
    99      || soap_envelope_begin_in(soap) 
    100      || soap_recv_header(soap) 
    101      || soap_body_begin_in(soap)) 
    102         return soap_closesock(soap); 
    103     soap_tmp_ns__visitURLResponse = soap_get_ns__visitURLResponse(soap, NULL, "ns:visitURLResponse", ""); 
    104     if (soap->error) 
    105     {   if (soap->error == SOAP_TAG_MISMATCH && soap->level == 2) 
    106             return soap_recv_fault(soap); 
    107         return soap_closesock(soap); 
    108     } 
    109     if (soap_body_end_in(soap) 
    110      || soap_envelope_end_in(soap) 
    111      || soap_end_recv(soap)) 
    112         return soap_closesock(soap); 
    113     if (result && soap_tmp_ns__visitURLResponse->result) 
    114         *result = *soap_tmp_ns__visitURLResponse->result; 
     96    soap_default_ns__allEvents(soap, &result); 
     97    if (soap_begin_recv(soap) 
     98     || soap_envelope_begin_in(soap) 
     99     || soap_recv_header(soap) 
     100     || soap_body_begin_in(soap)) 
     101        return soap_closesock(soap); 
     102    soap_get_ns__allEvents(soap, &result, "ns:allEvents", ""); 
     103    if (soap->error) 
     104    {   if (soap->error == SOAP_TAG_MISMATCH && soap->level == 2) 
     105            return soap_recv_fault(soap); 
     106        return soap_closesock(soap); 
     107    } 
     108    if (soap_body_end_in(soap) 
     109     || soap_envelope_end_in(soap) 
     110     || soap_end_recv(soap)) 
     111        return soap_closesock(soap); 
    115112    return soap_closesock(soap); 
    116113} 
  • capture-mod/trunk/soapH.h

    r1770 r1776  
    6060 
    6161#ifndef SOAP_TYPE_SOAP_ENV__Fault 
    62 #define SOAP_TYPE_SOAP_ENV__Fault (53
     62#define SOAP_TYPE_SOAP_ENV__Fault (52
    6363#endif 
    6464SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Fault(struct soap*, struct SOAP_ENV__Fault *); 
     
    7878 
    7979#ifndef SOAP_TYPE_SOAP_ENV__Reason 
    80 #define SOAP_TYPE_SOAP_ENV__Reason (52
     80#define SOAP_TYPE_SOAP_ENV__Reason (51
    8181#endif 
    8282SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Reason(struct soap*, struct SOAP_ENV__Reason *); 
     
    9696 
    9797#ifndef SOAP_TYPE_SOAP_ENV__Detail 
    98 #define SOAP_TYPE_SOAP_ENV__Detail (49
     98#define SOAP_TYPE_SOAP_ENV__Detail (48
    9999#endif 
    100100SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Detail(struct soap*, struct SOAP_ENV__Detail *); 
     
    114114 
    115115#ifndef SOAP_TYPE_SOAP_ENV__Code 
    116 #define SOAP_TYPE_SOAP_ENV__Code (47
     116#define SOAP_TYPE_SOAP_ENV__Code (46
    117117#endif 
    118118SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Code(struct soap*, struct SOAP_ENV__Code *); 
     
    132132 
    133133#ifndef SOAP_TYPE_SOAP_ENV__Header 
    134 #define SOAP_TYPE_SOAP_ENV__Header (46
     134#define SOAP_TYPE_SOAP_ENV__Header (45
    135135#endif 
    136136SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Header(struct soap*, struct SOAP_ENV__Header *); 
     
    148148 
    149149#ifndef SOAP_TYPE_ns__sendMIME 
    150 #define SOAP_TYPE_ns__sendMIME (45
     150#define SOAP_TYPE_ns__sendMIME (44
    151151#endif 
    152152SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__sendMIME(struct soap*, struct ns__sendMIME *); 
     
    162162 
    163163#ifndef SOAP_TYPE_ns__sendMIMEResponse 
    164 #define SOAP_TYPE_ns__sendMIMEResponse (44
     164#define SOAP_TYPE_ns__sendMIMEResponse (43
    165165#endif 
    166166SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__sendMIMEResponse(struct soap*, struct ns__sendMIMEResponse *); 
     
    176176 
    177177#ifndef SOAP_TYPE_ns__returnEvents 
    178 #define SOAP_TYPE_ns__returnEvents (42
     178#define SOAP_TYPE_ns__returnEvents (41
    179179#endif 
    180180SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__returnEvents(struct soap*, struct ns__returnEvents *); 
     
    273273SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns__visitURL(struct soap*, int, int, void*, size_t, const void*, size_t); 
    274274 
    275 #ifndef SOAP_TYPE_ns__visitURLResponse 
    276 #define SOAP_TYPE_ns__visitURLResponse (28) 
    277 #endif 
    278 SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__visitURLResponse(struct soap*, struct ns__visitURLResponse *); 
    279 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns__visitURLResponse(struct soap*, const struct ns__visitURLResponse *); 
    280 SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns__visitURLResponse(struct soap*, const struct ns__visitURLResponse *, const char*, const char*); 
    281 SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns__visitURLResponse(struct soap*, const char*, int, const struct ns__visitURLResponse *, const char*); 
    282 SOAP_FMAC3 struct ns__visitURLResponse * SOAP_FMAC4 soap_get_ns__visitURLResponse(struct soap*, struct ns__visitURLResponse *, const char*, const char*); 
    283 SOAP_FMAC3 struct ns__visitURLResponse * SOAP_FMAC4 soap_in_ns__visitURLResponse(struct soap*, const char*, struct ns__visitURLResponse *, const char*); 
    284 SOAP_FMAC5 struct ns__visitURLResponse * SOAP_FMAC6 soap_new_ns__visitURLResponse(struct soap*, int); 
    285 SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ns__visitURLResponse(struct soap*, struct ns__visitURLResponse*); 
    286 SOAP_FMAC3 struct ns__visitURLResponse * SOAP_FMAC4 soap_instantiate_ns__visitURLResponse(struct soap*, int, const char*, const char*, size_t*); 
    287 SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns__visitURLResponse(struct soap*, int, int, void*, size_t, const void*, size_t); 
    288  
    289275#ifndef SOAP_TYPE_ns__ping 
    290276#define SOAP_TYPE_ns__ping (26) 
     
    444430 
    445431#ifndef SOAP_TYPE_PointerToSOAP_ENV__Reason 
    446 #define SOAP_TYPE_PointerToSOAP_ENV__Reason (55
     432#define SOAP_TYPE_PointerToSOAP_ENV__Reason (54
    447433#endif 
    448434SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerToSOAP_ENV__Reason(struct soap*, struct SOAP_ENV__Reason *const*); 
     
    457443 
    458444#ifndef SOAP_TYPE_PointerToSOAP_ENV__Detail 
    459 #define SOAP_TYPE_PointerToSOAP_ENV__Detail (54
     445#define SOAP_TYPE_PointerToSOAP_ENV__Detail (53
    460446#endif 
    461447SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerToSOAP_ENV__Detail(struct soap*, struct SOAP_ENV__Detail *const*); 
     
    470456 
    471457#ifndef SOAP_TYPE_PointerToSOAP_ENV__Code 
    472 #define SOAP_TYPE_PointerToSOAP_ENV__Code (48
     458#define SOAP_TYPE_PointerToSOAP_ENV__Code (47
    473459#endif 
    474460SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerToSOAP_ENV__Code(struct soap*, struct SOAP_ENV__Code *const*); 
  • capture-mod/trunk/soapServer.cpp

    r1771 r1776  
    77#include "soapH.h" 
    88 
    9 SOAP_SOURCE_STAMP("@(#) soapServer.cpp ver 2.7.10 2008-08-28 01:59:02 GMT") 
     9SOAP_SOURCE_STAMP("@(#) soapServer.cpp ver 2.7.10 2008-08-29 03:46:42 GMT") 
    1010 
    1111 
     
    138138SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns__visitURL(struct soap *soap) 
    139139{   struct ns__visitURL soap_tmp_ns__visitURL; 
    140     struct ns__visitURLResponse soap_tmp_ns__visitURLResponse; 
    141     char * soap_tmp_string; 
    142     soap_default_ns__visitURLResponse(soap, &soap_tmp_ns__visitURLResponse); 
    143     soap_tmp_string = NULL; 
    144     soap_tmp_ns__visitURLResponse.result = &soap_tmp_string; 
     140    struct ns__allEvents result; 
     141    soap_default_ns__allEvents(soap, &result); 
    145142    soap_default_ns__visitURL(soap, &soap_tmp_ns__visitURL); 
    146143    soap->encodingStyle = ""; 
     
    151148     || soap_end_recv(soap)) 
    152149        return soap->error; 
    153     soap->error = ns__visitURL(soap, soap_tmp_ns__visitURL.a, &soap_tmp_string); 
    154     if (soap->error) 
    155         return soap->error; 
    156     soap_serializeheader(soap); 
    157     soap_serialize_ns__visitURLResponse(soap, &soap_tmp_ns__visitURLResponse); 
    158     if (soap_begin_count(soap)) 
    159         return soap->error; 
    160     if (soap->mode & SOAP_IO_LENGTH) 
    161     {   if (soap_envelope_begin_out(soap) 
    162          || soap_putheader(soap) 
    163          || soap_body_begin_out(soap) 
    164          || soap_put_ns__visitURLResponse(soap, &soap_tmp_ns__visitURLResponse, "ns:visitURLResponse", "") 
    165          || soap_body_end_out(soap) 
    166          || soap_envelope_end_out(soap)) 
    167              return soap->error; 
    168     }; 
    169     if (soap_end_count(soap) 
    170      || soap_response(soap, SOAP_OK) 
    171      || soap_envelope_begin_out(soap) 
    172      || soap_putheader(soap) 
    173      || soap_body_begin_out(soap) 
    174      || soap_put_ns__visitURLResponse(soap, &soap_tmp_ns__visitURLResponse, "ns:visitURLResponse", "") 
     150    soap->error = ns__visitURL(soap, soap_tmp_ns__visitURL.URL, result); 
     151    if (soap->error) 
     152        return soap->error; 
     153    soap_serializeheader(soap); 
     154    soap_serialize_ns__allEvents(soap, &result); 
     155    if (soap_begin_count(soap)) 
     156        return soap->error; 
     157    if (soap->mode & SOAP_IO_LENGTH) 
     158    {   if (soap_envelope_begin_out(soap) 
     159         || soap_putheader(soap) 
     160         || soap_body_begin_out(soap) 
     161         || soap_put_ns__allEvents(soap, &result, "ns:allEvents", "") 
     162         || soap_body_end_out(soap) 
     163         || soap_envelope_end_out(soap)) 
     164             return soap->error; 
     165    }; 
     166    if (soap_end_count(soap) 
     167     || soap_response(soap, SOAP_OK) 
     168     || soap_envelope_begin_out(soap) 
     169     || soap_putheader(soap) 
     170     || soap_body_begin_out(soap) 
     171     || soap_put_ns__allEvents(soap, &result, "ns:allEvents", "") 
    175172     || soap_body_end_out(soap) 
    176173     || soap_envelope_end_out(soap) 
  • capture-mod/trunk/soapStub.h

    r1770 r1776  
    151151#endif 
    152152 
    153 #ifndef SOAP_TYPE_ns__visitURLResponse 
    154 #define SOAP_TYPE_ns__visitURLResponse (28) 
    155 /* ns:visitURLResponse */ 
    156 struct ns__visitURLResponse 
    157 { 
    158 public: 
    159     char **result;  /* SOAP 1.2 RPC return element (when namespace qualified) */    /* optional element of type xsd:string */ 
    160 }; 
    161 #endif 
    162  
    163153#ifndef SOAP_TYPE_ns__visitURL 
    164154#define SOAP_TYPE_ns__visitURL (29) 
     
    167157{ 
    168158public: 
    169     char *a;  /* optional element of type xsd:string */ 
     159    char *URL;    /* optional element of type xsd:string */ 
    170160}; 
    171161#endif 
     
    226216 
    227217#ifndef SOAP_TYPE_ns__returnEvents 
    228 #define SOAP_TYPE_ns__returnEvents (42
     218#define SOAP_TYPE_ns__returnEvents (41
    229219/* ns:returnEvents */ 
    230220struct ns__returnEvents 
     
    236226 
    237227#ifndef SOAP_TYPE_ns__sendMIMEResponse 
    238 #define SOAP_TYPE_ns__sendMIMEResponse (44
     228#define SOAP_TYPE_ns__sendMIMEResponse (43
    239229/* ns:sendMIMEResponse */ 
    240230struct ns__sendMIMEResponse 
     
    246236 
    247237#ifndef SOAP_TYPE_ns__sendMIME 
    248 #define SOAP_TYPE_ns__sendMIME (45
     238#define SOAP_TYPE_ns__sendMIME (44
    249239/* ns:sendMIME */ 
    250240struct ns__sendMIME 
     
    256246 
    257247#ifndef SOAP_TYPE_SOAP_ENV__Header 
    258 #define SOAP_TYPE_SOAP_ENV__Header (46
     248#define SOAP_TYPE_SOAP_ENV__Header (45
    259249/* SOAP Header: */ 
    260250struct SOAP_ENV__Header 
     
    268258 
    269259#ifndef SOAP_TYPE_SOAP_ENV__Code 
    270 #define SOAP_TYPE_SOAP_ENV__Code (47
     260#define SOAP_TYPE_SOAP_ENV__Code (46
    271261/* SOAP Fault Code: */ 
    272262struct SOAP_ENV__Code 
     
    279269 
    280270#ifndef SOAP_TYPE_SOAP_ENV__Detail 
    281 #define SOAP_TYPE_SOAP_ENV__Detail (49
     271#define SOAP_TYPE_SOAP_ENV__Detail (48
    282272/* SOAP-ENV:Detail */ 
    283273struct SOAP_ENV__Detail 
     
    291281 
    292282#ifndef SOAP_TYPE_SOAP_ENV__Reason 
    293 #define SOAP_TYPE_SOAP_ENV__Reason (52
     283#define SOAP_TYPE_SOAP_ENV__Reason (51
    294284/* SOAP-ENV:Reason */ 
    295285struct SOAP_ENV__Reason 
     
    301291 
    302292#ifndef SOAP_TYPE_SOAP_ENV__Fault 
    303 #define SOAP_TYPE_SOAP_ENV__Fault (53
     293#define SOAP_TYPE_SOAP_ENV__Fault (52
    304294/* SOAP Fault: */ 
    305295struct SOAP_ENV__Fault 
     
    370360SOAP_FMAC5 int SOAP_FMAC6 ns__ping(struct soap*, char *a, char **result); 
    371361 
    372 SOAP_FMAC5 int SOAP_FMAC6 ns__visitURL(struct soap*, char *a, char **result); 
     362SOAP_FMAC5 int SOAP_FMAC6 ns__visitURL(struct soap*, char *URL, struct ns__allEvents &result); 
    373363 
    374364SOAP_FMAC5 int SOAP_FMAC6 ns__sendFileBase64(struct soap*, char *fileName, char *data, unsigned int encodedLength, unsigned int decodedLength, int &result); 
     
    391381SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns__ping(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *a, char **result); 
    392382 
    393 SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns__visitURL(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *a, char **result); 
     383SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns__visitURL(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *URL, struct ns__allEvents &result); 
    394384 
    395385SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns__sendFileBase64(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *fileName, char *data, unsigned int encodedLength, unsigned int decodedLength, int &result);