Changeset 1586

Show
Ignore:
Timestamp:
05/20/08 14:00:19 (3 months ago)
Author:
xkovah
Message:

a little cleanup

Files:

Legend:

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

    r1585 r1586  
    1010    networkPacketDumper = NULL; 
    1111 
    12     printf("\n\n\nin analyzer\n\n\n"); 
    1312    onOptionChangedConnection = OptionsManager::getInstance()->connect_onOptionChanged(boost::bind(&Analyzer::onOptionChanged, this, _1)); 
    1413 
     
    1716     
    1817    server = s; 
    19  
    20     MySoapServer a = MySoapServer(); 
    2118 
    2219    processMonitor->start(); 
  • capture-mod/trunk/Analyzer.h

    r1585 r1586  
    3636#include "NetworkPacketDumper.h" 
    3737#include "FileUploader.h" 
    38 #include "MySoapServer.h" 
    3938 
    4039using namespace std; 
  • capture-mod/trunk/CaptureClient.cpp

    r1585 r1586  
    77#include "ProcessManager.h" 
    88#include "shellapi.h" 
     9#include "MySoapServer.h" 
    910using namespace std; 
    1011 
     
    5051        hStopRunning = CreateEvent(NULL, FALSE, FALSE, NULL); 
    5152        //XENO - Right here, set up the standalone SOAP server 
     53        MySoapServer a = MySoapServer(); 
     54 
    5255        wstring serverIp = OptionsManager::getInstance()->getOption(L"server"); 
    5356        server = new Server(serverIp, 7070); 
  • capture-mod/trunk/CaptureClient.vcproj

    r1583 r1586  
    301301            </File> 
    302302            <File 
    303                 RelativePath=".\calc.h" 
    304                 > 
    305             </File> 
    306             <File 
    307303                RelativePath=".\CaptureGlobal.h" 
     304                > 
     305            </File> 
     306            <File 
     307                RelativePath=".\captureGSOAP.h" 
    308308                > 
    309309            </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 
    16#include "MySoapServer.h" 
    27 
     
    611MySoapServer::MySoapServer(){ 
    712 
    8     printf("\n\n\nStarting MySoapServer thread\n"); 
    913    MySoapServerThread = new Thread(this); 
    1014    MySoapServerThread->start("MySoapServer"); 
     
    1721MySoapServer::run(){ 
    1822 
     23    char debug = 0; 
     24    //The below code is taken verbatim from the gsoap standalone server example page 
    1925   struct soap soap; 
    2026   SOCKET m, s; // master and slave sockets 
    2127 
    22    printf("\n\n\nin MySoapServer run()\n"); 
    23  
    2428   soap_init(&soap); 
     29   //TODO: This needs to be configurable 
    2530   m = soap_bind(&soap, "192.168.0.131", 1234, 100); 
    2631   if (m < 0) 
     
    2833   else 
    2934   { 
    30       fprintf(stderr, "Socket connection successful: master socket = %d\n", m); 
     35      if(debug) fprintf(stderr, "Socket connection successful: master socket = %d\n", m); 
    3136      for (int i = 1; ; i++) 
    3237      { 
     
    3742            break; 
    3843         } 
    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, 
    4045            (soap.ip >> 24)&0xFF, (soap.ip >> 16)&0xFF, (soap.ip >> 8)&0xFF, soap.ip&0xFF, s); 
    4146         if (soap_serve(&soap) != SOAP_OK) // process RPC request 
    4247            soap_print_fault(&soap, stderr); // print error 
    43          fprintf(stderr, "you got served!\n"); 
     48         if(debug) fprintf(stderr, "you got served!\n"); 
    4449         soap_destroy(&soap); // clean up class instances 
    4550         soap_end(&soap); // clean up everything and close socket 
     
    5560int ns__add(struct soap *soap, int a, int b, int &result)  
    5661{  
    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; 
    6065}  
    6166 
    62 int ns__test(struct soap *soap, char * a, char ** result)  
     67int ns__ping(struct soap *soap, char * a, char ** result)  
    6368{  
    64    printf("test got %s\n", a); 
    65    *result = "and junk"; 
     69   printf("%s\n", a); 
     70   *result = "pong"; 
    6671   return SOAP_OK;  
    67 }  
     72
     73 
    6874// Implementation of the "sub" remote method:  
    6975int 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" 
    26#include "Thread.h" 
    37 
  • capture-mod/trunk/soapC.cpp

    r1583 r1586  
    11/* soapC.cpp 
    2    Generated by gSOAP 2.7.10 from calc.h 
     2   Generated by gSOAP 2.7.10 from captureGSOAP.h 
    33   Copyright(C) 2000-2008, Robert van Engelen, Genivia Inc. All Rights Reserved. 
    44   This part of the software is released under one of the following licenses: 
     
    88#include "soapH.h" 
    99 
    10 SOAP_SOURCE_STAMP("@(#) soapC.cpp ver 2.7.10 2008-05-20 02:00:07 GMT") 
     10SOAP_SOURCE_STAMP("@(#) soapC.cpp ver 2.7.10 2008-05-20 05:48:22 GMT") 
    1111 
    1212 
     
    166166    case SOAP_TYPE_ns__subResponse: 
    167167        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"); 
    172172    case SOAP_TYPE_ns__add: 
    173173        return soap_in_ns__add(soap, NULL, NULL, "ns:add"); 
     
    205205            return soap_in_ns__subResponse(soap, NULL, NULL, NULL); 
    206206        } 
    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); 
    214214        } 
    215215        if (!soap_match_tag(soap, t, "ns:add")) 
     
    309309    case SOAP_TYPE_ns__subResponse: 
    310310        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"); 
    315315    case SOAP_TYPE_ns__add: 
    316316        return soap_out_ns__add(soap, tag, id, (const struct ns__add *)ptr, "ns:add"); 
     
    348348        soap_serialize_ns__subResponse(soap, (const struct ns__subResponse *)ptr); 
    349349        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); 
    352352        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); 
    355355        break; 
    356356    case SOAP_TYPE_ns__add: 
     
    385385    case SOAP_TYPE_ns__add: 
    386386        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); 
    391391    case SOAP_TYPE_ns__subResponse: 
    392392        return (void*)soap_instantiate_ns__subResponse(soap, -1, type, arrayType, n); 
     
    432432            delete[] (struct ns__add*)p->ptr; 
    433433        break; 
    434     case SOAP_TYPE_ns__testResponse: 
     434    case SOAP_TYPE_ns__pingResponse: 
    435435        if (p->size < 0) 
    436             delete (struct ns__testResponse*)p->ptr; 
     436            delete (struct ns__pingResponse*)p->ptr; 
    437437        else 
    438             delete[] (struct ns__testResponse*)p->ptr; 
     438            delete[] (struct ns__pingResponse*)p->ptr; 
    439439        break; 
    440     case SOAP_TYPE_ns__test
     440    case SOAP_TYPE_ns__ping
    441441        if (p->size < 0) 
    442             delete (struct ns__test*)p->ptr; 
     442            delete (struct ns__ping*)p->ptr; 
    443443        else 
    444             delete[] (struct ns__test*)p->ptr; 
     444            delete[] (struct ns__ping*)p->ptr; 
    445445        break; 
    446446    case SOAP_TYPE_ns__subResponse: 
     
    14851485} 
    14861486 
    1487 SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__test(struct soap *soap, struct ns__test *a) 
     1487SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__ping(struct soap *soap, struct ns__ping *a) 
    14881488{ 
    14891489    (void)soap; (void)a; /* appease -Wall -Werror */ 
     
    14911491} 
    14921492 
    1493 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns__test(struct soap *soap, const struct ns__test *a) 
     1493SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns__ping(struct soap *soap, const struct ns__ping *a) 
    14941494{ 
    14951495    (void)soap; (void)a; /* appease -Wall -Werror */ 
     
    14971497} 
    14981498 
    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)) 
     1499SOAP_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)) 
    15031503        return soap->error; 
    15041504    return soap_putindependent(soap); 
    15051505} 
    15061506 
    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)) 
     1507SOAP_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)) 
    15101510        return soap->error; 
    15111511    if (soap_out_string(soap, "a", -1, &a->a, "")) 
     
    15141514} 
    15151515 
    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))) 
     1516SOAP_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))) 
    15191519        if (soap_getindependent(soap)) 
    15201520            return NULL; 
     
    15221522} 
    15231523 
    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) 
     1524SOAP_FMAC3 struct ns__ping * SOAP_FMAC4 soap_in_ns__ping(struct soap *soap, const char *tag, struct ns__ping *a, const char *type) 
    15251525{ 
    15261526    short soap_flag_a = 1; 
    15271527    if (soap_element_begin_in(soap, tag, 0, type)) 
    15281528        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); 
    15301530    if (!a) 
    15311531        return NULL; 
    1532     soap_default_ns__test(soap, a); 
     1532    soap_default_ns__ping(soap, a); 
    15331533    if (soap->body && !*soap->href) 
    15341534    { 
     
    15511551    } 
    15521552    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); 
    15541554        if (soap->body && soap_element_end_in(soap, tag)) 
    15551555            return NULL; 
     
    15581558} 
    15591559 
    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) 
     1560SOAP_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 
     1564SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ns__ping(struct soap *soap, struct ns__ping *p) 
    15651565{   soap_delete(soap, p); 
    15661566} 
    15671567 
    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); 
     1568SOAP_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); 
    15721572    if (!cp) 
    15731573        return NULL; 
    15741574    if (n < 0) 
    1575     {   cp->ptr = (void*)new struct ns__test
     1575    {   cp->ptr = (void*)new struct ns__ping
    15761576        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]; 
    15811581        if (!cp->ptr) 
    15821582        {   soap->error = SOAP_EOM; 
     
    15841584        } 
    15851585        if (size) 
    1586             *size = n * sizeof(struct ns__test); 
     1586            *size = n * sizeof(struct ns__ping); 
    15871587    } 
    15881588        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} 
     1591SOAP_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 
     1597SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__pingResponse(struct soap *soap, struct ns__pingResponse *a) 
    15981598{ 
    15991599    (void)soap; (void)a; /* appease -Wall -Werror */ 
     
    16011601} 
    16021602 
    1603 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns__testResponse(struct soap *soap, const struct ns__testResponse *a) 
     1603SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns__pingResponse(struct soap *soap, const struct ns__pingResponse *a) 
    16041604{ 
    16051605    (void)soap; (void)a; /* appease -Wall -Werror */ 
     
    16071607} 
    16081608 
    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)) 
     1609SOAP_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)) 
    16131613        return soap->error; 
    16141614    return soap_putindependent(soap); 
    16151615} 
    16161616 
    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)) 
     1617SOAP_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)) 
    16201620        return soap->error; 
    16211621    if (soap_out_PointerTostring(soap, "result", -1, &a->result, "")) 
     
    16241624} 
    16251625 
    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))) 
     1626SOAP_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))) 
    16291629        if (soap_getindependent(soap)) 
    16301630            return NULL; 
     
    16321632} 
    16331633 
    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) 
     1634SOAP_FMAC3 struct ns__pingResponse * SOAP_FMAC4 soap_in_ns__pingResponse(struct soap *soap, const char *tag, struct ns__pingResponse *a, const char *type) 
    16351635{ 
    16361636    short soap_flag_result = 1; 
    16371637    if (soap_element_begin_in(soap, tag, 0, type)) 
    16381638        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); 
    16401640    if (!a) 
    16411641        return NULL; 
    1642     soap_default_ns__testResponse(soap, a); 
     1642    soap_default_ns__pingResponse(soap, a); 
    16431643    if (soap->body && !*soap->href) 
    16441644    { 
     
    16611661    } 
    16621662    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); 
    16641664        if (soap->body && soap_element_end_in(soap, tag)) 
    16651665            return NULL; 
     
    16681668} 
    16691669 
    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) 
     1670SOAP_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 
     1674SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ns__pingResponse(struct soap *soap, struct ns__pingResponse *p) 
    16751675{   soap_delete(soap, p); 
    16761676} 
    16771677 
    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); 
     1678SOAP_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); 
    16821682    if (!cp) 
    16831683        return NULL; 
    16841684    if (n < 0) 
    1685     {   cp->ptr = (void*)new struct ns__testResponse; 
     1685    {   cp->ptr = (void*)new struct ns__pingResponse; 
    16861686        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]; 
    16911691        if (!cp->ptr) 
    16921692        {   soap->error = SOAP_EOM; 
     
    16941694        } 
    16951695        if (size) 
    1696             *size = n * sizeof(struct ns__testResponse); 
     1696            *size = n * sizeof(struct ns__pingResponse); 
    16971697    } 
    16981698        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} 
     1701SOAP_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; 
    17051705} 
    17061706 
  • capture-mod/trunk/soapClient.cpp

    r1583 r1586  
    11/* soapClient.cpp 
    2    Generated by gSOAP 2.7.10 from calc.h 
     2   Generated by gSOAP 2.7.10 from captureGSOAP.h 
    33   Copyright(C) 2000-2008, Robert van Engelen, Genivia Inc. All Rights Reserved. 
    44   This part of the software is released under one of the following licenses: 
     
    77#include "soapH.h" 
    88 
    9 SOAP_SOURCE_STAMP("@(#) soapClient.cpp ver 2.7.10 2008-05-20 02:00:07 GMT") 
     9SOAP_SOURCE_STAMP("@(#) soapClient.cpp ver 2.7.10 2008-05-20 05:48:22 GMT") 
    1010 
    1111 
     
    6363} 
    6464 
    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; 
     65SOAP_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; 
    6868    if (!soap_endpoint) 
    6969        soap_endpoint = "http://192.168.0.131:1234"; 
    7070    soap->encodingStyle = ""; 
    71     soap_tmp_ns__test.a = a; 
     71    soap_tmp_ns__ping.a = a; 
    7272    soap_begin(soap); 
    7373    soap_serializeheader(soap); 
    74     soap_serialize_ns__test(soap, &soap_tmp_ns__test); 
     74    soap_serialize_ns__ping(soap, &soap_tmp_ns__ping); 
    7575    if (soap_begin_count(soap)) 
    7676        return soap->error; 
     
    7979         || soap_putheader(soap) 
    8080         || 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", "") 
    8282         || soap_body_end_out(soap) 
    8383         || soap_envelope_end_out(soap)) 
     
    9090     || soap_putheader(soap) 
    9191     || 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", "") 
    9393     || soap_body_end_out(soap) 
    9494     || soap_envelope_end_out(soap) 
     
    101101     || soap_body_begin_in(soap)) 
    102102        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", ""); 
    104104    if (soap->error) 
    105105    {   if (soap->error == SOAP_TAG_MISMATCH && soap->level == 2) 
     
    111111     || soap_end_recv(soap)) 
    112112        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; 
    115115    return soap_closesock(soap); 
    116116} 
  • capture-mod/trunk/soapClientLib.cpp

    r1583 r1586  
    11/* soapClientLib.cpp 
    2    Generated by gSOAP 2.7.10 from calc.h 
     2   Generated by gSOAP 2.7.10 from captureGSOAP.h 
    33   Copyright(C) 2000-2008, Robert van Engelen, Genivia Inc. All Rights Reserved. 
    44   This part of the software is released under one of the following licenses: 
  • capture-mod/trunk/soapH.h

    r1583 r1586  
    11/* soapH.h 
    2    Generated by gSOAP 2.7.10 from calc.h 
     2   Generated by gSOAP 2.7.10 from captureGSOAP.h 
    33   Copyright(C) 2000-2008, Robert van Engelen, Genivia Inc. All Rights Reserved. 
    44   This part of the software is released under one of the following licenses: 
     
    175175SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns__subResponse(struct soap*, int, int, void*, size_t, const void*, size_t); 
    176176 
    177 #ifndef SOAP_TYPE_ns__test 
    178 #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__testResponse 
    192 #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 
     180SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__ping(struct soap*, struct ns__ping *); 
     181SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns__ping(struct soap*, const struct ns__ping *); 
     182SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns__ping(struct soap*, const struct ns__ping *, const char*, const char*); 
     183SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns__ping(struct soap*, const char*, int, const struct ns__ping *, const char*); 
     184SOAP_FMAC3 struct ns__ping * SOAP_FMAC4 soap_get_ns__ping(struct soap*, struct ns__ping *, const char*, const char*); 
     185SOAP_FMAC3 struct ns__ping * SOAP_FMAC4 soap_in_ns__ping(struct soap*, const char*, struct ns__ping *, const char*); 
     186SOAP_FMAC5 struct ns__ping * SOAP_FMAC6 soap_new_ns__ping(struct soap*, int); 
     187SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ns__ping(struct soap*, struct ns__ping*); 
     188SOAP_FMAC3 struct ns__ping * SOAP_FMAC4 soap_instantiate_ns__ping(struct soap*, int, const char*, const char*, size_t*); 
     189SOAP_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 
     194SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__pingResponse(struct soap*, struct ns__pingResponse *); 
     195SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns__pingResponse(struct soap*, const struct ns__pingResponse *); 
     196SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns__pingResponse(struct soap*, const struct ns__pingResponse *, const char*, const char*); 
     197SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns__pingResponse(struct soap*, const char*, int, const struct ns__pingResponse *, const char*); 
     198SOAP_FMAC3 struct ns__pingResponse * SOAP_FMAC4 soap_get_ns__pingResponse(struct soap*, struct ns__pingResponse *, const char*, const char*); 
     199SOAP_FMAC3 struct ns__pingResponse * SOAP_FMAC4 soap_in_ns__pingResponse(struct soap*, const char*, struct ns__pingResponse *, const char*); 
     200SOAP_FMAC5 struct ns__pingResponse * SOAP_FMAC6 soap_new_ns__pingResponse(struct soap*, int); 
     201SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ns__pingResponse(struct soap*, struct ns__pingResponse*); 
     202SOAP_FMAC3 struct ns__pingResponse * SOAP_FMAC4 soap_instantiate_ns__pingResponse(struct soap*, int, const char*, const char*, size_t*); 
     203SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns__pingResponse(struct soap*, int, int, void*, size_t, const void*, size_t); 
    204204 
    205205#ifndef SOAP_TYPE_ns__add 
  • capture-mod/trunk/soapServer.cpp

    r1583 r1586  
    11/* soapServer.cpp 
    2    Generated by gSOAP 2.7.10 from calc.h 
     2   Generated by gSOAP 2.7.10 from captureGSOAP.h 
    33   Copyright(C) 2000-2008, Robert van Engelen, Genivia Inc. All Rights Reserved. 
    44   This part of the software is released under one of the following licenses: 
     
    77#include "soapH.h" 
    88 
    9 SOAP_SOURCE_STAMP("@(#) soapServer.cpp ver 2.7.10 2008-05-20 02:00:07 GMT") 
     9SOAP_SOURCE_STAMP("@(#) soapServer.cpp ver 2.7.10 2008-05-20 05:48:22 GMT") 
    1010 
    1111 
     
    7676    if (!soap_match_tag(soap, soap->tag, "ns:add")) 
    7777        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); 
    8080    if (!soap_match_tag(soap, soap->tag, "ns:sub")) 
    8181        return soap_serve_ns__sub(soap); 
     
    125125} 
    126126 
    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; 
     127SOAP_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; 
    130130    char * soap_tmp_string; 
    131     soap_default_ns__testResponse(soap, &soap_tmp_ns__testResponse); 
     131    soap_default_ns__pingResponse(soap, &soap_tmp_ns__pingResponse); 
    132132    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); 
    135135    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)) 
    137137        return soap->error; 
    138138    if (soap_body_end_in(soap) 
     
    140140     || soap_end_recv(soap)) 
    141141        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); 
    143143    if (soap->error) 
    144144        return soap->error; 
    145145    soap_serializeheader(soap); 
    146     soap_serialize_ns__testResponse(soap, &soap_tmp_ns__testResponse); 
     146    soap_serialize_ns__pingResponse(soap, &soap_tmp_ns__pingResponse); 
    147147    if (soap_begin_count(soap)) 
    148148        return soap->error; 
     
    151151         || soap_putheader(soap) 
    152152         || 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", "") 
    154154         || soap_body_end_out(soap) 
    155155         || soap_envelope_end_out(soap)) 
     
    161161     || soap_putheader(soap) 
    162162     || 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", "") 
    164164     || soap_body_end_out(soap) 
    165165     || soap_envelope_end_out(soap) 
  • capture-mod/trunk/soapServerLib.cpp

    r1583 r1586  
    11/* soapServerLib.cpp 
    2    Generated by gSOAP 2.7.10 from calc.h 
     2   Generated by gSOAP 2.7.10 from captureGSOAP.h 
    33   Copyright(C) 2000-2008, Robert van Engelen, Genivia Inc. All Rights Reserved. 
    44   This part of the software is released under one of the following licenses: 
  • capture-mod/trunk/soapStub.h

    r1583 r1586  
    11/* soapStub.h 
    2    Generated by gSOAP 2.7.10 from calc.h 
     2   Generated by gSOAP 2.7.10 from captureGSOAP.h 
    33   Copyright(C) 2000-2008, Robert van Engelen, Genivia Inc. All Rights Reserved. 
    44   This part of the software is released under one of the following licenses: 
     
    4949#endif 
    5050 
    51 #ifndef SOAP_TYPE_ns__testResponse 
    52 #define SOAP_TYPE_ns__testResponse (13) 
    53 /* ns:testResponse */ 
    54 struct ns__testResponse 
     51#ifndef SOAP_TYPE_ns__pingResponse 
     52#define SOAP_TYPE_ns__pingResponse (13) 
     53/* ns:pingResponse */ 
     54struct ns__pingResponse 
    5555{ 
    5656public: 
     
    5959#endif 
    6060 
    61 #ifndef SOAP_TYPE_ns__test 
    62 #define SOAP_TYPE_ns__test (14) 
    63 /* ns:test */ 
    64 struct ns__test 
     61#ifndef SOAP_TYPE_ns__ping 
     62#define SOAP_TYPE_ns__ping (14) 
     63/* ns:ping */ 
     64struct ns__ping 
    6565{ 
    6666public: 
     
    200200SOAP_FMAC5 int SOAP_FMAC6 ns__add(struct soap*, int a, int b, int &result); 
    201201 
    202 SOAP_FMAC5 int SOAP_FMAC6 ns__test(struct soap*, char *a, char **result); 
     202SOAP_FMAC5 int SOAP_FMAC6 ns__ping(struct soap*, char *a, char **result); 
    203203 
    204204SOAP_FMAC5 int SOAP_FMAC6 ns__sub(struct soap*, double a, double b, double &result); 
     
    213213SOAP_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); 
    214214 
    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); 
     215SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns__ping(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *a, char **result); 
    216216 
    217217SOAP_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); 
     
    229229SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns__add(struct soap*); 
    230230 
    231 SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns__test(struct soap*); 
     231SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns__ping(struct soap*); 
    232232 
    233233SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns__sub(struct soap*);