Core/Dependencies: update to gSoap v2.8.2 - windows users please test and give feedback if connectionissues has been resolved

This commit is contained in:
click
2011-04-27 00:34:22 +02:00
parent 374eba2f5d
commit d42c048818
6 changed files with 716 additions and 450 deletions
+29 -19
View File
@@ -1,6 +1,6 @@
/* soapC.cpp /* soapC.cpp
Generated by gSOAP 2.8.0 from stub.h Generated by gSOAP 2.8.2 from stub.h
Copyright(C) 2000-2010, Robert van Engelen, Genivia Inc. All Rights Reserved. Copyright(C) 2000-2011, Robert van Engelen, Genivia Inc. All Rights Reserved.
The generated code is released under one of the following licenses: The generated code is released under one of the following licenses:
GPL OR Genivia's license for commercial use. GPL OR Genivia's license for commercial use.
*/ */
@@ -12,7 +12,7 @@
#include "soapH.h" #include "soapH.h"
SOAP_SOURCE_STAMP("@(#) soapC.cpp ver 2.8.0 2010-12-16 23:55:15 GMT") SOAP_SOURCE_STAMP("@(#) soapC.cpp ver 2.8.2 2011-04-26 21:49:07 GMT")
#ifndef WITH_NOGLOBAL #ifndef WITH_NOGLOBAL
@@ -386,36 +386,46 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_fdelete(struct soap_clist *p)
else else
SOAP_DELETE_ARRAY((struct ns1__executeCommand*)p->ptr); SOAP_DELETE_ARRAY((struct ns1__executeCommand*)p->ptr);
break; break;
#ifndef WITH_NOGLOBAL
case SOAP_TYPE_SOAP_ENV__Header: case SOAP_TYPE_SOAP_ENV__Header:
if (p->size < 0) if (p->size < 0)
SOAP_DELETE((struct SOAP_ENV__Header*)p->ptr); SOAP_DELETE((struct SOAP_ENV__Header*)p->ptr);
else else
SOAP_DELETE_ARRAY((struct SOAP_ENV__Header*)p->ptr); SOAP_DELETE_ARRAY((struct SOAP_ENV__Header*)p->ptr);
break; break;
#endif
#ifndef WITH_NOGLOBAL
case SOAP_TYPE_SOAP_ENV__Code: case SOAP_TYPE_SOAP_ENV__Code:
if (p->size < 0) if (p->size < 0)
SOAP_DELETE((struct SOAP_ENV__Code*)p->ptr); SOAP_DELETE((struct SOAP_ENV__Code*)p->ptr);
else else
SOAP_DELETE_ARRAY((struct SOAP_ENV__Code*)p->ptr); SOAP_DELETE_ARRAY((struct SOAP_ENV__Code*)p->ptr);
break; break;
#endif
#ifndef WITH_NOGLOBAL
case SOAP_TYPE_SOAP_ENV__Detail: case SOAP_TYPE_SOAP_ENV__Detail:
if (p->size < 0) if (p->size < 0)
SOAP_DELETE((struct SOAP_ENV__Detail*)p->ptr); SOAP_DELETE((struct SOAP_ENV__Detail*)p->ptr);
else else
SOAP_DELETE_ARRAY((struct SOAP_ENV__Detail*)p->ptr); SOAP_DELETE_ARRAY((struct SOAP_ENV__Detail*)p->ptr);
break; break;
#endif
#ifndef WITH_NOGLOBAL
case SOAP_TYPE_SOAP_ENV__Reason: case SOAP_TYPE_SOAP_ENV__Reason:
if (p->size < 0) if (p->size < 0)
SOAP_DELETE((struct SOAP_ENV__Reason*)p->ptr); SOAP_DELETE((struct SOAP_ENV__Reason*)p->ptr);
else else
SOAP_DELETE_ARRAY((struct SOAP_ENV__Reason*)p->ptr); SOAP_DELETE_ARRAY((struct SOAP_ENV__Reason*)p->ptr);
break; break;
#endif
#ifndef WITH_NOGLOBAL
case SOAP_TYPE_SOAP_ENV__Fault: case SOAP_TYPE_SOAP_ENV__Fault:
if (p->size < 0) if (p->size < 0)
SOAP_DELETE((struct SOAP_ENV__Fault*)p->ptr); SOAP_DELETE((struct SOAP_ENV__Fault*)p->ptr);
else else
SOAP_DELETE_ARRAY((struct SOAP_ENV__Fault*)p->ptr); SOAP_DELETE_ARRAY((struct SOAP_ENV__Fault*)p->ptr);
break; break;
#endif
default: return SOAP_ERR; default: return SOAP_ERR;
} }
return SOAP_OK; return SOAP_OK;
@@ -536,9 +546,9 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_SOAP_ENV__Fault(struct soap *soap, const char
return soap->error; return soap->error;
if (soap_out__QName(soap, "faultcode", -1, (char*const*)&soap_tmp_faultcode, "")) if (soap_out__QName(soap, "faultcode", -1, (char*const*)&soap_tmp_faultcode, ""))
return soap->error; return soap->error;
if (soap_out_string(soap, "faultstring", -1, &a->faultstring, "")) if (soap_out_string(soap, "faultstring", -1, &a->faultstring, "xsd:string"))
return soap->error; return soap->error;
if (soap_out_string(soap, "faultactor", -1, &a->faultactor, "")) if (soap_out_string(soap, "faultactor", -1, &a->faultactor, "xsd:string"))
return soap->error; return soap->error;
if (soap_out_PointerToSOAP_ENV__Detail(soap, "detail", -1, &a->detail, "")) if (soap_out_PointerToSOAP_ENV__Detail(soap, "detail", -1, &a->detail, ""))
return soap->error; return soap->error;
@@ -676,7 +686,7 @@ SOAP_FMAC1 struct SOAP_ENV__Fault * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Fault(
if (size) if (size)
*size = n * sizeof(struct SOAP_ENV__Fault); *size = n * sizeof(struct SOAP_ENV__Fault);
} }
DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr)); DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
return (struct SOAP_ENV__Fault*)cp->ptr; return (struct SOAP_ENV__Fault*)cp->ptr;
} }
@@ -787,7 +797,7 @@ SOAP_FMAC1 struct SOAP_ENV__Reason * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Reaso
if (size) if (size)
*size = n * sizeof(struct SOAP_ENV__Reason); *size = n * sizeof(struct SOAP_ENV__Reason);
} }
DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr)); DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
return (struct SOAP_ENV__Reason*)cp->ptr; return (struct SOAP_ENV__Reason*)cp->ptr;
} }
@@ -805,9 +815,9 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_copy_SOAP_ENV__Reason(struct soap *soap, int st,
SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Detail(struct soap *soap, struct SOAP_ENV__Detail *a) SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Detail(struct soap *soap, struct SOAP_ENV__Detail *a)
{ {
(void)soap; (void)a; /* appease -Wall -Werror */ (void)soap; (void)a; /* appease -Wall -Werror */
a->__any = NULL;
a->__type = 0; a->__type = 0;
a->fault = NULL; a->fault = NULL;
a->__any = NULL;
} }
SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_SOAP_ENV__Detail(struct soap *soap, const struct SOAP_ENV__Detail *a) SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_SOAP_ENV__Detail(struct soap *soap, const struct SOAP_ENV__Detail *a)
@@ -820,16 +830,16 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_SOAP_ENV__Detail(struct soap *soap, const cha
{ {
if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_SOAP_ENV__Detail), type)) if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_SOAP_ENV__Detail), type))
return soap->error; return soap->error;
soap_outliteral(soap, "-any", &a->__any, NULL);
if (soap_putelement(soap, a->fault, "fault", -1, a->__type)) if (soap_putelement(soap, a->fault, "fault", -1, a->__type))
return soap->error; return soap->error;
soap_outliteral(soap, "-any", &a->__any, NULL);
return soap_element_end_out(soap, tag); return soap_element_end_out(soap, tag);
} }
SOAP_FMAC3 struct SOAP_ENV__Detail * SOAP_FMAC4 soap_in_SOAP_ENV__Detail(struct soap *soap, const char *tag, struct SOAP_ENV__Detail *a, const char *type) SOAP_FMAC3 struct SOAP_ENV__Detail * SOAP_FMAC4 soap_in_SOAP_ENV__Detail(struct soap *soap, const char *tag, struct SOAP_ENV__Detail *a, const char *type)
{ {
size_t soap_flag_fault = 1;
size_t soap_flag___any = 1; size_t soap_flag___any = 1;
size_t soap_flag_fault = 1;
if (soap_element_begin_in(soap, tag, 0, type)) if (soap_element_begin_in(soap, tag, 0, type))
return NULL; return NULL;
a = (struct SOAP_ENV__Detail *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_SOAP_ENV__Detail, sizeof(struct SOAP_ENV__Detail), 0, NULL, NULL, NULL); a = (struct SOAP_ENV__Detail *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_SOAP_ENV__Detail, sizeof(struct SOAP_ENV__Detail), 0, NULL, NULL, NULL);
@@ -905,7 +915,7 @@ SOAP_FMAC1 struct SOAP_ENV__Detail * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Detai
if (size) if (size)
*size = n * sizeof(struct SOAP_ENV__Detail); *size = n * sizeof(struct SOAP_ENV__Detail);
} }
DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr)); DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
return (struct SOAP_ENV__Detail*)cp->ptr; return (struct SOAP_ENV__Detail*)cp->ptr;
} }
@@ -1025,7 +1035,7 @@ SOAP_FMAC1 struct SOAP_ENV__Code * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Code(st
if (size) if (size)
*size = n * sizeof(struct SOAP_ENV__Code); *size = n * sizeof(struct SOAP_ENV__Code);
} }
DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr)); DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
return (struct SOAP_ENV__Code*)cp->ptr; return (struct SOAP_ENV__Code*)cp->ptr;
} }
@@ -1124,7 +1134,7 @@ SOAP_FMAC1 struct SOAP_ENV__Header * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Heade
if (size) if (size)
*size = n * sizeof(struct SOAP_ENV__Header); *size = n * sizeof(struct SOAP_ENV__Header);
} }
DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr)); DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
return (struct SOAP_ENV__Header*)cp->ptr; return (struct SOAP_ENV__Header*)cp->ptr;
} }
@@ -1153,7 +1163,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns1__executeCommand(struct soap *soap, const
{ {
if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__executeCommand), type)) if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__executeCommand), type))
return soap->error; return soap->error;
if (soap_out_string(soap, "command", -1, &a->command, "")) if (soap_out_string(soap, "command", -1, &a->command, "xsd:string"))
return soap->error; return soap->error;
return soap_element_end_out(soap, tag); return soap_element_end_out(soap, tag);
} }
@@ -1231,7 +1241,7 @@ SOAP_FMAC1 struct ns1__executeCommand * SOAP_FMAC2 soap_instantiate_ns1__execute
if (size) if (size)
*size = n * sizeof(struct ns1__executeCommand); *size = n * sizeof(struct ns1__executeCommand);
} }
DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr)); DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
return (struct ns1__executeCommand*)cp->ptr; return (struct ns1__executeCommand*)cp->ptr;
} }
@@ -1258,7 +1268,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns1__executeCommandResponse(struct soap *soap
{ {
if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__executeCommandResponse), type)) if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__executeCommandResponse), type))
return soap->error; return soap->error;
if (soap_out_PointerTostring(soap, "result", -1, &a->result, "")) if (soap_out_PointerTostring(soap, "result", -1, &a->result, "xsd:string"))
return soap->error; return soap->error;
return soap_element_end_out(soap, tag); return soap_element_end_out(soap, tag);
} }
@@ -1336,7 +1346,7 @@ SOAP_FMAC1 struct ns1__executeCommandResponse * SOAP_FMAC2 soap_instantiate_ns1_
if (size) if (size)
*size = n * sizeof(struct ns1__executeCommandResponse); *size = n * sizeof(struct ns1__executeCommandResponse);
} }
DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr)); DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
return (struct ns1__executeCommandResponse*)cp->ptr; return (struct ns1__executeCommandResponse*)cp->ptr;
} }
@@ -1570,7 +1580,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__QName(struct soap *soap, const char *tag, in
SOAP_FMAC3 char * * SOAP_FMAC4 soap_in__QName(struct soap *soap, const char *tag, char **a, const char *type) SOAP_FMAC3 char * * SOAP_FMAC4 soap_in__QName(struct soap *soap, const char *tag, char **a, const char *type)
{ char **p; { char **p;
p = soap_instring(soap, tag, a, type, SOAP_TYPE__QName, 2, -1, -1); p = soap_instring(soap, tag, a, type, SOAP_TYPE__QName, 2, 0, -1);
return p; return p;
} }
@@ -1612,7 +1622,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_string(struct soap *soap, const char *tag, in
SOAP_FMAC3 char * * SOAP_FMAC4 soap_in_string(struct soap *soap, const char *tag, char **a, const char *type) SOAP_FMAC3 char * * SOAP_FMAC4 soap_in_string(struct soap *soap, const char *tag, char **a, const char *type)
{ char **p; { char **p;
p = soap_instring(soap, tag, a, type, SOAP_TYPE_string, 1, -1, -1); p = soap_instring(soap, tag, a, type, SOAP_TYPE_string, 1, 0, -1);
return p; return p;
} }
+2 -2
View File
@@ -1,6 +1,6 @@
/* soapH.h /* soapH.h
Generated by gSOAP 2.8.0 from stub.h Generated by gSOAP 2.8.2 from stub.h
Copyright(C) 2000-2010, Robert van Engelen, Genivia Inc. All Rights Reserved. Copyright(C) 2000-2011, Robert van Engelen, Genivia Inc. All Rights Reserved.
The generated code is released under one of the following licenses: The generated code is released under one of the following licenses:
GPL OR Genivia's license for commercial use. GPL OR Genivia's license for commercial use.
*/ */
+9 -35
View File
@@ -1,6 +1,6 @@
/* soapServer.cpp /* soapServer.cpp
Generated by gSOAP 2.8.0 from stub.h Generated by gSOAP 2.8.2 from stub.h
Copyright(C) 2000-2010, Robert van Engelen, Genivia Inc. All Rights Reserved. Copyright(C) 2000-2011, Robert van Engelen, Genivia Inc. All Rights Reserved.
The generated code is released under one of the following licenses: The generated code is released under one of the following licenses:
GPL OR Genivia's license for commercial use. GPL OR Genivia's license for commercial use.
*/ */
@@ -11,7 +11,7 @@
#endif #endif
#include "soapH.h" #include "soapH.h"
SOAP_SOURCE_STAMP("@(#) soapServer.cpp ver 2.8.0 2010-12-16 23:55:15 GMT") SOAP_SOURCE_STAMP("@(#) soapServer.cpp ver 2.8.2 2011-04-26 21:49:07 GMT")
SOAP_FMAC5 int SOAP_FMAC6 soap_serve(struct soap *soap) SOAP_FMAC5 int SOAP_FMAC6 soap_serve(struct soap *soap)
@@ -19,43 +19,18 @@ SOAP_FMAC5 int SOAP_FMAC6 soap_serve(struct soap *soap)
#ifndef WITH_FASTCGI #ifndef WITH_FASTCGI
unsigned int k = soap->max_keep_alive; unsigned int k = soap->max_keep_alive;
#endif #endif
do do
{ {
#ifdef WITH_FASTCGI
if (FCGI_Accept() < 0)
{
soap->error = SOAP_EOF;
return soap_send_fault(soap);
}
#endif
soap_begin(soap);
#ifndef WITH_FASTCGI #ifndef WITH_FASTCGI
if (soap->max_keep_alive > 0 && !--k) if (soap->max_keep_alive > 0 && !--k)
soap->keep_alive = 0; soap->keep_alive = 0;
#endif #endif
if (soap_begin_serve(soap))
if (soap_begin_recv(soap)) { if (soap->error >= SOAP_STOP)
{ if (soap->error < SOAP_STOP) continue;
{ return soap->error;
#ifdef WITH_FASTCGI
soap_send_fault(soap);
#else
return soap_send_fault(soap);
#endif
}
soap_closesock(soap);
continue;
} }
if (soap_serve_request(soap) || (soap->fserveloop && soap->fserveloop(soap)))
if (soap_envelope_begin_in(soap)
|| soap_recv_header(soap)
|| soap_body_begin_in(soap)
|| soap_serve_request(soap)
|| (soap->fserveloop && soap->fserveloop(soap)))
{ {
#ifdef WITH_FASTCGI #ifdef WITH_FASTCGI
soap_send_fault(soap); soap_send_fault(soap);
@@ -92,14 +67,13 @@ SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns1__executeCommand(struct soap *soap)
soap_tmp_string = NULL; soap_tmp_string = NULL;
soap_tmp_ns1__executeCommandResponse.result = &soap_tmp_string; soap_tmp_ns1__executeCommandResponse.result = &soap_tmp_string;
soap_default_ns1__executeCommand(soap, &soap_tmp_ns1__executeCommand); soap_default_ns1__executeCommand(soap, &soap_tmp_ns1__executeCommand);
soap->encodingStyle = NULL;
if (!soap_get_ns1__executeCommand(soap, &soap_tmp_ns1__executeCommand, "ns1:executeCommand", NULL)) if (!soap_get_ns1__executeCommand(soap, &soap_tmp_ns1__executeCommand, "ns1:executeCommand", NULL))
return soap->error; return soap->error;
if (soap_body_end_in(soap) if (soap_body_end_in(soap)
|| soap_envelope_end_in(soap) || soap_envelope_end_in(soap)
|| soap_end_recv(soap)) || soap_end_recv(soap))
return soap->error; return soap->error;
soap->error = ns1__executeCommand(soap, soap_tmp_ns1__executeCommand.command, &soap_tmp_string); soap->error = ns1__executeCommand(soap, soap_tmp_ns1__executeCommand.command, soap_tmp_ns1__executeCommandResponse.result);
if (soap->error) if (soap->error)
return soap->error; return soap->error;
soap_serializeheader(soap); soap_serializeheader(soap);
+23 -12
View File
@@ -1,6 +1,6 @@
/* soapStub.h /* soapStub.h
Generated by gSOAP 2.8.0 from stub.h Generated by gSOAP 2.8.2 from stub.h
Copyright(C) 2000-2010, Robert van Engelen, Genivia Inc. All Rights Reserved. Copyright(C) 2000-2011, Robert van Engelen, Genivia Inc. All Rights Reserved.
The generated code is released under one of the following licenses: The generated code is released under one of the following licenses:
GPL OR Genivia's license for commercial use. GPL OR Genivia's license for commercial use.
*/ */
@@ -54,6 +54,8 @@ public:
}; };
#endif #endif
#ifndef WITH_NOGLOBAL
#ifndef SOAP_TYPE_SOAP_ENV__Header #ifndef SOAP_TYPE_SOAP_ENV__Header
#define SOAP_TYPE_SOAP_ENV__Header (11) #define SOAP_TYPE_SOAP_ENV__Header (11)
/* SOAP Header: */ /* SOAP Header: */
@@ -66,6 +68,10 @@ private:
}; };
#endif #endif
#endif
#ifndef WITH_NOGLOBAL
#ifndef SOAP_TYPE_SOAP_ENV__Code #ifndef SOAP_TYPE_SOAP_ENV__Code
#define SOAP_TYPE_SOAP_ENV__Code (12) #define SOAP_TYPE_SOAP_ENV__Code (12)
/* SOAP Fault Code: */ /* SOAP Fault Code: */
@@ -77,18 +83,26 @@ public:
}; };
#endif #endif
#endif
#ifndef WITH_NOGLOBAL
#ifndef SOAP_TYPE_SOAP_ENV__Detail #ifndef SOAP_TYPE_SOAP_ENV__Detail
#define SOAP_TYPE_SOAP_ENV__Detail (14) #define SOAP_TYPE_SOAP_ENV__Detail (14)
/* SOAP-ENV:Detail */ /* SOAP-ENV:Detail */
struct SOAP_ENV__Detail struct SOAP_ENV__Detail
{ {
public: public:
char *__any;
int __type; /* any type of element <fault> (defined below) */ int __type; /* any type of element <fault> (defined below) */
void *fault; /* transient */ void *fault; /* transient */
char *__any;
}; };
#endif #endif
#endif
#ifndef WITH_NOGLOBAL
#ifndef SOAP_TYPE_SOAP_ENV__Reason #ifndef SOAP_TYPE_SOAP_ENV__Reason
#define SOAP_TYPE_SOAP_ENV__Reason (17) #define SOAP_TYPE_SOAP_ENV__Reason (17)
/* SOAP-ENV:Reason */ /* SOAP-ENV:Reason */
@@ -99,6 +113,10 @@ public:
}; };
#endif #endif
#endif
#ifndef WITH_NOGLOBAL
#ifndef SOAP_TYPE_SOAP_ENV__Fault #ifndef SOAP_TYPE_SOAP_ENV__Fault
#define SOAP_TYPE_SOAP_ENV__Fault (18) #define SOAP_TYPE_SOAP_ENV__Fault (18)
/* SOAP Fault: */ /* SOAP Fault: */
@@ -117,6 +135,8 @@ public:
}; };
#endif #endif
#endif
/******************************************************************************\ /******************************************************************************\
* * * *
* Typedefs * * Typedefs *
@@ -162,15 +182,6 @@ SOAP_FMAC5 int SOAP_FMAC6 soap_serve_request(struct soap*);
SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns1__executeCommand(struct soap*); SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns1__executeCommand(struct soap*);
/******************************************************************************\
* *
* Client-Side Call Stubs *
* *
\******************************************************************************/
SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__executeCommand(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *command, char **result);
#endif #endif
/* End of soapStub.h */ /* End of soapStub.h */
+522 -319
View File
File diff suppressed because it is too large Load Diff
+131 -63
View File
@@ -1,10 +1,10 @@
/* /*
stdsoap2.h 2.8.0 stdsoap2.h 2.8.2
gSOAP runtime engine gSOAP runtime engine
gSOAP XML Web services tools gSOAP XML Web services tools
Copyright (C) 2000-2010, Robert van Engelen, Genivia Inc., All Rights Reserved. Copyright (C) 2000-2011, Robert van Engelen, Genivia Inc., All Rights Reserved.
This part of the software is released under ONE of the following licenses: This part of the software is released under ONE of the following licenses:
GPL, or the gSOAP public license, or Genivia's license for commercial use. GPL, or the gSOAP public license, or Genivia's license for commercial use.
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
@@ -24,7 +24,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
for the specific language governing rights and limitations under the License. for the specific language governing rights and limitations under the License.
The Initial Developer of the Original Code is Robert A. van Engelen. The Initial Developer of the Original Code is Robert A. van Engelen.
Copyright (C) 2000-2010, Robert van Engelen, Genivia Inc., All Rights Reserved. Copyright (C) 2000-2011, Robert van Engelen, Genivia Inc., All Rights Reserved.
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
GPL license. GPL license.
@@ -114,27 +114,6 @@ A commercial use license is available from Genivia, Inc., [email protected]
# define WITH_FAST # define WITH_FAST
#endif #endif
/* gSOAP 2.7.15 and higher: always retain CDATA in literal XML, unless WITH_LEAN or WITH_NOCDATA */
#ifndef WITH_LEAN
# ifndef WITH_NOCDATA
# ifndef WITH_CDATA
# define WITH_CDATA
# endif
# endif
#endif
#ifdef WITH_LEANER
# ifndef WITH_LEAN
# define WITH_LEAN
# endif
#endif
#ifdef WITH_LEAN
# ifdef WITH_COOKIES
# error "Cannot build WITH_LEAN code WITH_COOKIES enabled"
# endif
#endif
#ifndef STDSOAP_H #ifndef STDSOAP_H
#define STDSOAP_H #define STDSOAP_H
@@ -311,9 +290,10 @@ A commercial use license is available from Genivia, Inc., [email protected]
# define HAVE_RAND_R # define HAVE_RAND_R
# define HAVE_GMTIME_R # define HAVE_GMTIME_R
# define HAVE_LOCALTIME_R # define HAVE_LOCALTIME_R
# define HAVE_STRERROR_R
# define HAVE_WCTOMB # define HAVE_WCTOMB
# define HAVE_MBTOWC # define HAVE_MBTOWC
# define HAVE_ISNAN
# define HAVE_ISINF
# elif defined(FREEBSD) || defined(__FreeBSD__) || defined(OPENBSD) # elif defined(FREEBSD) || defined(__FreeBSD__) || defined(OPENBSD)
# define HAVE_POLL # define HAVE_POLL
# define HAVE_SNPRINTF # define HAVE_SNPRINTF
@@ -336,7 +316,10 @@ A commercial use license is available from Genivia, Inc., [email protected]
# define HAVE_MBTOWC # define HAVE_MBTOWC
# define SOAP_LONG_FORMAT "%qd" # define SOAP_LONG_FORMAT "%qd"
# define SOAP_ULONG_FORMAT "%qu" # define SOAP_ULONG_FORMAT "%qu"
# define HAVE_ISNAN
# define HAVE_ISINF
# elif defined(__VMS) # elif defined(__VMS)
# include <ioctl.h>
# define HAVE_SNPRINTF # define HAVE_SNPRINTF
# define HAVE_STRRCHR # define HAVE_STRRCHR
# define HAVE_STRTOD # define HAVE_STRTOD
@@ -373,6 +356,7 @@ A commercial use license is available from Genivia, Inc., [email protected]
# define HAVE_WCTOMB # define HAVE_WCTOMB
# define HAVE_MBTOWC # define HAVE_MBTOWC
# define HAVE_ISNAN # define HAVE_ISNAN
# define HAVE_ISINF
# elif defined(TRU64) # elif defined(TRU64)
# define HAVE_SNPRINTF # define HAVE_SNPRINTF
# define HAVE_STRRCHR # define HAVE_STRRCHR
@@ -510,6 +494,27 @@ A commercial use license is available from Genivia, Inc., [email protected]
# endif # endif
#endif #endif
/* gSOAP 2.7.15 and higher: always retain CDATA in literal XML, unless WITH_LEAN or WITH_NOCDATA */
#ifndef WITH_LEAN
# ifndef WITH_NOCDATA
# ifndef WITH_CDATA
# define WITH_CDATA
# endif
# endif
#endif
#ifdef WITH_LEANER
# ifndef WITH_LEAN
# define WITH_LEAN
# endif
#endif
#ifdef WITH_LEAN
# ifdef WITH_COOKIES
# error "Cannot build WITH_LEAN code WITH_COOKIES enabled"
# endif
#endif
/* native Win and HP-UX compilers don't like empty structs */ /* native Win and HP-UX compilers don't like empty structs */
#if defined(WIN32) || defined(HP_UX) || defined(_AIX41) || defined(_AIX43) || defined(VXWORKS) #if defined(WIN32) || defined(HP_UX) || defined(_AIX41) || defined(_AIX43) || defined(VXWORKS)
# define WITH_NOEMPTYSTRUCT # define WITH_NOEMPTYSTRUCT
@@ -538,6 +543,39 @@ A commercial use license is available from Genivia, Inc., [email protected]
# undef HAVE_SPRINTF_L # undef HAVE_SPRINTF_L
#endif #endif
#ifdef TANDEM
# define SOAP_BUFLEN (32767)
/*# define WITH_NOSTDLIB */ /* uncommment to remove stdlib dependences */
# define WITH_NOIO /* no IO dependences, e.g. remove TCP/IP */
# define int32_t int
# define int64_t long long
# define LONG64 long long
# define ULONG64 long long
# define DBL_PINFTY (1.1579208923716189e77)
# define WITH_NOEMPTYSTRUCT
# undef HAVE_WCTOMB
# undef HAVE_MBTOWC
# undef HAVE_GMTIME_R
# undef HAVE_LOCALTIME_R
# undef HAVE_SNPRINTF
# define SOAP_BUFLEN (32767)
# define SOAP_SOCKET short
#pragma nolist
# include <sys\param.h>
# include <sys\socket.h>
# include <netinet\in.h>
# include <netdb.h>
# include <stdio.h>
# include <fcntl.h>
# include <string.h>
# include <stdlib.h>
# include <memory.h>
# include <errno.h>
# include <cextdecs.h(TIME,FILE_CLOSE_,AWAITIOX,DELAY,FILEINFO,FILE_GETINFO_)>
# define INET_ERROR 4294967295
#pragma list
#endif
#ifndef WITH_NOSTDLIB #ifndef WITH_NOSTDLIB
# include <stdlib.h> # include <stdlib.h>
# ifndef PALM # ifndef PALM
@@ -653,18 +691,11 @@ A commercial use license is available from Genivia, Inc., [email protected]
# include <io.h> # include <io.h>
# include <fcntl.h> # include <fcntl.h>
# endif # endif
# ifdef WITH_IPV6
# include <winsock2.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */ # include <winsock2.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
# include <ws2tcpip.h> # include <ws2tcpip.h>
# include <wspiapi.h> # include <wspiapi.h>
# ifdef WITH_IPV6
# define SOAP_GAI_STRERROR gai_strerrorA # define SOAP_GAI_STRERROR gai_strerrorA
# else
# ifndef __BORLANDC__
# include <winsock.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
/* # include <winsock2.h> */ /* Alternative: use winsock2 (not available with eVC), enable this line and comment out the line above */
# else
# include <winsock2.h> /* Borland C */
# endif
# endif # endif
#else #else
# ifdef VXWORKS # ifdef VXWORKS
@@ -690,6 +721,10 @@ A commercial use license is available from Genivia, Inc., [email protected]
#endif #endif
#ifdef WITH_OPENSSL #ifdef WITH_OPENSSL
# ifdef __VMS
# pragma names save
# pragma names uppercase
# endif
# undef WITH_GNUTLS # undef WITH_GNUTLS
# define OPENSSL_NO_KRB5 # define OPENSSL_NO_KRB5
# include <openssl/bio.h> # include <openssl/bio.h>
@@ -702,6 +737,9 @@ A commercial use license is available from Genivia, Inc., [email protected]
# error "Must use OpenSSL 0.9.6 or later" # error "Must use OpenSSL 0.9.6 or later"
# endif # endif
# endif # endif
# ifdef __VMS
# pragma names restore
# endif
#endif #endif
#ifdef WITH_GNUTLS #ifdef WITH_GNUTLS
@@ -904,7 +942,7 @@ extern "C" {
#endif #endif
#ifndef SOAP_PTRHASH #ifndef SOAP_PTRHASH
# ifndef WITH_LEAN # ifndef WITH_LEAN
# define SOAP_PTRHASH (1024) /* size of pointer analysis hash table (must be power of 2) */ # define SOAP_PTRHASH (4096) /* size of pointer analysis hash table (must be power of 2) */
# else # else
# define SOAP_PTRHASH (32) # define SOAP_PTRHASH (32)
# endif # endif
@@ -918,7 +956,7 @@ extern "C" {
#endif #endif
#ifndef SOAP_BLKLEN #ifndef SOAP_BLKLEN
# ifndef WITH_LEAN # ifndef WITH_LEAN
# define SOAP_BLKLEN (256) /* size of blocks to collect long strings and XML attributes */ # define SOAP_BLKLEN (256) /* to collect long strings and XML attributes */
# else # else
# define SOAP_BLKLEN (32) # define SOAP_BLKLEN (32)
# endif # endif
@@ -987,7 +1025,11 @@ extern "C" {
# ifndef HAVE_ISNAN # ifndef HAVE_ISNAN
# define HAVE_ISNAN # define HAVE_ISNAN
# endif # endif
# define soap_isnan(num) _isnan(num) # define soap_isnan(n) _isnan(n)
# ifndef HAVE_ISINF
# define HAVE_ISINF
# endif
# define soap_isinf(n) (!_finite(n))
#endif #endif
#ifdef SUN_OS #ifdef SUN_OS
@@ -998,16 +1040,24 @@ extern "C" {
# ifdef __cplusplus # ifdef __cplusplus
# ifndef isnan # ifndef isnan
extern "C" int isnan(double); extern "C" int isnan(double);
extern "C" int isinf(double);
# endif # endif
# endif # endif
# define HAVE_ISNAN # ifndef HAVE_ISNAN
# define HAVE_ISNAN
# endif
# ifndef HAVE_ISINF
# define HAVE_ISINF
# endif
#endif #endif
#if !defined(HAVE_ISNAN) && (defined(_MATH_H) || defined(_MATH_INCLUDED)) #if !defined(HAVE_ISNAN) && (defined(_MATH_H) || defined(_MATH_INCLUDED))
# define HAVE_ISNAN # define HAVE_ISNAN
#endif #endif
extern const struct soap_double_nan { unsigned int n1, n2; } soap_double_nan; union soap_double_nan {struct {unsigned int n1, n2;} iv; double dv; float fv;};
extern const union soap_double_nan soap_double_nan;
extern const char soap_base64o[], soap_base64i[];
#ifdef VXWORKS #ifdef VXWORKS
# ifndef FLT_MAX # ifndef FLT_MAX
@@ -1019,7 +1069,7 @@ extern const struct soap_double_nan { unsigned int n1, n2; } soap_double_nan;
#endif #endif
#ifndef FLT_NAN #ifndef FLT_NAN
# define FLT_NAN (*(float*)(void*)&soap_double_nan) # define FLT_NAN (soap_double_nan.fv)
#endif #endif
#ifndef FLT_PINFTY #ifndef FLT_PINFTY
@@ -1041,7 +1091,7 @@ extern const struct soap_double_nan { unsigned int n1, n2; } soap_double_nan;
#endif #endif
#ifndef DBL_NAN #ifndef DBL_NAN
# define DBL_NAN (*(double*)(void*)&soap_double_nan) # define DBL_NAN (soap_double_nan.dv)
#endif #endif
#ifndef DBL_PINFTY #ifndef DBL_PINFTY
@@ -1066,14 +1116,22 @@ extern const struct soap_double_nan { unsigned int n1, n2; } soap_double_nan;
# ifdef HAVE_ISNAN # ifdef HAVE_ISNAN
# define soap_isnan(n) isnan(n) # define soap_isnan(n) isnan(n)
# else # else
# define soap_isnan(n) (0) # define soap_isnan(n) ((n) != (n))
# endif # endif
#endif #endif
#define soap_ispinfd(n) ((n) >= DBL_PINFTY) #ifndef soap_isinf
#define soap_ispinff(n) ((n) >= FLT_PINFTY) # ifdef HAVE_ISINF
#define soap_isninfd(n) ((n) <= DBL_NINFTY) # define soap_isinf(n) isinf(n)
#define soap_isninff(n) ((n) <= FLT_NINFTY) # else
# define soap_isinf(n) (!soap_isnan(n) && soap_isnan((n) - (n)))
# endif
#endif
#define soap_ispinfd(n) ((n) > 0 && soap_isinf(n))
#define soap_ispinff(n) ((n) > 0 && soap_isinf(n))
#define soap_isninfd(n) ((n) < 0 && soap_isinf(n))
#define soap_isninff(n) ((n) < 0 && soap_isinf(n))
/* gSOAP error codes */ /* gSOAP error codes */
@@ -1212,7 +1270,7 @@ typedef soap_int32 soap_mode;
#define SOAP_MIME_POSTCHECK 0x10000000 /* MIME flag (internal) */ #define SOAP_MIME_POSTCHECK 0x10000000 /* MIME flag (internal) */
#define SOAP_XML_SEC 0x80000000 /* reserved for WS security */ #define SOAP_SEC_WSUID 0x80000000 /* Add Body wsu:Id */
/* WITH_XMLNS backward compatibility: always use XML default namespaces */ /* WITH_XMLNS backward compatibility: always use XML default namespaces */
#ifdef WITH_XMLNS #ifdef WITH_XMLNS
@@ -1245,7 +1303,7 @@ typedef soap_int32 soap_mode;
#define soap_check_state(soap) (!(soap) || ((soap)->state != SOAP_INIT && (soap)->state != SOAP_COPY)) #define soap_check_state(soap) (!(soap) || ((soap)->state != SOAP_INIT && (soap)->state != SOAP_COPY))
/* part */ /* parts, states, and events */
#define SOAP_BEGIN 0 #define SOAP_BEGIN 0
#define SOAP_IN_ENVELOPE 2 #define SOAP_IN_ENVELOPE 2
@@ -1256,9 +1314,9 @@ typedef soap_int32 soap_mode;
#define SOAP_END_BODY 7 #define SOAP_END_BODY 7
#define SOAP_END_ENVELOPE 8 #define SOAP_END_ENVELOPE 8
#define SOAP_END 9 #define SOAP_END 9
#define SOAP_BEGIN_SECURITY 10
#define SOAP_IN_SECURITY 11 #define SOAP_SEC_BEGIN 10
#define SOAP_END_SECURITY 12 #define SOAP_SEC_SIGN 11
/* DEBUG macros */ /* DEBUG macros */
@@ -1290,16 +1348,16 @@ typedef soap_int32 soap_mode;
# define SOAP_FREE(soap, ptr) free(ptr) # define SOAP_FREE(soap, ptr) free(ptr)
#endif #endif
#ifndef SOAP_NEW /* use C++ new operator */ #ifndef SOAP_NEW /* use C++ new operator */
# if __GNUC__ <= 2 # if (__GNUC__ <= 2) && !defined(__BORLANDC__) /* Borland uses GNU C? */
# define SOAP_NEW(type) new type /* old form w/o parenthesis */ # define SOAP_NEW(type) new type /* old form w/o parenthesis */
# else # else
# define SOAP_NEW(type) new (type) /* with parenthesis */ # define SOAP_NEW(type) new (type) /* prefer with parenthesis */
# endif # endif
#endif #endif
#ifndef SOAP_NEW_COPY /* use C++ new operator for ::copy() */ #ifndef SOAP_NEW_COPY /* use C++ new operator for ::copy() */
# define SOAP_NEW_COPY(clas) new clas # define SOAP_NEW_COPY(clas) new clas /* prefer w/o parenthesis */
#endif #endif
#ifndef SOAP_DELETE /* use C++ delete operator */ #ifndef SOAP_DELETE /* use C++ delete operator */
@@ -1445,7 +1503,7 @@ struct soap_attribute
short flag; /* soap_set_attr: 1 = normal, 2 = utf content */ short flag; /* soap_set_attr: 1 = normal, 2 = utf content */
char *value; char *value;
size_t size; size_t size;
char *ns; const char *ns;
short visible; short visible;
char name[1]; /* the actual name string flows into the allocated region below this struct */ char name[1]; /* the actual name string flows into the allocated region below this struct */
}; };
@@ -1729,7 +1787,8 @@ struct SOAP_STD_API soap
struct SOAP_ENV__Header *header; struct SOAP_ENV__Header *header;
struct SOAP_ENV__Fault *fault; struct SOAP_ENV__Fault *fault;
int idnum; int idnum;
void *user; /* to pass user-defined data */ void *user; /* for user to pass user-defined data */
void *data[4]; /* extension data = {smdevp, mecevp, ...} */
struct soap_plugin *plugins; /* linked list of plug-in data */ struct soap_plugin *plugins; /* linked list of plug-in data */
const char *userid; /* HTTP Basic authorization userid */ const char *userid; /* HTTP Basic authorization userid */
const char *passwd; /* HTTP Basic authorization passwd */ const char *passwd; /* HTTP Basic authorization passwd */
@@ -1762,12 +1821,19 @@ struct SOAP_STD_API soap
void *(*fplugin)(struct soap*, const char*); void *(*fplugin)(struct soap*, const char*);
void *(*fmalloc)(struct soap*, size_t); void *(*fmalloc)(struct soap*, size_t);
#ifndef WITH_LEANER #ifndef WITH_LEANER
int (*feltbegin)(struct soap*, const char*);
int (*feltendin)(struct soap*, const char*, const char*);
int (*feltbegout)(struct soap*, const char*);
int (*feltendout)(struct soap*, const char*);
int (*fprepareinitsend)(struct soap*); int (*fprepareinitsend)(struct soap*);
int (*fprepareinitrecv)(struct soap*); int (*fprepareinitrecv)(struct soap*);
int (*fpreparesend)(struct soap*, const char*, size_t); int (*fpreparesend)(struct soap*, const char*, size_t);
int (*fpreparerecv)(struct soap*, const char*, size_t); int (*fpreparerecv)(struct soap*, const char*, size_t);
int (*fpreparefinalsend)(struct soap*); int (*fpreparefinalsend)(struct soap*);
int (*fpreparefinalrecv)(struct soap*); int (*fpreparefinalrecv)(struct soap*);
int filterstop;
int (*ffiltersend)(struct soap*, const char**, size_t*);
int (*ffilterrecv)(struct soap*, char*, size_t*, size_t);
void *(*fdimereadopen)(struct soap*, void*, const char*, const char*, const char*); void *(*fdimereadopen)(struct soap*, void*, const char*, const char*, const char*);
void *(*fdimewriteopen)(struct soap*, const char*, const char*, const char*); void *(*fdimewriteopen)(struct soap*, const char*, const char*, const char*);
void (*fdimereadclose)(struct soap*, void*); void (*fdimereadclose)(struct soap*, void*);
@@ -1791,8 +1857,8 @@ struct SOAP_STD_API soap
void *is; /* preserve struct size */ void *is; /* preserve struct size */
#endif #endif
#ifndef UNDER_CE #ifndef UNDER_CE
int sendfd; int sendfd; /* WinCE FD to send */
int recvfd; int recvfd; /* WinCE FD to receive */
#else #else
FILE *sendfd; FILE *sendfd;
FILE *recvfd; FILE *recvfd;
@@ -1827,7 +1893,8 @@ struct SOAP_STD_API soap
short mustUnderstand; /* a mustUnderstand element was parsed or is output */ short mustUnderstand; /* a mustUnderstand element was parsed or is output */
short null; /* parsed XML is xsi:nil */ short null; /* parsed XML is xsi:nil */
short ns; /* when not set, output full xmlns bindings */ short ns; /* when not set, output full xmlns bindings */
short part; /* parsing state */ short part; /* SOAP part state (header or body) */
short event; /* engine events and states for use by plugins */
short alloced; short alloced;
short peeked; short peeked;
size_t chunksize; size_t chunksize;
@@ -1876,9 +1943,9 @@ struct SOAP_STD_API soap
int cookie_max; int cookie_max;
#endif #endif
#ifndef WITH_NOIO #ifndef WITH_NOIO
int ipv6_multicast_if; /* always include this to keep the soap struct size the same in v4 and v6 */ int ipv6_multicast_if; /* in6addr->sin6_scope_id IPv6 value */
char* ipv4_multicast_if; /* always include this to keep the soap struct size the same in v4 and v6 */ char* ipv4_multicast_if; /* IP_MULTICAST_IF IPv4 setsockopt interface_addr */
int ipv4_multicast_ttl; /* multicast scope */ unsigned char ipv4_multicast_ttl; /* IP_MULTICAST_TTL value 0..255 */
#ifdef WITH_IPV6 #ifdef WITH_IPV6
struct sockaddr_storage peer; /* IPv6: set by soap_accept and by UDP recv */ struct sockaddr_storage peer; /* IPv6: set by soap_accept and by UDP recv */
#else #else
@@ -2160,6 +2227,7 @@ SOAP_FMAC1 long SOAP_FMAC2 soap_code_bits(const struct soap_code_map*, const cha
SOAP_FMAC1 const char* SOAP_FMAC2 soap_code_list(struct soap*, const struct soap_code_map*, long); SOAP_FMAC1 const char* SOAP_FMAC2 soap_code_list(struct soap*, const struct soap_code_map*, long);
SOAP_FMAC1 int SOAP_FMAC2 soap_getline(struct soap*, char*, int); SOAP_FMAC1 int SOAP_FMAC2 soap_getline(struct soap*, char*, int);
SOAP_FMAC1 int SOAP_FMAC2 soap_begin_serve(struct soap*);
SOAP_FMAC1 int SOAP_FMAC2 soap_begin_recv(struct soap*); SOAP_FMAC1 int SOAP_FMAC2 soap_begin_recv(struct soap*);
SOAP_FMAC1 int SOAP_FMAC2 soap_end_recv(struct soap*); SOAP_FMAC1 int SOAP_FMAC2 soap_end_recv(struct soap*);