Changeset 1776
- Timestamp:
- 08/29/08 13:23:52 (3 months ago)
- Files:
-
- capture-mod/trunk/Analyzer.cpp (modified) (1 diff)
- capture-mod/trunk/CaptureClient.sln (modified) (1 diff)
- capture-mod/trunk/CaptureSoapServer.cpp (modified) (4 diffs)
- capture-mod/trunk/ExclusionLists/RegistryMonitor.exl (modified) (1 diff)
- capture-mod/trunk/Makefile (modified) (1 diff)
- capture-mod/trunk/capture.wsdl (modified) (3 diffs)
- capture-mod/trunk/captureGSOAP.h (modified) (2 diffs)
- capture-mod/trunk/getEvents.pl (added)
- capture-mod/trunk/openDoc.pl (modified) (1 diff)
- capture-mod/trunk/ping.pl (added)
- capture-mod/trunk/soapC.cpp (modified) (13 diffs)
- capture-mod/trunk/soapClient.cpp (modified) (3 diffs)
- capture-mod/trunk/soapH.h (modified) (12 diffs)
- capture-mod/trunk/soapServer.cpp (modified) (3 diffs)
- capture-mod/trunk/soapStub.h (modified) (12 diffs)
- capture-mod/trunk/visitURL.pl (added)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
capture-mod/trunk/Analyzer.cpp
r1766 r1776 378 378 processType = L"terminated"; 379 379 } 380 //Xeno sez ? Is this comment still valid 381 //FIXME: use the right constructor instead 380 //TODO: cleanup a little 382 381 vector<wstring> extra; 383 382 wchar_t parentProcessIdString[11]; capture-mod/trunk/CaptureClient.sln
r1774 r1776 23 23 {AE2C8E80-7D21-47AD-987B-43E0708AE549}.Release|Win32.Build.0 = Release|Win32 24 24 {4EF34E6D-B30C-46E5-9FC5-967ECEADE2CD}.Debug|Win32.ActiveCfg = Debug|Win32 25 {4EF34E6D-B30C-46E5-9FC5-967ECEADE2CD}.Debug|Win32.Build.0 = Debug|Win3226 25 {4EF34E6D-B30C-46E5-9FC5-967ECEADE2CD}.Release|Win32.ActiveCfg = Release|Win32 27 26 {4EF34E6D-B30C-46E5-9FC5-967ECEADE2CD}.Release|Win32.Build.0 = Release|Win32 capture-mod/trunk/CaptureSoapServer.cpp
r1774 r1776 31 31 32 32 CaptureSoapServer::~CaptureSoapServer(){ 33 //FIXME: I have no idea if these are appropriate here. Also need to find the correct way to cleanly shut down34 //so that it doesn't output a connection error at the end.35 33 soap_destroy(&soap); 36 34 soap_end(&soap); … … 207 205 208 206 //Give it a url to browse to 209 int ns__visitURL(struct soap *soap, char * url, char **result){207 int ns__visitURL(struct soap *soap, char * url, struct ns__allEvents &result){ 210 208 wchar_t xURL[1024]; 211 209 wsprintf(xURL, L"%hs", url); … … 221 219 e.dataLength = 0; 222 220 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. 223 224 EventController::getInstance()->notifyListeners(&e); 224 225 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 } 226 235 } 227 236 … … 432 441 int * b = (int *)®List.front(); 433 442 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]); 435 444 } 436 445 } capture-mod/trunk/ExclusionLists/RegistryMonitor.exl
r1248 r1776 312 312 + SetValueKey C:\\WINDOWS\\system32\\spoolsv\.exe HKLM\\SYSTEM\\ControlSet001\\Control\\Print\\Printers 313 313 + 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 19 19 echo " - release-bat - will build the capture-bat solution from scratch. The resulting" 20 20 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 24 release-hpc: prepare \ 24 25 build \ 25 26 copy-hpc \ capture-mod/trunk/capture.wsdl
r1770 r1776 97 97 </message> 98 98 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"/> 105 107 </message> 106 108 … … 139 141 </message> 140 142 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 147 143 <message name="sendMIMERequest"> 148 144 <part name="magicNumber" type="xsd:int"/> … … 161 157 <operation name="visitURL"> 162 158 <documentation>Service definition of function ns__visitURL</documentation> 163 <input message="tns:visitURL Request"/>164 <output message="tns: visitURLResponse"/>159 <input message="tns:visitURL"/> 160 <output message="tns:allEvents"/> 165 161 </operation> 166 162 <operation name="sendFileBase64"> capture-mod/trunk/captureGSOAP.h
r1770 r1776 71 71 } ns__receiveFileStruct; 72 72 73 74 73 int ns__ping(char * a, char ** result); 75 int ns__visitURL(char * a, char **result);74 int ns__visitURL(char * URL, struct ns__allEvents &result); 76 75 int ns__sendFileBase64(char * fileName, char * data, unsigned int encodedLength, unsigned int decodedLength, int &result); 77 76 int ns__receiveFileBase64(char * fileName, ns__receiveFileStruct &result); … … 79 78 int ns__returnEvents(int maxEventsToReturn, struct ns__allEvents &result); 80 79 81 //Not working 80 //Not working, see definition comments 82 81 int ns__sendMIME(int magicNumber, int &result); capture-mod/trunk/openDoc.pl
r1764 r1776 6 6 #use SOAP::Lite; 7 7 8 #NOTE: the first parameter of name() must exactly match the variable name in captureGSOAP.h 8 9 $fileNameSOAP = SOAP::Data->name(fileName => $ARGV[0]); 9 10 $waitTimeMillisecSOAP = SOAP::Data->name(waitTimeMillisec => 20000); capture-mod/trunk/soapC.cpp
r1771 r1776 8 8 #include "soapH.h" 9 9 10 SOAP_SOURCE_STAMP("@(#) soapC.cpp ver 2.7.10 2008-08-2 8 01:59:02 GMT")10 SOAP_SOURCE_STAMP("@(#) soapC.cpp ver 2.7.10 2008-08-29 03:46:42 GMT") 11 11 12 12 … … 180 180 case SOAP_TYPE_ns__visitURL: 181 181 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");184 182 case SOAP_TYPE_ns__ping: 185 183 return soap_in_ns__ping(soap, NULL, NULL, "ns:ping"); … … 275 273 return soap_in_ns__visitURL(soap, NULL, NULL, NULL); 276 274 } 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 }281 275 if (!soap_match_tag(soap, t, "ns:ping")) 282 276 { *type = SOAP_TYPE_ns__ping; … … 425 419 case SOAP_TYPE_ns__visitURL: 426 420 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");429 421 case SOAP_TYPE_ns__ping: 430 422 return soap_out_ns__ping(soap, tag, id, (const struct ns__ping *)ptr, "ns:ping"); … … 513 505 soap_serialize_ns__visitURL(soap, (const struct ns__visitURL *)ptr); 514 506 break; 515 case SOAP_TYPE_ns__visitURLResponse:516 soap_serialize_ns__visitURLResponse(soap, (const struct ns__visitURLResponse *)ptr);517 break;518 507 case SOAP_TYPE_ns__ping: 519 508 soap_serialize_ns__ping(soap, (const struct ns__ping *)ptr); … … 608 597 case SOAP_TYPE_ns__ping: 609 598 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);612 599 case SOAP_TYPE_ns__visitURL: 613 600 return (void*)soap_instantiate_ns__visitURL(soap, -1, type, arrayType, n); … … 717 704 delete[] (struct ns__ping*)p->ptr; 718 705 break; 719 case SOAP_TYPE_ns__visitURLResponse:720 if (p->size < 0)721 delete (struct ns__visitURLResponse*)p->ptr;722 else723 delete[] (struct ns__visitURLResponse*)p->ptr;724 break;725 706 case SOAP_TYPE_ns__visitURL: 726 707 if (p->size < 0) … … 2517 2498 { 2518 2499 (void)soap; (void)a; /* appease -Wall -Werror */ 2519 soap_default_string(soap, &a-> a);2500 soap_default_string(soap, &a->URL); 2520 2501 } 2521 2502 … … 2523 2504 { 2524 2505 (void)soap; (void)a; /* appease -Wall -Werror */ 2525 soap_serialize_string(soap, &a-> a);2506 soap_serialize_string(soap, &a->URL); 2526 2507 } 2527 2508 … … 2538 2519 if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns__visitURL), type)) 2539 2520 return soap->error; 2540 if (soap_out_string(soap, " a", -1, &a->a, ""))2521 if (soap_out_string(soap, "URL", -1, &a->URL, "")) 2541 2522 return soap->error; 2542 2523 return soap_element_end_out(soap, tag); … … 2553 2534 SOAP_FMAC3 struct ns__visitURL * SOAP_FMAC4 soap_in_ns__visitURL(struct soap *soap, const char *tag, struct ns__visitURL *a, const char *type) 2554 2535 { 2555 short soap_flag_ a= 1;2536 short soap_flag_URL = 1; 2556 2537 if (soap_element_begin_in(soap, tag, 0, type)) 2557 2538 return NULL; … … 2564 2545 for (;;) 2565 2546 { 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--; 2569 2550 continue; 2570 2551 } … … 2622 2603 DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying struct ns__visitURL %p -> %p\n", q, p)); 2623 2604 *(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 else2692 { 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 else2719 { 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;2734 2605 } 2735 2606 capture-mod/trunk/soapClient.cpp
r1771 r1776 7 7 #include "soapH.h" 8 8 9 SOAP_SOURCE_STAMP("@(#) soapClient.cpp ver 2.7.10 2008-08-2 8 01:59:02 GMT")9 SOAP_SOURCE_STAMP("@(#) soapClient.cpp ver 2.7.10 2008-08-29 03:46:42 GMT") 10 10 11 11 … … 63 63 } 64 64 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)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) 66 66 { 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; 72 71 soap_begin(soap); 73 72 soap_serializeheader(soap); … … 95 94 || soap_end_send(soap)) 96 95 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); 115 112 return soap_closesock(soap); 116 113 } capture-mod/trunk/soapH.h
r1770 r1776 60 60 61 61 #ifndef SOAP_TYPE_SOAP_ENV__Fault 62 #define SOAP_TYPE_SOAP_ENV__Fault (5 3)62 #define SOAP_TYPE_SOAP_ENV__Fault (52) 63 63 #endif 64 64 SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Fault(struct soap*, struct SOAP_ENV__Fault *); … … 78 78 79 79 #ifndef SOAP_TYPE_SOAP_ENV__Reason 80 #define SOAP_TYPE_SOAP_ENV__Reason (5 2)80 #define SOAP_TYPE_SOAP_ENV__Reason (51) 81 81 #endif 82 82 SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Reason(struct soap*, struct SOAP_ENV__Reason *); … … 96 96 97 97 #ifndef SOAP_TYPE_SOAP_ENV__Detail 98 #define SOAP_TYPE_SOAP_ENV__Detail (4 9)98 #define SOAP_TYPE_SOAP_ENV__Detail (48) 99 99 #endif 100 100 SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Detail(struct soap*, struct SOAP_ENV__Detail *); … … 114 114 115 115 #ifndef SOAP_TYPE_SOAP_ENV__Code 116 #define SOAP_TYPE_SOAP_ENV__Code (4 7)116 #define SOAP_TYPE_SOAP_ENV__Code (46) 117 117 #endif 118 118 SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Code(struct soap*, struct SOAP_ENV__Code *); … … 132 132 133 133 #ifndef SOAP_TYPE_SOAP_ENV__Header 134 #define SOAP_TYPE_SOAP_ENV__Header (4 6)134 #define SOAP_TYPE_SOAP_ENV__Header (45) 135 135 #endif 136 136 SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Header(struct soap*, struct SOAP_ENV__Header *); … … 148 148 149 149 #ifndef SOAP_TYPE_ns__sendMIME 150 #define SOAP_TYPE_ns__sendMIME (4 5)150 #define SOAP_TYPE_ns__sendMIME (44) 151 151 #endif 152 152 SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__sendMIME(struct soap*, struct ns__sendMIME *); … … 162 162 163 163 #ifndef SOAP_TYPE_ns__sendMIMEResponse 164 #define SOAP_TYPE_ns__sendMIMEResponse (4 4)164 #define SOAP_TYPE_ns__sendMIMEResponse (43) 165 165 #endif 166 166 SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__sendMIMEResponse(struct soap*, struct ns__sendMIMEResponse *); … … 176 176 177 177 #ifndef SOAP_TYPE_ns__returnEvents 178 #define SOAP_TYPE_ns__returnEvents (4 2)178 #define SOAP_TYPE_ns__returnEvents (41) 179 179 #endif 180 180 SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__returnEvents(struct soap*, struct ns__returnEvents *); … … 273 273 SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns__visitURL(struct soap*, int, int, void*, size_t, const void*, size_t); 274 274 275 #ifndef SOAP_TYPE_ns__visitURLResponse276 #define SOAP_TYPE_ns__visitURLResponse (28)277 #endif278 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 289 275 #ifndef SOAP_TYPE_ns__ping 290 276 #define SOAP_TYPE_ns__ping (26) … … 444 430 445 431 #ifndef SOAP_TYPE_PointerToSOAP_ENV__Reason 446 #define SOAP_TYPE_PointerToSOAP_ENV__Reason (5 5)432 #define SOAP_TYPE_PointerToSOAP_ENV__Reason (54) 447 433 #endif 448 434 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerToSOAP_ENV__Reason(struct soap*, struct SOAP_ENV__Reason *const*); … … 457 443 458 444 #ifndef SOAP_TYPE_PointerToSOAP_ENV__Detail 459 #define SOAP_TYPE_PointerToSOAP_ENV__Detail (5 4)445 #define SOAP_TYPE_PointerToSOAP_ENV__Detail (53) 460 446 #endif 461 447 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerToSOAP_ENV__Detail(struct soap*, struct SOAP_ENV__Detail *const*); … … 470 456 471 457 #ifndef SOAP_TYPE_PointerToSOAP_ENV__Code 472 #define SOAP_TYPE_PointerToSOAP_ENV__Code (4 8)458 #define SOAP_TYPE_PointerToSOAP_ENV__Code (47) 473 459 #endif 474 460 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerToSOAP_ENV__Code(struct soap*, struct SOAP_ENV__Code *const*); capture-mod/trunk/soapServer.cpp
r1771 r1776 7 7 #include "soapH.h" 8 8 9 SOAP_SOURCE_STAMP("@(#) soapServer.cpp ver 2.7.10 2008-08-2 8 01:59:02 GMT")9 SOAP_SOURCE_STAMP("@(#) soapServer.cpp ver 2.7.10 2008-08-29 03:46:42 GMT") 10 10 11 11 … … 138 138 SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns__visitURL(struct soap *soap) 139 139 { 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); 145 142 soap_default_ns__visitURL(soap, &soap_tmp_ns__visitURL); 146 143 soap->encodingStyle = ""; … … 151 148 || soap_end_recv(soap)) 152 149 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", "") 175 172 || soap_body_end_out(soap) 176 173 || soap_envelope_end_out(soap) capture-mod/trunk/soapStub.h
r1770 r1776 151 151 #endif 152 152 153 #ifndef SOAP_TYPE_ns__visitURLResponse154 #define SOAP_TYPE_ns__visitURLResponse (28)155 /* ns:visitURLResponse */156 struct ns__visitURLResponse157 {158 public:159 char **result; /* SOAP 1.2 RPC return element (when namespace qualified) */ /* optional element of type xsd:string */160 };161 #endif162 163 153 #ifndef SOAP_TYPE_ns__visitURL 164 154 #define SOAP_TYPE_ns__visitURL (29) … … 167 157 { 168 158 public: 169 char * a; /* optional element of type xsd:string */159 char *URL; /* optional element of type xsd:string */ 170 160 }; 171 161 #endif … … 226 216 227 217 #ifndef SOAP_TYPE_ns__returnEvents 228 #define SOAP_TYPE_ns__returnEvents (4 2)218 #define SOAP_TYPE_ns__returnEvents (41) 229 219 /* ns:returnEvents */ 230 220 struct ns__returnEvents … … 236 226 237 227 #ifndef SOAP_TYPE_ns__sendMIMEResponse 238 #define SOAP_TYPE_ns__sendMIMEResponse (4 4)228 #define SOAP_TYPE_ns__sendMIMEResponse (43) 239 229 /* ns:sendMIMEResponse */ 240 230 struct ns__sendMIMEResponse … … 246 236 247 237 #ifndef SOAP_TYPE_ns__sendMIME 248 #define SOAP_TYPE_ns__sendMIME (4 5)238 #define SOAP_TYPE_ns__sendMIME (44) 249 239 /* ns:sendMIME */ 250 240 struct ns__sendMIME … … 256 246 257 247 #ifndef SOAP_TYPE_SOAP_ENV__Header 258 #define SOAP_TYPE_SOAP_ENV__Header (4 6)248 #define SOAP_TYPE_SOAP_ENV__Header (45) 259 249 /* SOAP Header: */ 260 250 struct SOAP_ENV__Header … … 268 258 269 259 #ifndef SOAP_TYPE_SOAP_ENV__Code 270 #define SOAP_TYPE_SOAP_ENV__Code (4 7)260 #define SOAP_TYPE_SOAP_ENV__Code (46) 271 261 /* SOAP Fault Code: */ 272 262 struct SOAP_ENV__Code … … 279 269 280 270 #ifndef SOAP_TYPE_SOAP_ENV__Detail 281 #define SOAP_TYPE_SOAP_ENV__Detail (4 9)271 #define SOAP_TYPE_SOAP_ENV__Detail (48) 282 272 /* SOAP-ENV:Detail */ 283 273 struct SOAP_ENV__Detail … … 291 281 292 282 #ifndef SOAP_TYPE_SOAP_ENV__Reason 293 #define SOAP_TYPE_SOAP_ENV__Reason (5 2)283 #define SOAP_TYPE_SOAP_ENV__Reason (51) 294 284 /* SOAP-ENV:Reason */ 295 285 struct SOAP_ENV__Reason … … 301 291 302 292 #ifndef SOAP_TYPE_SOAP_ENV__Fault 303 #define SOAP_TYPE_SOAP_ENV__Fault (5 3)293 #define SOAP_TYPE_SOAP_ENV__Fault (52) 304 294 /* SOAP Fault: */ 305 295 struct SOAP_ENV__Fault … … 370 360 SOAP_FMAC5 int SOAP_FMAC6 ns__ping(struct soap*, char *a, char **result); 371 361 372 SOAP_FMAC5 int SOAP_FMAC6 ns__visitURL(struct soap*, char * a, char **result);362 SOAP_FMAC5 int SOAP_FMAC6 ns__visitURL(struct soap*, char *URL, struct ns__allEvents &result); 373 363 374 364 SOAP_FMAC5 int SOAP_FMAC6 ns__sendFileBase64(struct soap*, char *fileName, char *data, unsigned int encodedLength, unsigned int decodedLength, int &result); … … 391 381 SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns__ping(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *a, char **result); 392 382 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);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); 394 384 395 385 SOAP_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);
