Changeset 1586
- Timestamp:
- 05/20/08 14:00:19 (3 months ago)
- Files:
-
- capture-mod/trunk/Analyzer.cpp (modified) (2 diffs)
- capture-mod/trunk/Analyzer.h (modified) (1 diff)
- capture-mod/trunk/CaptureClient.cpp (modified) (2 diffs)
- capture-mod/trunk/CaptureClient.vcproj (modified) (1 diff)
- capture-mod/trunk/MySoapServer.cpp (modified) (6 diffs)
- capture-mod/trunk/MySoapServer.h (modified) (1 diff)
- capture-mod/trunk/calc.cpp (deleted)
- capture-mod/trunk/calc.h (deleted)
- capture-mod/trunk/captureGSOAP.h (added)
- capture-mod/trunk/install/CaptureBAT.exe (modified) (previous)
- capture-mod/trunk/soapC.cpp (modified) (23 diffs)
- capture-mod/trunk/soapClient.cpp (modified) (7 diffs)
- capture-mod/trunk/soapClientLib.cpp (modified) (1 diff)
- capture-mod/trunk/soapH.h (modified) (2 diffs)
- capture-mod/trunk/soapServer.cpp (modified) (7 diffs)
- capture-mod/trunk/soapServerLib.cpp (modified) (1 diff)
- capture-mod/trunk/soapStub.h (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
capture-mod/trunk/Analyzer.cpp
r1585 r1586 10 10 networkPacketDumper = NULL; 11 11 12 printf("\n\n\nin analyzer\n\n\n");13 12 onOptionChangedConnection = OptionsManager::getInstance()->connect_onOptionChanged(boost::bind(&Analyzer::onOptionChanged, this, _1)); 14 13 … … 17 16 18 17 server = s; 19 20 MySoapServer a = MySoapServer();21 18 22 19 processMonitor->start(); capture-mod/trunk/Analyzer.h
r1585 r1586 36 36 #include "NetworkPacketDumper.h" 37 37 #include "FileUploader.h" 38 #include "MySoapServer.h"39 38 40 39 using namespace std; capture-mod/trunk/CaptureClient.cpp
r1585 r1586 7 7 #include "ProcessManager.h" 8 8 #include "shellapi.h" 9 #include "MySoapServer.h" 9 10 using namespace std; 10 11 … … 50 51 hStopRunning = CreateEvent(NULL, FALSE, FALSE, NULL); 51 52 //XENO - Right here, set up the standalone SOAP server 53 MySoapServer a = MySoapServer(); 54 52 55 wstring serverIp = OptionsManager::getInstance()->getOption(L"server"); 53 56 server = new Server(serverIp, 7070); capture-mod/trunk/CaptureClient.vcproj
r1583 r1586 301 301 </File> 302 302 <File 303 RelativePath=".\calc.h"304 >305 </File>306 <File307 303 RelativePath=".\CaptureGlobal.h" 304 > 305 </File> 306 <File 307 RelativePath=".\captureGSOAP.h" 308 308 > 309 309 </File> capture-mod/trunk/MySoapServer.cpp
r1585 r1586 1 /*This file can be renamed later, but just plain "soapserver.cpp" 2 **is already created automatically by the soapcpp2 tool 3 **Created by Xeno Kovah of the MITRE HoneyClient Project 5/20/2008 4 */ 5 1 6 #include "MySoapServer.h" 2 7 … … 6 11 MySoapServer::MySoapServer(){ 7 12 8 printf("\n\n\nStarting MySoapServer thread\n");9 13 MySoapServerThread = new Thread(this); 10 14 MySoapServerThread->start("MySoapServer"); … … 17 21 MySoapServer::run(){ 18 22 23 char debug = 0; 24 //The below code is taken verbatim from the gsoap standalone server example page 19 25 struct soap soap; 20 26 SOCKET m, s; // master and slave sockets 21 27 22 printf("\n\n\nin MySoapServer run()\n");23 24 28 soap_init(&soap); 29 //TODO: This needs to be configurable 25 30 m = soap_bind(&soap, "192.168.0.131", 1234, 100); 26 31 if (m < 0) … … 28 33 else 29 34 { 30 fprintf(stderr, "Socket connection successful: master socket = %d\n", m);35 if(debug) fprintf(stderr, "Socket connection successful: master socket = %d\n", m); 31 36 for (int i = 1; ; i++) 32 37 { … … 37 42 break; 38 43 } 39 fprintf(stderr, "%d: accepted connection from IP=%d.%d.%d.%d socket=%d\n", i,44 if(debug) fprintf(stderr, "%d: accepted connection from IP=%d.%d.%d.%d socket=%d\n", i, 40 45 (soap.ip >> 24)&0xFF, (soap.ip >> 16)&0xFF, (soap.ip >> 8)&0xFF, soap.ip&0xFF, s); 41 46 if (soap_serve(&soap) != SOAP_OK) // process RPC request 42 47 soap_print_fault(&soap, stderr); // print error 43 fprintf(stderr, "you got served!\n");48 if(debug) fprintf(stderr, "you got served!\n"); 44 49 soap_destroy(&soap); // clean up class instances 45 50 soap_end(&soap); // clean up everything and close socket … … 55 60 int ns__add(struct soap *soap, int a, int b, int &result) 56 61 { 57 printf("add got %d and %d\n", a, b);58 result = a + b; 59 return SOAP_OK; 62 //printf("add got %d and %d\n", a, b); 63 result = a + b; 64 return SOAP_OK; 60 65 } 61 66 62 int ns__ test(struct soap *soap, char * a, char ** result)67 int ns__ping(struct soap *soap, char * a, char ** result) 63 68 { 64 printf(" test got%s\n", a);65 *result = " and junk";69 printf("%s\n", a); 70 *result = "pong"; 66 71 return SOAP_OK; 67 } 72 } 73 68 74 // Implementation of the "sub" remote method: 69 75 int ns__sub(struct soap *soap, double a, double b, double &result) capture-mod/trunk/MySoapServer.h
r1584 r1586 1 #include "calc.h" 1 /* 2 **Created by Xeno Kovah of the MITRE HoneyClient Project 5/20/2008 3 */ 4 5 #include "captureGSOAP.h" 2 6 #include "Thread.h" 3 7 capture-mod/trunk/soapC.cpp
r1583 r1586 1 1 /* soapC.cpp 2 Generated by gSOAP 2.7.10 from ca lc.h2 Generated by gSOAP 2.7.10 from captureGSOAP.h 3 3 Copyright(C) 2000-2008, Robert van Engelen, Genivia Inc. All Rights Reserved. 4 4 This part of the software is released under one of the following licenses: … … 8 8 #include "soapH.h" 9 9 10 SOAP_SOURCE_STAMP("@(#) soapC.cpp ver 2.7.10 2008-05-20 0 2:00:07GMT")10 SOAP_SOURCE_STAMP("@(#) soapC.cpp ver 2.7.10 2008-05-20 05:48:22 GMT") 11 11 12 12 … … 166 166 case SOAP_TYPE_ns__subResponse: 167 167 return soap_in_ns__subResponse(soap, NULL, NULL, "ns:subResponse"); 168 case SOAP_TYPE_ns__ test:169 return soap_in_ns__ test(soap, NULL, NULL, "ns:test");170 case SOAP_TYPE_ns__ testResponse:171 return soap_in_ns__ testResponse(soap, NULL, NULL, "ns:testResponse");168 case SOAP_TYPE_ns__ping: 169 return soap_in_ns__ping(soap, NULL, NULL, "ns:ping"); 170 case SOAP_TYPE_ns__pingResponse: 171 return soap_in_ns__pingResponse(soap, NULL, NULL, "ns:pingResponse"); 172 172 case SOAP_TYPE_ns__add: 173 173 return soap_in_ns__add(soap, NULL, NULL, "ns:add"); … … 205 205 return soap_in_ns__subResponse(soap, NULL, NULL, NULL); 206 206 } 207 if (!soap_match_tag(soap, t, "ns: test"))208 { *type = SOAP_TYPE_ns__ test;209 return soap_in_ns__ test(soap, NULL, NULL, NULL);210 } 211 if (!soap_match_tag(soap, t, "ns: testResponse"))212 { *type = SOAP_TYPE_ns__ testResponse;213 return soap_in_ns__ testResponse(soap, NULL, NULL, NULL);207 if (!soap_match_tag(soap, t, "ns:ping")) 208 { *type = SOAP_TYPE_ns__ping; 209 return soap_in_ns__ping(soap, NULL, NULL, NULL); 210 } 211 if (!soap_match_tag(soap, t, "ns:pingResponse")) 212 { *type = SOAP_TYPE_ns__pingResponse; 213 return soap_in_ns__pingResponse(soap, NULL, NULL, NULL); 214 214 } 215 215 if (!soap_match_tag(soap, t, "ns:add")) … … 309 309 case SOAP_TYPE_ns__subResponse: 310 310 return soap_out_ns__subResponse(soap, tag, id, (const struct ns__subResponse *)ptr, "ns:subResponse"); 311 case SOAP_TYPE_ns__ test:312 return soap_out_ns__ test(soap, tag, id, (const struct ns__test *)ptr, "ns:test");313 case SOAP_TYPE_ns__ testResponse:314 return soap_out_ns__ testResponse(soap, tag, id, (const struct ns__testResponse *)ptr, "ns:testResponse");311 case SOAP_TYPE_ns__ping: 312 return soap_out_ns__ping(soap, tag, id, (const struct ns__ping *)ptr, "ns:ping"); 313 case SOAP_TYPE_ns__pingResponse: 314 return soap_out_ns__pingResponse(soap, tag, id, (const struct ns__pingResponse *)ptr, "ns:pingResponse"); 315 315 case SOAP_TYPE_ns__add: 316 316 return soap_out_ns__add(soap, tag, id, (const struct ns__add *)ptr, "ns:add"); … … 348 348 soap_serialize_ns__subResponse(soap, (const struct ns__subResponse *)ptr); 349 349 break; 350 case SOAP_TYPE_ns__ test:351 soap_serialize_ns__ test(soap, (const struct ns__test*)ptr);350 case SOAP_TYPE_ns__ping: 351 soap_serialize_ns__ping(soap, (const struct ns__ping *)ptr); 352 352 break; 353 case SOAP_TYPE_ns__ testResponse:354 soap_serialize_ns__ testResponse(soap, (const struct ns__testResponse *)ptr);353 case SOAP_TYPE_ns__pingResponse: 354 soap_serialize_ns__pingResponse(soap, (const struct ns__pingResponse *)ptr); 355 355 break; 356 356 case SOAP_TYPE_ns__add: … … 385 385 case SOAP_TYPE_ns__add: 386 386 return (void*)soap_instantiate_ns__add(soap, -1, type, arrayType, n); 387 case SOAP_TYPE_ns__ testResponse:388 return (void*)soap_instantiate_ns__ testResponse(soap, -1, type, arrayType, n);389 case SOAP_TYPE_ns__ test:390 return (void*)soap_instantiate_ns__ test(soap, -1, type, arrayType, n);387 case SOAP_TYPE_ns__pingResponse: 388 return (void*)soap_instantiate_ns__pingResponse(soap, -1, type, arrayType, n); 389 case SOAP_TYPE_ns__ping: 390 return (void*)soap_instantiate_ns__ping(soap, -1, type, arrayType, n); 391 391 case SOAP_TYPE_ns__subResponse: 392 392 return (void*)soap_instantiate_ns__subResponse(soap, -1, type, arrayType, n); … … 432 432 delete[] (struct ns__add*)p->ptr; 433 433 break; 434 case SOAP_TYPE_ns__ testResponse:434 case SOAP_TYPE_ns__pingResponse: 435 435 if (p->size < 0) 436 delete (struct ns__ testResponse*)p->ptr;436 delete (struct ns__pingResponse*)p->ptr; 437 437 else 438 delete[] (struct ns__ testResponse*)p->ptr;438 delete[] (struct ns__pingResponse*)p->ptr; 439 439 break; 440 case SOAP_TYPE_ns__ test:440 case SOAP_TYPE_ns__ping: 441 441 if (p->size < 0) 442 delete (struct ns__ test*)p->ptr;442 delete (struct ns__ping*)p->ptr; 443 443 else 444 delete[] (struct ns__ test*)p->ptr;444 delete[] (struct ns__ping*)p->ptr; 445 445 break; 446 446 case SOAP_TYPE_ns__subResponse: … … 1485 1485 } 1486 1486 1487 SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__ test(struct soap *soap, struct ns__test*a)1487 SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__ping(struct soap *soap, struct ns__ping *a) 1488 1488 { 1489 1489 (void)soap; (void)a; /* appease -Wall -Werror */ … … 1491 1491 } 1492 1492 1493 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns__ test(struct soap *soap, const struct ns__test*a)1493 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns__ping(struct soap *soap, const struct ns__ping *a) 1494 1494 { 1495 1495 (void)soap; (void)a; /* appease -Wall -Werror */ … … 1497 1497 } 1498 1498 1499 SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns__ test(struct soap *soap, const struct ns__test*a, const char *tag, const char *type)1500 { 1501 register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ns__ test);1502 if (soap_out_ns__ test(soap, tag, id, a, type))1499 SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns__ping(struct soap *soap, const struct ns__ping *a, const char *tag, const char *type) 1500 { 1501 register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ns__ping); 1502 if (soap_out_ns__ping(soap, tag, id, a, type)) 1503 1503 return soap->error; 1504 1504 return soap_putindependent(soap); 1505 1505 } 1506 1506 1507 SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns__ test(struct soap *soap, const char *tag, int id, const struct ns__test*a, const char *type)1508 { 1509 if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns__ test), type))1507 SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns__ping(struct soap *soap, const char *tag, int id, const struct ns__ping *a, const char *type) 1508 { 1509 if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns__ping), type)) 1510 1510 return soap->error; 1511 1511 if (soap_out_string(soap, "a", -1, &a->a, "")) … … 1514 1514 } 1515 1515 1516 SOAP_FMAC3 struct ns__ test * SOAP_FMAC4 soap_get_ns__test(struct soap *soap, struct ns__test*p, const char *tag, const char *type)1517 { 1518 if ((p = soap_in_ns__ test(soap, tag, p, type)))1516 SOAP_FMAC3 struct ns__ping * SOAP_FMAC4 soap_get_ns__ping(struct soap *soap, struct ns__ping *p, const char *tag, const char *type) 1517 { 1518 if ((p = soap_in_ns__ping(soap, tag, p, type))) 1519 1519 if (soap_getindependent(soap)) 1520 1520 return NULL; … … 1522 1522 } 1523 1523 1524 SOAP_FMAC3 struct ns__ test * SOAP_FMAC4 soap_in_ns__test(struct soap *soap, const char *tag, struct ns__test*a, const char *type)1524 SOAP_FMAC3 struct ns__ping * SOAP_FMAC4 soap_in_ns__ping(struct soap *soap, const char *tag, struct ns__ping *a, const char *type) 1525 1525 { 1526 1526 short soap_flag_a = 1; 1527 1527 if (soap_element_begin_in(soap, tag, 0, type)) 1528 1528 return NULL; 1529 a = (struct ns__ test *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ns__test, sizeof(struct ns__test), 0, NULL, NULL, NULL);1529 a = (struct ns__ping *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ns__ping, sizeof(struct ns__ping), 0, NULL, NULL, NULL); 1530 1530 if (!a) 1531 1531 return NULL; 1532 soap_default_ns__ test(soap, a);1532 soap_default_ns__ping(soap, a); 1533 1533 if (soap->body && !*soap->href) 1534 1534 { … … 1551 1551 } 1552 1552 else 1553 { a = (struct ns__ test *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_ns__test, 0, sizeof(struct ns__test), 0, NULL);1553 { a = (struct ns__ping *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_ns__ping, 0, sizeof(struct ns__ping), 0, NULL); 1554 1554 if (soap->body && soap_element_end_in(soap, tag)) 1555 1555 return NULL; … … 1558 1558 } 1559 1559 1560 SOAP_FMAC5 struct ns__ test * SOAP_FMAC6 soap_new_ns__test(struct soap *soap, int n)1561 { return soap_instantiate_ns__ test(soap, n, NULL, NULL, NULL);1562 } 1563 1564 SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ns__ test(struct soap *soap, struct ns__test*p)1560 SOAP_FMAC5 struct ns__ping * SOAP_FMAC6 soap_new_ns__ping(struct soap *soap, int n) 1561 { return soap_instantiate_ns__ping(soap, n, NULL, NULL, NULL); 1562 } 1563 1564 SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ns__ping(struct soap *soap, struct ns__ping *p) 1565 1565 { soap_delete(soap, p); 1566 1566 } 1567 1567 1568 SOAP_FMAC3 struct ns__ test * SOAP_FMAC4 soap_instantiate_ns__test(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)1569 { 1570 DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ns__ test(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));1571 struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ns__ test, n, soap_fdelete);1568 SOAP_FMAC3 struct ns__ping * SOAP_FMAC4 soap_instantiate_ns__ping(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size) 1569 { 1570 DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ns__ping(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:"")); 1571 struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ns__ping, n, soap_fdelete); 1572 1572 if (!cp) 1573 1573 return NULL; 1574 1574 if (n < 0) 1575 { cp->ptr = (void*)new struct ns__ test;1575 { cp->ptr = (void*)new struct ns__ping; 1576 1576 if (size) 1577 *size = sizeof(struct ns__ test);1578 } 1579 else 1580 { cp->ptr = (void*)new struct ns__ test[n];1577 *size = sizeof(struct ns__ping); 1578 } 1579 else 1580 { cp->ptr = (void*)new struct ns__ping[n]; 1581 1581 if (!cp->ptr) 1582 1582 { soap->error = SOAP_EOM; … … 1584 1584 } 1585 1585 if (size) 1586 *size = n * sizeof(struct ns__ test);1586 *size = n * sizeof(struct ns__ping); 1587 1587 } 1588 1588 DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr)); 1589 return (struct ns__ test*)cp->ptr;1590 } 1591 SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns__ test(struct soap *soap, int st, int tt, void *p, size_t len, const void *q, size_t n)1592 { 1593 DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying struct ns__ test%p -> %p\n", q, p));1594 *(struct ns__ test*)p = *(struct ns__test*)q;1595 } 1596 1597 SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__ testResponse(struct soap *soap, struct ns__testResponse *a)1589 return (struct ns__ping*)cp->ptr; 1590 } 1591 SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns__ping(struct soap *soap, int st, int tt, void *p, size_t len, const void *q, size_t n) 1592 { 1593 DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying struct ns__ping %p -> %p\n", q, p)); 1594 *(struct ns__ping*)p = *(struct ns__ping*)q; 1595 } 1596 1597 SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__pingResponse(struct soap *soap, struct ns__pingResponse *a) 1598 1598 { 1599 1599 (void)soap; (void)a; /* appease -Wall -Werror */ … … 1601 1601 } 1602 1602 1603 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns__ testResponse(struct soap *soap, const struct ns__testResponse *a)1603 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns__pingResponse(struct soap *soap, const struct ns__pingResponse *a) 1604 1604 { 1605 1605 (void)soap; (void)a; /* appease -Wall -Werror */ … … 1607 1607 } 1608 1608 1609 SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns__ testResponse(struct soap *soap, const struct ns__testResponse *a, const char *tag, const char *type)1610 { 1611 register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ns__ testResponse);1612 if (soap_out_ns__ testResponse(soap, tag, id, a, type))1609 SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns__pingResponse(struct soap *soap, const struct ns__pingResponse *a, const char *tag, const char *type) 1610 { 1611 register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ns__pingResponse); 1612 if (soap_out_ns__pingResponse(soap, tag, id, a, type)) 1613 1613 return soap->error; 1614 1614 return soap_putindependent(soap); 1615 1615 } 1616 1616 1617 SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns__ testResponse(struct soap *soap, const char *tag, int id, const struct ns__testResponse *a, const char *type)1618 { 1619 if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns__ testResponse), type))1617 SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns__pingResponse(struct soap *soap, const char *tag, int id, const struct ns__pingResponse *a, const char *type) 1618 { 1619 if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns__pingResponse), type)) 1620 1620 return soap->error; 1621 1621 if (soap_out_PointerTostring(soap, "result", -1, &a->result, "")) … … 1624 1624 } 1625 1625 1626 SOAP_FMAC3 struct ns__ testResponse * SOAP_FMAC4 soap_get_ns__testResponse(struct soap *soap, struct ns__testResponse *p, const char *tag, const char *type)1627 { 1628 if ((p = soap_in_ns__ testResponse(soap, tag, p, type)))1626 SOAP_FMAC3 struct ns__pingResponse * SOAP_FMAC4 soap_get_ns__pingResponse(struct soap *soap, struct ns__pingResponse *p, const char *tag, const char *type) 1627 { 1628 if ((p = soap_in_ns__pingResponse(soap, tag, p, type))) 1629 1629 if (soap_getindependent(soap)) 1630 1630 return NULL; … … 1632 1632 } 1633 1633 1634 SOAP_FMAC3 struct ns__ testResponse * SOAP_FMAC4 soap_in_ns__testResponse(struct soap *soap, const char *tag, struct ns__testResponse *a, const char *type)1634 SOAP_FMAC3 struct ns__pingResponse * SOAP_FMAC4 soap_in_ns__pingResponse(struct soap *soap, const char *tag, struct ns__pingResponse *a, const char *type) 1635 1635 { 1636 1636 short soap_flag_result = 1; 1637 1637 if (soap_element_begin_in(soap, tag, 0, type)) 1638 1638 return NULL; 1639 a = (struct ns__ testResponse *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ns__testResponse, sizeof(struct ns__testResponse), 0, NULL, NULL, NULL);1639 a = (struct ns__pingResponse *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ns__pingResponse, sizeof(struct ns__pingResponse), 0, NULL, NULL, NULL); 1640 1640 if (!a) 1641 1641 return NULL; 1642 soap_default_ns__ testResponse(soap, a);1642 soap_default_ns__pingResponse(soap, a); 1643 1643 if (soap->body && !*soap->href) 1644 1644 { … … 1661 1661 } 1662 1662 else 1663 { a = (struct ns__ testResponse *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_ns__testResponse, 0, sizeof(struct ns__testResponse), 0, NULL);1663 { a = (struct ns__pingResponse *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_ns__pingResponse, 0, sizeof(struct ns__pingResponse), 0, NULL); 1664 1664 if (soap->body && soap_element_end_in(soap, tag)) 1665 1665 return NULL; … … 1668 1668 } 1669 1669 1670 SOAP_FMAC5 struct ns__ testResponse * SOAP_FMAC6 soap_new_ns__testResponse(struct soap *soap, int n)1671 { return soap_instantiate_ns__ testResponse(soap, n, NULL, NULL, NULL);1672 } 1673 1674 SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ns__ testResponse(struct soap *soap, struct ns__testResponse *p)1670 SOAP_FMAC5 struct ns__pingResponse * SOAP_FMAC6 soap_new_ns__pingResponse(struct soap *soap, int n) 1671 { return soap_instantiate_ns__pingResponse(soap, n, NULL, NULL, NULL); 1672 } 1673 1674 SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ns__pingResponse(struct soap *soap, struct ns__pingResponse *p) 1675 1675 { soap_delete(soap, p); 1676 1676 } 1677 1677 1678 SOAP_FMAC3 struct ns__ testResponse * SOAP_FMAC4 soap_instantiate_ns__testResponse(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)1679 { 1680 DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ns__ testResponse(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));1681 struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ns__ testResponse, n, soap_fdelete);1678 SOAP_FMAC3 struct ns__pingResponse * SOAP_FMAC4 soap_instantiate_ns__pingResponse(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size) 1679 { 1680 DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ns__pingResponse(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:"")); 1681 struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ns__pingResponse, n, soap_fdelete); 1682 1682 if (!cp) 1683 1683 return NULL; 1684 1684 if (n < 0) 1685 { cp->ptr = (void*)new struct ns__ testResponse;1685 { cp->ptr = (void*)new struct ns__pingResponse; 1686 1686 if (size) 1687 *size = sizeof(struct ns__ testResponse);1688 } 1689 else 1690 { cp->ptr = (void*)new struct ns__ testResponse[n];1687 *size = sizeof(struct ns__pingResponse); 1688 } 1689 else 1690 { cp->ptr = (void*)new struct ns__pingResponse[n]; 1691 1691 if (!cp->ptr) 1692 1692 { soap->error = SOAP_EOM; … … 1694 1694 } 1695 1695 if (size) 1696 *size = n * sizeof(struct ns__ testResponse);1696 *size = n * sizeof(struct ns__pingResponse); 1697 1697 } 1698 1698 DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr)); 1699 return (struct ns__ testResponse*)cp->ptr;1700 } 1701 SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns__ testResponse(struct soap *soap, int st, int tt, void *p, size_t len, const void *q, size_t n)1702 { 1703 DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying struct ns__ testResponse %p -> %p\n", q, p));1704 *(struct ns__ testResponse*)p = *(struct ns__testResponse*)q;1699 return (struct ns__pingResponse*)cp->ptr; 1700 } 1701 SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns__pingResponse(struct soap *soap, int st, int tt, void *p, size_t len, const void *q, size_t n) 1702 { 1703 DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying struct ns__pingResponse %p -> %p\n", q, p)); 1704 *(struct ns__pingResponse*)p = *(struct ns__pingResponse*)q; 1705 1705 } 1706 1706 capture-mod/trunk/soapClient.cpp
r1583 r1586 1 1 /* soapClient.cpp 2 Generated by gSOAP 2.7.10 from ca lc.h2 Generated by gSOAP 2.7.10 from captureGSOAP.h 3 3 Copyright(C) 2000-2008, Robert van Engelen, Genivia Inc. All Rights Reserved. 4 4 This part of the software is released under one of the following licenses: … … 7 7 #include "soapH.h" 8 8 9 SOAP_SOURCE_STAMP("@(#) soapClient.cpp ver 2.7.10 2008-05-20 0 2:00:07GMT")9 SOAP_SOURCE_STAMP("@(#) soapClient.cpp ver 2.7.10 2008-05-20 05:48:22 GMT") 10 10 11 11 … … 63 63 } 64 64 65 SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns__ test(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *a, char **result)66 { struct ns__ test soap_tmp_ns__test;67 struct ns__ testResponse *soap_tmp_ns__testResponse;65 SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns__ping(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *a, char **result) 66 { struct ns__ping soap_tmp_ns__ping; 67 struct ns__pingResponse *soap_tmp_ns__pingResponse; 68 68 if (!soap_endpoint) 69 69 soap_endpoint = "http://192.168.0.131:1234"; 70 70 soap->encodingStyle = ""; 71 soap_tmp_ns__ test.a = a;71 soap_tmp_ns__ping.a = a; 72 72 soap_begin(soap); 73 73 soap_serializeheader(soap); 74 soap_serialize_ns__ test(soap, &soap_tmp_ns__test);74 soap_serialize_ns__ping(soap, &soap_tmp_ns__ping); 75 75 if (soap_begin_count(soap)) 76 76 return soap->error; … … 79 79 || soap_putheader(soap) 80 80 || soap_body_begin_out(soap) 81 || soap_put_ns__ test(soap, &soap_tmp_ns__test, "ns:test", "")81 || soap_put_ns__ping(soap, &soap_tmp_ns__ping, "ns:ping", "") 82 82 || soap_body_end_out(soap) 83 83 || soap_envelope_end_out(soap)) … … 90 90 || soap_putheader(soap) 91 91 || soap_body_begin_out(soap) 92 || soap_put_ns__ test(soap, &soap_tmp_ns__test, "ns:test", "")92 || soap_put_ns__ping(soap, &soap_tmp_ns__ping, "ns:ping", "") 93 93 || soap_body_end_out(soap) 94 94 || soap_envelope_end_out(soap) … … 101 101 || soap_body_begin_in(soap)) 102 102 return soap_closesock(soap); 103 soap_tmp_ns__ testResponse = soap_get_ns__testResponse(soap, NULL, "ns:testResponse", "");103 soap_tmp_ns__pingResponse = soap_get_ns__pingResponse(soap, NULL, "ns:pingResponse", ""); 104 104 if (soap->error) 105 105 { if (soap->error == SOAP_TAG_MISMATCH && soap->level == 2) … … 111 111 || soap_end_recv(soap)) 112 112 return soap_closesock(soap); 113 if (result && soap_tmp_ns__ testResponse->result)114 *result = *soap_tmp_ns__ testResponse->result;113 if (result && soap_tmp_ns__pingResponse->result) 114 *result = *soap_tmp_ns__pingResponse->result; 115 115 return soap_closesock(soap); 116 116 } capture-mod/trunk/soapClientLib.cpp
r1583 r1586 1 1 /* soapClientLib.cpp 2 Generated by gSOAP 2.7.10 from ca lc.h2 Generated by gSOAP 2.7.10 from captureGSOAP.h 3 3 Copyright(C) 2000-2008, Robert van Engelen, Genivia Inc. All Rights Reserved. 4 4 This part of the software is released under one of the following licenses: capture-mod/trunk/soapH.h
r1583 r1586 1 1 /* soapH.h 2 Generated by gSOAP 2.7.10 from ca lc.h2 Generated by gSOAP 2.7.10 from captureGSOAP.h 3 3 Copyright(C) 2000-2008, Robert van Engelen, Genivia Inc. All Rights Reserved. 4 4 This part of the software is released under one of the following licenses: … … 175 175 SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns__subResponse(struct soap*, int, int, void*, size_t, const void*, size_t); 176 176 177 #ifndef SOAP_TYPE_ns__ test178 #define SOAP_TYPE_ns__ test(14)179 #endif 180 SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__ test(struct soap*, struct ns__test*);181 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns__ test(struct soap*, const struct ns__test*);182 SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns__ test(struct soap*, const struct ns__test*, const char*, const char*);183 SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns__ test(struct soap*, const char*, int, const struct ns__test*, const char*);184 SOAP_FMAC3 struct ns__ test * SOAP_FMAC4 soap_get_ns__test(struct soap*, struct ns__test*, const char*, const char*);185 SOAP_FMAC3 struct ns__ test * SOAP_FMAC4 soap_in_ns__test(struct soap*, const char*, struct ns__test*, const char*);186 SOAP_FMAC5 struct ns__ test * SOAP_FMAC6 soap_new_ns__test(struct soap*, int);187 SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ns__ test(struct soap*, struct ns__test*);188 SOAP_FMAC3 struct ns__ test * SOAP_FMAC4 soap_instantiate_ns__test(struct soap*, int, const char*, const char*, size_t*);189 SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns__ test(struct soap*, int, int, void*, size_t, const void*, size_t);190 191 #ifndef SOAP_TYPE_ns__ testResponse192 #define SOAP_TYPE_ns__ testResponse (13)193 #endif 194 SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__ testResponse(struct soap*, struct ns__testResponse *);195 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns__ testResponse(struct soap*, const struct ns__testResponse *);196 SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns__ testResponse(struct soap*, const struct ns__testResponse *, const char*, const char*);197 SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns__ testResponse(struct soap*, const char*, int, const struct ns__testResponse *, const char*);198 SOAP_FMAC3 struct ns__ testResponse * SOAP_FMAC4 soap_get_ns__testResponse(struct soap*, struct ns__testResponse *, const char*, const char*);199 SOAP_FMAC3 struct ns__ testResponse * SOAP_FMAC4 soap_in_ns__testResponse(struct soap*, const char*, struct ns__testResponse *, const char*);200 SOAP_FMAC5 struct ns__ testResponse * SOAP_FMAC6 soap_new_ns__testResponse(struct soap*, int);201 SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ns__ testResponse(struct soap*, struct ns__testResponse*);202 SOAP_FMAC3 struct ns__ testResponse * SOAP_FMAC4 soap_instantiate_ns__testResponse(struct soap*, int, const char*, const char*, size_t*);203 SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns__ testResponse(struct soap*, int, int, void*, size_t, const void*, size_t);177 #ifndef SOAP_TYPE_ns__ping 178 #define SOAP_TYPE_ns__ping (14) 179 #endif 180 SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__ping(struct soap*, struct ns__ping *); 181 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns__ping(struct soap*, const struct ns__ping *); 182 SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns__ping(struct soap*, const struct ns__ping *, const char*, const char*); 183 SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns__ping(struct soap*, const char*, int, const struct ns__ping *, const char*); 184 SOAP_FMAC3 struct ns__ping * SOAP_FMAC4 soap_get_ns__ping(struct soap*, struct ns__ping *, const char*, const char*); 185 SOAP_FMAC3 struct ns__ping * SOAP_FMAC4 soap_in_ns__ping(struct soap*, const char*, struct ns__ping *, const char*); 186 SOAP_FMAC5 struct ns__ping * SOAP_FMAC6 soap_new_ns__ping(struct soap*, int); 187 SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ns__ping(struct soap*, struct ns__ping*); 188 SOAP_FMAC3 struct ns__ping * SOAP_FMAC4 soap_instantiate_ns__ping(struct soap*, int, const char*, const char*, size_t*); 189 SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns__ping(struct soap*, int, int, void*, size_t, const void*, size_t); 190 191 #ifndef SOAP_TYPE_ns__pingResponse 192 #define SOAP_TYPE_ns__pingResponse (13) 193 #endif 194 SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__pingResponse(struct soap*, struct ns__pingResponse *); 195 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns__pingResponse(struct soap*, const struct ns__pingResponse *); 196 SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns__pingResponse(struct soap*, const struct ns__pingResponse *, const char*, const char*); 197 SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns__pingResponse(struct soap*, const char*, int, const struct ns__pingResponse *, const char*); 198 SOAP_FMAC3 struct ns__pingResponse * SOAP_FMAC4 soap_get_ns__pingResponse(struct soap*, struct ns__pingResponse *, const char*, const char*); 199 SOAP_FMAC3 struct ns__pingResponse * SOAP_FMAC4 soap_in_ns__pingResponse(struct soap*, const char*, struct ns__pingResponse *, const char*); 200 SOAP_FMAC5 struct ns__pingResponse * SOAP_FMAC6 soap_new_ns__pingResponse(struct soap*, int); 201 SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ns__pingResponse(struct soap*, struct ns__pingResponse*); 202 SOAP_FMAC3 struct ns__pingResponse * SOAP_FMAC4 soap_instantiate_ns__pingResponse(struct soap*, int, const char*, const char*, size_t*); 203 SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns__pingResponse(struct soap*, int, int, void*, size_t, const void*, size_t); 204 204 205 205 #ifndef SOAP_TYPE_ns__add capture-mod/trunk/soapServer.cpp
r1583 r1586 1 1 /* soapServer.cpp 2 Generated by gSOAP 2.7.10 from ca lc.h2 Generated by gSOAP 2.7.10 from captureGSOAP.h 3 3 Copyright(C) 2000-2008, Robert van Engelen, Genivia Inc. All Rights Reserved. 4 4 This part of the software is released under one of the following licenses: … … 7 7 #include "soapH.h" 8 8 9 SOAP_SOURCE_STAMP("@(#) soapServer.cpp ver 2.7.10 2008-05-20 0 2:00:07GMT")9 SOAP_SOURCE_STAMP("@(#) soapServer.cpp ver 2.7.10 2008-05-20 05:48:22 GMT") 10 10 11 11 … … 76 76 if (!soap_match_tag(soap, soap->tag, "ns:add")) 77 77 return soap_serve_ns__add(soap); 78 if (!soap_match_tag(soap, soap->tag, "ns: test"))79 return soap_serve_ns__ test(soap);78 if (!soap_match_tag(soap, soap->tag, "ns:ping")) 79 return soap_serve_ns__ping(soap); 80 80 if (!soap_match_tag(soap, soap->tag, "ns:sub")) 81 81 return soap_serve_ns__sub(soap); … … 125 125 } 126 126 127 SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns__ test(struct soap *soap)128 { struct ns__ test soap_tmp_ns__test;129 struct ns__ testResponse soap_tmp_ns__testResponse;127 SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns__ping(struct soap *soap) 128 { struct ns__ping soap_tmp_ns__ping; 129 struct ns__pingResponse soap_tmp_ns__pingResponse; 130 130 char * soap_tmp_string; 131 soap_default_ns__ testResponse(soap, &soap_tmp_ns__testResponse);131 soap_default_ns__pingResponse(soap, &soap_tmp_ns__pingResponse); 132 132 soap_tmp_string = NULL; 133 soap_tmp_ns__ testResponse.result = &soap_tmp_string;134 soap_default_ns__ test(soap, &soap_tmp_ns__test);133 soap_tmp_ns__pingResponse.result = &soap_tmp_string; 134 soap_default_ns__ping(soap, &soap_tmp_ns__ping); 135 135 soap->encodingStyle = ""; 136 if (!soap_get_ns__ test(soap, &soap_tmp_ns__test, "ns:test", NULL))136 if (!soap_get_ns__ping(soap, &soap_tmp_ns__ping, "ns:ping", NULL)) 137 137 return soap->error; 138 138 if (soap_body_end_in(soap) … … 140 140 || soap_end_recv(soap)) 141 141 return soap->error; 142 soap->error = ns__ test(soap, soap_tmp_ns__test.a, &soap_tmp_string);142 soap->error = ns__ping(soap, soap_tmp_ns__ping.a, &soap_tmp_string); 143 143 if (soap->error) 144 144 return soap->error; 145 145 soap_serializeheader(soap); 146 soap_serialize_ns__ testResponse(soap, &soap_tmp_ns__testResponse);146 soap_serialize_ns__pingResponse(soap, &soap_tmp_ns__pingResponse); 147 147 if (soap_begin_count(soap)) 148 148 return soap->error; … … 151 151 || soap_putheader(soap) 152 152 || soap_body_begin_out(soap) 153 || soap_put_ns__ testResponse(soap, &soap_tmp_ns__testResponse, "ns:testResponse", "")153 || soap_put_ns__pingResponse(soap, &soap_tmp_ns__pingResponse, "ns:pingResponse", "") 154 154 || soap_body_end_out(soap) 155 155 || soap_envelope_end_out(soap)) … … 161 161 || soap_putheader(soap) 162 162 || soap_body_begin_out(soap) 163 || soap_put_ns__ testResponse(soap, &soap_tmp_ns__testResponse, "ns:testResponse", "")163 || soap_put_ns__pingResponse(soap, &soap_tmp_ns__pingResponse, "ns:pingResponse", "") 164 164 || soap_body_end_out(soap) 165 165 || soap_envelope_end_out(soap) capture-mod/trunk/soapServerLib.cpp
r1583 r1586 1 1 /* soapServerLib.cpp 2 Generated by gSOAP 2.7.10 from ca lc.h2 Generated by gSOAP 2.7.10 from captureGSOAP.h 3 3 Copyright(C) 2000-2008, Robert van Engelen, Genivia Inc. All Rights Reserved. 4 4 This part of the software is released under one of the following licenses: capture-mod/trunk/soapStub.h
r1583 r1586 1 1 /* soapStub.h 2 Generated by gSOAP 2.7.10 from ca lc.h2 Generated by gSOAP 2.7.10 from captureGSOAP.h 3 3 Copyright(C) 2000-2008, Robert van Engelen, Genivia Inc. All Rights Reserved. 4 4 This part of the software is released under one of the following licenses: … … 49 49 #endif 50 50 51 #ifndef SOAP_TYPE_ns__ testResponse52 #define SOAP_TYPE_ns__ testResponse (13)53 /* ns: testResponse */54 struct ns__ testResponse51 #ifndef SOAP_TYPE_ns__pingResponse 52 #define SOAP_TYPE_ns__pingResponse (13) 53 /* ns:pingResponse */ 54 struct ns__pingResponse 55 55 { 56 56 public: … … 59 59 #endif 60 60 61 #ifndef SOAP_TYPE_ns__ test62 #define SOAP_TYPE_ns__ test(14)63 /* ns: test*/64 struct ns__ test61 #ifndef SOAP_TYPE_ns__ping 62 #define SOAP_TYPE_ns__ping (14) 63 /* ns:ping */ 64 struct ns__ping 65 65 { 66 66 public: … … 200 200 SOAP_FMAC5 int SOAP_FMAC6 ns__add(struct soap*, int a, int b, int &result); 201 201 202 SOAP_FMAC5 int SOAP_FMAC6 ns__ test(struct soap*, char *a, char **result);202 SOAP_FMAC5 int SOAP_FMAC6 ns__ping(struct soap*, char *a, char **result); 203 203 204 204 SOAP_FMAC5 int SOAP_FMAC6 ns__sub(struct soap*, double a, double b, double &result); … … 213 213 SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns__add(struct soap *soap, const char *soap_endpoint, const char *soap_action, int a, int b, int &result); 214 214 215 SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns__ test(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *a, char **result);215 SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns__ping(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *a, char **result); 216 216 217 217 SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns__sub(struct soap *soap, const char *soap_endpoint, const char *soap_action, double a, double b, double &result); … … 229 229 SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns__add(struct soap*); 230 230 231 SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns__ test(struct soap*);231 SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns__ping(struct soap*); 232 232 233 233 SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns__sub(struct soap*);
