Changeset 1778

Show
Ignore:
Timestamp:
08/29/08 17:11:05 (3 months ago)
Author:
xkovah
Message:

added some messages, removed some others. done for now

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • capture-mod/trunk/CaptureClient.sln

    r1777 r1778  
    1717    GlobalSection(ProjectConfigurationPlatforms) = postSolution 
    1818        {4A258E9F-0B4B-40EF-B6C6-E69C630E5CAC}.Debug|Win32.ActiveCfg = Debug|Win32 
    19         {4A258E9F-0B4B-40EF-B6C6-E69C630E5CAC}.Debug|Win32.Build.0 = Debug|Win32 
    2019        {4A258E9F-0B4B-40EF-B6C6-E69C630E5CAC}.Release|Win32.ActiveCfg = Release|Win32 
    2120        {4A258E9F-0B4B-40EF-B6C6-E69C630E5CAC}.Release|Win32.Build.0 = Release|Win32 
     
    2423        {AE2C8E80-7D21-47AD-987B-43E0708AE549}.Release|Win32.Build.0 = Release|Win32 
    2524        {4EF34E6D-B30C-46E5-9FC5-967ECEADE2CD}.Debug|Win32.ActiveCfg = Debug|Win32 
    26         {4EF34E6D-B30C-46E5-9FC5-967ECEADE2CD}.Debug|Win32.Build.0 = Debug|Win32 
    2725        {4EF34E6D-B30C-46E5-9FC5-967ECEADE2CD}.Release|Win32.ActiveCfg = Release|Win32 
    2826        {4EF34E6D-B30C-46E5-9FC5-967ECEADE2CD}.Release|Win32.Build.0 = Release|Win32 
  • capture-mod/trunk/CaptureSoapServer.cpp

    r1777 r1778  
    207207 
    208208//Give it a url to browse to 
    209 int ns__visitURL(struct soap *soap, char * url, struct ns__allEvents &result){ 
     209int ns__visitURL(struct soap *soap, char * url, int &result){ 
    210210    char debug = 1; 
    211211    wchar_t xURL[1024]; 
     
    232232    //being able to get richer information back 
    233233 
    234     //hack, becase of the above 
    235     Sleep(5000); 
    236     if(!regList.empty() || !fileList.empty() || !procList.empty()){ 
    237         goto done; 
    238     } 
    239     Sleep(5000); 
    240     if(!regList.empty() || !fileList.empty() || !procList.empty()){ 
    241         goto done; 
    242     } 
    243     Sleep(5000); 
    244     if(!regList.empty() || !fileList.empty() || !procList.empty()){ 
    245         goto done; 
    246     } 
    247     Sleep(5000); 
    248  
    249 done: 
    250     struct ns__allEvents * all = soap_new_ns__allEvents(soap, 1); 
    251     memset(all, 0, sizeof(struct ns__allEvents)); 
    252  
    253     if(!regList.empty() || !fileList.empty() || !procList.empty()){ 
    254         int ret = ns__returnEvents(soap, -1, *all); 
    255         if(debug) printf("all->regEvents = %#x, all->fileEvents = %#x, all->procEvents = %#x\n", all->regEvents, all->fileEvents, all->procEvents); 
    256         return ret; 
    257     } 
    258     else{ 
    259         return SOAP_OK; 
    260     } 
     234    result = 1; //No meaning. Define some meaningful return values if desired 
     235 
     236    return SOAP_OK; 
    261237} 
    262238 
     
    431407//If maxEventsReturned == -1, then then send as many as possible. 
    432408int ns__returnEvents(struct soap *soap, int maxEventsToReturn, struct ns__allEvents &result){ 
    433     char debug = 0
     409    char debug = 1
    434410 
    435411    struct ns__allEvents * all = soap_new_ns__allEvents(soap, 1); 
     
    469445                int * b = (int *)&regList.front(); 
    470446                for(int i = 0; i < 8; i++){ 
    471                     printf("b[%d] = %#x\n", i, b[i]); 
     447                    printf("regEvent[%d] = %#x\n", i, b[i]); 
    472448                } 
    473449            } 
  • capture-mod/trunk/Thread.h

    r1644 r1778  
    6969        DWORD threadID; 
    7070        hThread = CreateThread(0, 0, threadProc, _threadObj, 0, &threadID); 
    71         printf("created threadID = %#x, giving it name %s\n", threadID, name); 
    7271        setThreadName( threadID, name); 
    7372        return threadID; 
  • capture-mod/trunk/Visitor.cpp

    r1724 r1778  
    3939    while(true) 
    4040    { 
    41         printf("Visitor::run, waiting\n"); 
    4241        WaitForSingleObject(hQueueNotEmpty, INFINITE); 
    43         printf("Visitor::run, runing\n"); 
    4442        VisitPair visit = toVisit.front(); 
    4543        toVisit.pop(); 
  • capture-mod/trunk/capture.wsdl

    r1777 r1778  
    9797</message> 
    9898 
    99 <message name="visitURL"> 
     99<message name="visitURLRequest"> 
    100100 <part name="URL" type="xsd:string"/> 
    101101</message> 
    102102 
    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"/> 
     103<message name="visitURLResponse"> 
     104 <part name="result" type="xsd:int"/> 
    107105</message> 
    108106 
     
    141139</message> 
    142140 
     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 
    143147<message name="sendMIMERequest"> 
    144148 <part name="magicNumber" type="xsd:int"/> 
     
    157161 <operation name="visitURL"> 
    158162  <documentation>Service definition of function ns__visitURL</documentation> 
    159   <input message="tns:visitURL"/> 
    160   <output message="tns:allEvents"/> 
     163  <input message="tns:visitURLRequest"/> 
     164  <output message="tns:visitURLResponse"/> 
    161165 </operation> 
    162166 <operation name="sendFileBase64"> 
  • capture-mod/trunk/captureGSOAP.h

    r1777 r1778  
    7272 
    7373int ns__ping(char * a, char ** result); 
    74 int ns__visitURL(char * URL, struct ns__allEvents &result); 
     74int ns__visitURL(char * URL, int &result); 
    7575int ns__sendFileBase64(char * fileName, char * data, unsigned int encodedLength, unsigned int decodedLength, int &result); 
    7676int ns__receiveFileBase64(char * fileName, ns__receiveFileStruct &result); 
  • capture-mod/trunk/soapC.cpp

    r1777 r1778  
    88#include "soapH.h" 
    99 
    10 SOAP_SOURCE_STAMP("@(#) soapC.cpp ver 2.7.10 2008-08-29 08:12:30 GMT") 
     10SOAP_SOURCE_STAMP("@(#) soapC.cpp ver 2.7.10 2008-08-29 08:41:22 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"); 
    182184    case SOAP_TYPE_ns__ping: 
    183185        return soap_in_ns__ping(soap, NULL, NULL, "ns:ping"); 
     
    273275            return soap_in_ns__visitURL(soap, NULL, NULL, NULL); 
    274276        } 
     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        } 
    275281        if (!soap_match_tag(soap, t, "ns:ping")) 
    276282        {   *type = SOAP_TYPE_ns__ping; 
     
    419425    case SOAP_TYPE_ns__visitURL: 
    420426        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"); 
    421429    case SOAP_TYPE_ns__ping: 
    422430        return soap_out_ns__ping(soap, tag, id, (const struct ns__ping *)ptr, "ns:ping"); 
     
    505513        soap_serialize_ns__visitURL(soap, (const struct ns__visitURL *)ptr); 
    506514        break; 
     515    case SOAP_TYPE_ns__visitURLResponse: 
     516        soap_serialize_ns__visitURLResponse(soap, (const struct ns__visitURLResponse *)ptr); 
     517        break; 
    507518    case SOAP_TYPE_ns__ping: 
    508519        soap_serialize_ns__ping(soap, (const struct ns__ping *)ptr); 
     
    597608    case SOAP_TYPE_ns__ping: 
    598609        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); 
    599612    case SOAP_TYPE_ns__visitURL: 
    600613        return (void*)soap_instantiate_ns__visitURL(soap, -1, type, arrayType, n); 
     
    704717            delete[] (struct ns__ping*)p->ptr; 
    705718        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; 
    706725    case SOAP_TYPE_ns__visitURL: 
    707726        if (p->size < 0) 
     
    26032622    DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying struct ns__visitURL %p -> %p\n", q, p)); 
    26042623    *(struct ns__visitURL*)p = *(struct ns__visitURL*)q; 
     2624} 
     2625 
     2626SOAP_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    soap_default_int(soap, &a->result); 
     2630} 
     2631 
     2632SOAP_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} 
     2636 
     2637SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns__visitURLResponse(struct soap *soap, const struct ns__visitURLResponse *a, const char *tag, const char *type) 
     2638{ 
     2639    register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ns__visitURLResponse); 
     2640    if (soap_out_ns__visitURLResponse(soap, tag, id, a, type)) 
     2641        return soap->error; 
     2642    return soap_putindependent(soap); 
     2643} 
     2644 
     2645SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns__visitURLResponse(struct soap *soap, const char *tag, int id, const struct ns__visitURLResponse *a, const char *type) 
     2646{ 
     2647    if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns__visitURLResponse), type)) 
     2648        return soap->error; 
     2649    if (soap_out_int(soap, "result", -1, &a->result, "")) 
     2650        return soap->error; 
     2651    return soap_element_end_out(soap, tag); 
     2652} 
     2653 
     2654SOAP_FMAC3 struct ns__visitURLResponse * SOAP_FMAC4 soap_get_ns__visitURLResponse(struct soap *soap, struct ns__visitURLResponse *p, const char *tag, const char *type) 
     2655{ 
     2656    if ((p = soap_in_ns__visitURLResponse(soap, tag, p, type))) 
     2657        if (soap_getindependent(soap)) 
     2658            return NULL; 
     2659    return p; 
     2660} 
     2661 
     2662SOAP_FMAC3 struct ns__visitURLResponse * SOAP_FMAC4 soap_in_ns__visitURLResponse(struct soap *soap, const char *tag, struct ns__visitURLResponse *a, const char *type) 
     2663{ 
     2664    short soap_flag_result = 1; 
     2665    if (soap_element_begin_in(soap, tag, 0, type)) 
     2666        return NULL; 
     2667    a = (struct ns__visitURLResponse *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ns__visitURLResponse, sizeof(struct ns__visitURLResponse), 0, NULL, NULL, NULL); 
     2668    if (!a) 
     2669        return NULL; 
     2670    soap_default_ns__visitURLResponse(soap, a); 
     2671    if (soap->body && !*soap->href) 
     2672    { 
     2673        for (;;) 
     2674        {   soap->error = SOAP_TAG_MISMATCH; 
     2675            if (soap_flag_result && soap->error == SOAP_TAG_MISMATCH) 
     2676                if (soap_in_int(soap, "result", &a->result, "xsd:int")) 
     2677                {   soap_flag_result--; 
     2678                    continue; 
     2679                } 
     2680            if (soap->error == SOAP_TAG_MISMATCH) 
     2681                soap->error = soap_ignore_element(soap); 
     2682            if (soap->error == SOAP_NO_TAG) 
     2683                break; 
     2684            if (soap->error) 
     2685                return NULL; 
     2686        } 
     2687        if (soap_element_end_in(soap, tag)) 
     2688            return NULL; 
     2689    } 
     2690    else 
     2691    {   a = (struct ns__visitURLResponse *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_ns__visitURLResponse, 0, sizeof(struct ns__visitURLResponse), 0, NULL); 
     2692        if (soap->body && soap_element_end_in(soap, tag)) 
     2693            return NULL; 
     2694    } 
     2695    if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_result > 0)) 
     2696    {   soap->error = SOAP_OCCURS; 
     2697        return NULL; 
     2698    } 
     2699    return a; 
     2700} 
     2701 
     2702SOAP_FMAC5 struct ns__visitURLResponse * SOAP_FMAC6 soap_new_ns__visitURLResponse(struct soap *soap, int n) 
     2703{   return soap_instantiate_ns__visitURLResponse(soap, n, NULL, NULL, NULL); 
     2704} 
     2705 
     2706SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ns__visitURLResponse(struct soap *soap, struct ns__visitURLResponse *p) 
     2707{   soap_delete(soap, p); 
     2708} 
     2709 
     2710SOAP_FMAC3 struct ns__visitURLResponse * SOAP_FMAC4 soap_instantiate_ns__visitURLResponse(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size) 
     2711{ 
     2712    DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ns__visitURLResponse(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:"")); 
     2713    struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ns__visitURLResponse, n, soap_fdelete); 
     2714    if (!cp) 
     2715        return NULL; 
     2716    if (n < 0) 
     2717    {   cp->ptr = (void*)new struct ns__visitURLResponse; 
     2718        if (size) 
     2719            *size = sizeof(struct ns__visitURLResponse); 
     2720    } 
     2721    else 
     2722    {   cp->ptr = (void*)new struct ns__visitURLResponse[n]; 
     2723        if (!cp->ptr) 
     2724        {   soap->error = SOAP_EOM; 
     2725            return NULL; 
     2726        } 
     2727        if (size) 
     2728            *size = n * sizeof(struct ns__visitURLResponse); 
     2729    } 
     2730        DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr)); 
     2731    return (struct ns__visitURLResponse*)cp->ptr; 
     2732} 
     2733SOAP_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) 
     2734{ 
     2735    DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying struct ns__visitURLResponse %p -> %p\n", q, p)); 
     2736    *(struct ns__visitURLResponse*)p = *(struct ns__visitURLResponse*)q; 
    26052737} 
    26062738 
  • capture-mod/trunk/soapClient.cpp

    r1777 r1778  
    77#include "soapH.h" 
    88 
    9 SOAP_SOURCE_STAMP("@(#) soapClient.cpp ver 2.7.10 2008-08-29 08:12:30 GMT") 
     9SOAP_SOURCE_STAMP("@(#) soapClient.cpp ver 2.7.10 2008-08-29 08:41:22 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 *URL, struct ns__allEvents &result) 
     65SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns__visitURL(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *URL, int &result) 
    6666{   struct ns__visitURL soap_tmp_ns__visitURL; 
     67    struct ns__visitURLResponse *soap_tmp_ns__visitURLResponse; 
    6768    if (!soap_endpoint) 
    6869        soap_endpoint = "http://0.0.0.0:1234"; 
     
    9495     || soap_end_send(soap)) 
    9596        return soap_closesock(soap); 
    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); 
     97    soap_default_int(soap, &result); 
     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    result = soap_tmp_ns__visitURLResponse->result; 
    112114    return soap_closesock(soap); 
    113115} 
  • capture-mod/trunk/soapH.h

    r1776 r1778  
    6060 
    6161#ifndef SOAP_TYPE_SOAP_ENV__Fault 
    62 #define SOAP_TYPE_SOAP_ENV__Fault (52
     62#define SOAP_TYPE_SOAP_ENV__Fault (53
    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 (51
     80#define SOAP_TYPE_SOAP_ENV__Reason (52
    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 (48
     98#define SOAP_TYPE_SOAP_ENV__Detail (49
    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 (46
     116#define SOAP_TYPE_SOAP_ENV__Code (47
    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 (45
     134#define SOAP_TYPE_SOAP_ENV__Header (46
    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 (44
     150#define SOAP_TYPE_ns__sendMIME (45
    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 (43
     164#define SOAP_TYPE_ns__sendMIMEResponse (44
    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 (41
     178#define SOAP_TYPE_ns__returnEvents (42
    179179#endif 
    180180SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__returnEvents(struct soap*, struct ns__returnEvents *); 
     
    260260 
    261261#ifndef SOAP_TYPE_ns__visitURL 
    262 #define SOAP_TYPE_ns__visitURL (29
     262#define SOAP_TYPE_ns__visitURL (30
    263263#endif 
    264264SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__visitURL(struct soap*, struct ns__visitURL *); 
     
    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 (29) 
     277#endif 
     278SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__visitURLResponse(struct soap*, struct ns__visitURLResponse *); 
     279SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns__visitURLResponse(struct soap*, const struct ns__visitURLResponse *); 
     280SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns__visitURLResponse(struct soap*, const struct ns__visitURLResponse *, const char*, const char*); 
     281SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns__visitURLResponse(struct soap*, const char*, int, const struct ns__visitURLResponse *, const char*); 
     282SOAP_FMAC3 struct ns__visitURLResponse * SOAP_FMAC4 soap_get_ns__visitURLResponse(struct soap*, struct ns__visitURLResponse *, const char*, const char*); 
     283SOAP_FMAC3 struct ns__visitURLResponse * SOAP_FMAC4 soap_in_ns__visitURLResponse(struct soap*, const char*, struct ns__visitURLResponse *, const char*); 
     284SOAP_FMAC5 struct ns__visitURLResponse * SOAP_FMAC6 soap_new_ns__visitURLResponse(struct soap*, int); 
     285SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ns__visitURLResponse(struct soap*, struct ns__visitURLResponse*); 
     286SOAP_FMAC3 struct ns__visitURLResponse * SOAP_FMAC4 soap_instantiate_ns__visitURLResponse(struct soap*, int, const char*, const char*, size_t*); 
     287SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns__visitURLResponse(struct soap*, int, int, void*, size_t, const void*, size_t); 
     288 
    275289#ifndef SOAP_TYPE_ns__ping 
    276290#define SOAP_TYPE_ns__ping (26) 
     
    430444 
    431445#ifndef SOAP_TYPE_PointerToSOAP_ENV__Reason 
    432 #define SOAP_TYPE_PointerToSOAP_ENV__Reason (54
     446#define SOAP_TYPE_PointerToSOAP_ENV__Reason (55
    433447#endif 
    434448SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerToSOAP_ENV__Reason(struct soap*, struct SOAP_ENV__Reason *const*); 
     
    443457 
    444458#ifndef SOAP_TYPE_PointerToSOAP_ENV__Detail 
    445 #define SOAP_TYPE_PointerToSOAP_ENV__Detail (53
     459#define SOAP_TYPE_PointerToSOAP_ENV__Detail (54
    446460#endif 
    447461SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerToSOAP_ENV__Detail(struct soap*, struct SOAP_ENV__Detail *const*); 
     
    456470 
    457471#ifndef SOAP_TYPE_PointerToSOAP_ENV__Code 
    458 #define SOAP_TYPE_PointerToSOAP_ENV__Code (47
     472#define SOAP_TYPE_PointerToSOAP_ENV__Code (48
    459473#endif 
    460474SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerToSOAP_ENV__Code(struct soap*, struct SOAP_ENV__Code *const*); 
  • capture-mod/trunk/soapServer.cpp

    r1777 r1778  
    77#include "soapH.h" 
    88 
    9 SOAP_SOURCE_STAMP("@(#) soapServer.cpp ver 2.7.10 2008-08-29 08:12:30 GMT") 
     9SOAP_SOURCE_STAMP("@(#) soapServer.cpp ver 2.7.10 2008-08-29 08:41:22 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__allEvents result
    141     soap_default_ns__allEvents(soap, &result); 
     140    struct ns__visitURLResponse soap_tmp_ns__visitURLResponse
     141    soap_default_ns__visitURLResponse(soap, &soap_tmp_ns__visitURLResponse); 
    142142    soap_default_ns__visitURL(soap, &soap_tmp_ns__visitURL); 
    143143    soap->encodingStyle = ""; 
     
    148148     || soap_end_recv(soap)) 
    149149        return soap->error; 
    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", "") 
     150    soap->error = ns__visitURL(soap, soap_tmp_ns__visitURL.URL, soap_tmp_ns__visitURLResponse.result); 
     151    if (soap->error) 
     152        return soap->error; 
     153    soap_serializeheader(soap); 
     154    soap_serialize_ns__visitURLResponse(soap, &soap_tmp_ns__visitURLResponse); 
     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__visitURLResponse(soap, &soap_tmp_ns__visitURLResponse, "ns:visitURLResponse", "") 
     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__visitURLResponse(soap, &soap_tmp_ns__visitURLResponse, "ns:visitURLResponse", "") 
    172172     || soap_body_end_out(soap) 
    173173     || soap_envelope_end_out(soap) 
  • capture-mod/trunk/soapStub.h

    r1776 r1778  
    151151#endif 
    152152 
     153#ifndef SOAP_TYPE_ns__visitURLResponse 
     154#define SOAP_TYPE_ns__visitURLResponse (29) 
     155/* ns:visitURLResponse */ 
     156struct ns__visitURLResponse 
     157{ 
     158public: 
     159    int result; /* SOAP 1.2 RPC return element (when namespace qualified) */    /* required element of type xsd:int */ 
     160}; 
     161#endif 
     162 
    153163#ifndef SOAP_TYPE_ns__visitURL 
    154 #define SOAP_TYPE_ns__visitURL (29
     164#define SOAP_TYPE_ns__visitURL (30
    155165/* ns:visitURL */ 
    156166struct ns__visitURL 
     
    216226 
    217227#ifndef SOAP_TYPE_ns__returnEvents 
    218 #define SOAP_TYPE_ns__returnEvents (41
     228#define SOAP_TYPE_ns__returnEvents (42
    219229/* ns:returnEvents */ 
    220230struct ns__returnEvents 
     
    226236 
    227237#ifndef SOAP_TYPE_ns__sendMIMEResponse 
    228 #define SOAP_TYPE_ns__sendMIMEResponse (43
     238#define SOAP_TYPE_ns__sendMIMEResponse (44
    229239/* ns:sendMIMEResponse */ 
    230240struct ns__sendMIMEResponse 
     
    236246 
    237247#ifndef SOAP_TYPE_ns__sendMIME 
    238 #define SOAP_TYPE_ns__sendMIME (44
     248#define SOAP_TYPE_ns__sendMIME (45
    239249/* ns:sendMIME */ 
    240250struct ns__sendMIME 
     
    246256 
    247257#ifndef SOAP_TYPE_SOAP_ENV__Header 
    248 #define SOAP_TYPE_SOAP_ENV__Header (45
     258#define SOAP_TYPE_SOAP_ENV__Header (46
    249259/* SOAP Header: */ 
    250260struct SOAP_ENV__Header 
     
    258268 
    259269#ifndef SOAP_TYPE_SOAP_ENV__Code 
    260 #define SOAP_TYPE_SOAP_ENV__Code (46
     270#define SOAP_TYPE_SOAP_ENV__Code (47
    261271/* SOAP Fault Code: */ 
    262272struct SOAP_ENV__Code 
     
    269279 
    270280#ifndef SOAP_TYPE_SOAP_ENV__Detail 
    271 #define SOAP_TYPE_SOAP_ENV__Detail (48
     281#define SOAP_TYPE_SOAP_ENV__Detail (49
    272282/* SOAP-ENV:Detail */ 
    273283struct SOAP_ENV__Detail 
     
    281291 
    282292#ifndef SOAP_TYPE_SOAP_ENV__Reason 
    283 #define SOAP_TYPE_SOAP_ENV__Reason (51
     293#define SOAP_TYPE_SOAP_ENV__Reason (52
    284294/* SOAP-ENV:Reason */ 
    285295struct SOAP_ENV__Reason 
     
    291301 
    292302#ifndef SOAP_TYPE_SOAP_ENV__Fault 
    293 #define SOAP_TYPE_SOAP_ENV__Fault (52
     303#define SOAP_TYPE_SOAP_ENV__Fault (53
    294304/* SOAP Fault: */ 
    295305struct SOAP_ENV__Fault 
     
    360370SOAP_FMAC5 int SOAP_FMAC6 ns__ping(struct soap*, char *a, char **result); 
    361371 
    362 SOAP_FMAC5 int SOAP_FMAC6 ns__visitURL(struct soap*, char *URL, struct ns__allEvents &result); 
     372SOAP_FMAC5 int SOAP_FMAC6 ns__visitURL(struct soap*, char *URL, int &result); 
    363373 
    364374SOAP_FMAC5 int SOAP_FMAC6 ns__sendFileBase64(struct soap*, char *fileName, char *data, unsigned int encodedLength, unsigned int decodedLength, int &result); 
     
    381391SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns__ping(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *a, char **result); 
    382392 
    383 SOAP_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); 
     393SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns__visitURL(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *URL, int &result); 
    384394 
    385395SOAP_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);