Dep/gSOAP: Upgrade to 2.8.141

Signed-off-by: luis <[email protected]>
This commit is contained in:
Shauren
2026-04-17 08:36:06 -03:00
committed by luis
parent 8515de23e0
commit 1fe5f4ed85
7 changed files with 1250 additions and 575 deletions
+1 -1
View File
@@ -42,7 +42,7 @@ zlib (A Massively Spiffy Yet Delicately Unobtrusive Compression Library)
gSOAP (a portable development toolkit for C and C++ XML Web services and XML data bindings)
http://gsoap2.sourceforge.net/
Version: 2.8.117
Version: 2.8.141
recastnavigation (Recast is state of the art navigation mesh construction toolset for games)
https://github.com/recastnavigation/recastnavigation
+32 -57
View File
@@ -1,8 +1,8 @@
/* soapC.cpp
Generated by gSOAP 2.8.117 for gsoap.stub
Generated by gSOAP 2.8.141 for gsoap.stub
gSOAP XML Web services tools
Copyright (C) 2000-2021, Robert van Engelen, Genivia Inc. All Rights Reserved.
Copyright (C) 2000-2026, Robert van Engelen, Genivia Inc. All Rights Reserved.
The soapcpp2 tool and its generated software are released under the GPL.
This program is released under the GPL with the additional exemption that
compiling, linking, and/or using OpenSSL is allowed.
@@ -18,7 +18,7 @@ A commercial use license is available from Genivia Inc., [email protected]
#include "soapH.h"
SOAP_SOURCE_STAMP("@(#) soapC.cpp ver 2.8.117 2021-12-21 00:03:56 GMT")
SOAP_SOURCE_STAMP("@(#) soapC.cpp ver 2.8.141 2026-04-17 08:51:52 GMT")
#ifndef WITH_NOGLOBAL
@@ -115,8 +115,11 @@ SOAP_FMAC3 const char ** SOAP_FMAC4 soap_faultsubcode(struct soap *soap)
SOAP_FMAC3 const char * SOAP_FMAC4 soap_fault_subcode(struct soap *soap)
{
const char **s = soap_faultsubcode(soap);
return s ? *s : NULL;
if (!soap->fault)
return NULL;
if (soap->version == 2)
return soap->fault->SOAP_ENV__Code && soap->fault->SOAP_ENV__Code->SOAP_ENV__Subcode ? soap->fault->SOAP_ENV__Code->SOAP_ENV__Subcode->SOAP_ENV__Value : NULL;
return soap->fault->faultcode;
}
SOAP_FMAC3 const char ** SOAP_FMAC4 soap_faultstring(struct soap *soap)
@@ -563,7 +566,7 @@ SOAP_FMAC3 char * SOAP_FMAC4 soap_in_byte(struct soap *soap, const char *tag, ch
SOAP_FMAC3 char * SOAP_FMAC4 soap_new_byte(struct soap *soap, int n)
{
char *a = static_cast<char *>(soap_malloc(soap, (n = (n < 0 ? 1 : n)) * sizeof(char)));
char *a = static_cast<char *>(soap_malloc(soap, (size_t)(n = (n < 0 ? 1 : n)) * sizeof(char)));
for (char *p = a; p && n--; ++p)
soap_default_byte(soap, p);
return a;
@@ -597,7 +600,7 @@ SOAP_FMAC3 int * SOAP_FMAC4 soap_in_int(struct soap *soap, const char *tag, int
SOAP_FMAC3 int * SOAP_FMAC4 soap_new_int(struct soap *soap, int n)
{
int *a = static_cast<int *>(soap_malloc(soap, (n = (n < 0 ? 1 : n)) * sizeof(int)));
int *a = static_cast<int *>(soap_malloc(soap, (size_t)(n = (n < 0 ? 1 : n)) * sizeof(int)));
for (int *p = a; p && n--; ++p)
soap_default_int(soap, p);
return a;
@@ -778,7 +781,7 @@ SOAP_FMAC1 struct SOAP_ENV__Fault * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Fault(
(void)type; (void)arrayType; /* appease -Wall -Werror */
struct SOAP_ENV__Fault *p;
size_t k = sizeof(struct SOAP_ENV__Fault);
struct soap_clist *cp = soap_link(soap, SOAP_TYPE_SOAP_ENV__Fault, n, soap_fdelete);
struct soap_clist *cp = soap_new_link(soap, SOAP_TYPE_SOAP_ENV__Fault, n, soap_fdelete);
if (!cp && soap && n != SOAP_NO_LINK_TO_DELETE)
return NULL;
if (n < 0)
@@ -786,15 +789,11 @@ SOAP_FMAC1 struct SOAP_ENV__Fault * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Fault(
}
else
{ p = SOAP_NEW_ARRAY(soap, struct SOAP_ENV__Fault, n);
k *= n;
k *= (size_t)n;
}
DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated struct SOAP_ENV__Fault location=%p n=%d\n", (void*)p, n));
if (size)
*size = k;
if (!p)
soap->error = SOAP_EOM;
else if (cp)
cp->ptr = (void*)p;
soap_set_link(soap, cp, p);
return p;
}
@@ -887,7 +886,7 @@ SOAP_FMAC1 struct SOAP_ENV__Reason * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Reaso
(void)type; (void)arrayType; /* appease -Wall -Werror */
struct SOAP_ENV__Reason *p;
size_t k = sizeof(struct SOAP_ENV__Reason);
struct soap_clist *cp = soap_link(soap, SOAP_TYPE_SOAP_ENV__Reason, n, soap_fdelete);
struct soap_clist *cp = soap_new_link(soap, SOAP_TYPE_SOAP_ENV__Reason, n, soap_fdelete);
if (!cp && soap && n != SOAP_NO_LINK_TO_DELETE)
return NULL;
if (n < 0)
@@ -895,15 +894,11 @@ SOAP_FMAC1 struct SOAP_ENV__Reason * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Reaso
}
else
{ p = SOAP_NEW_ARRAY(soap, struct SOAP_ENV__Reason, n);
k *= n;
k *= (size_t)n;
}
DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated struct SOAP_ENV__Reason location=%p n=%d\n", (void*)p, n));
if (size)
*size = k;
if (!p)
soap->error = SOAP_EOM;
else if (cp)
cp->ptr = (void*)p;
soap_set_link(soap, cp, p);
return p;
}
@@ -1005,7 +1000,7 @@ SOAP_FMAC1 struct SOAP_ENV__Detail * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Detai
(void)type; (void)arrayType; /* appease -Wall -Werror */
struct SOAP_ENV__Detail *p;
size_t k = sizeof(struct SOAP_ENV__Detail);
struct soap_clist *cp = soap_link(soap, SOAP_TYPE_SOAP_ENV__Detail, n, soap_fdelete);
struct soap_clist *cp = soap_new_link(soap, SOAP_TYPE_SOAP_ENV__Detail, n, soap_fdelete);
if (!cp && soap && n != SOAP_NO_LINK_TO_DELETE)
return NULL;
if (n < 0)
@@ -1013,15 +1008,11 @@ SOAP_FMAC1 struct SOAP_ENV__Detail * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Detai
}
else
{ p = SOAP_NEW_ARRAY(soap, struct SOAP_ENV__Detail, n);
k *= n;
k *= (size_t)n;
}
DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated struct SOAP_ENV__Detail location=%p n=%d\n", (void*)p, n));
if (size)
*size = k;
if (!p)
soap->error = SOAP_EOM;
else if (cp)
cp->ptr = (void*)p;
soap_set_link(soap, cp, p);
return p;
}
@@ -1125,7 +1116,7 @@ SOAP_FMAC1 struct SOAP_ENV__Code * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Code(st
(void)type; (void)arrayType; /* appease -Wall -Werror */
struct SOAP_ENV__Code *p;
size_t k = sizeof(struct SOAP_ENV__Code);
struct soap_clist *cp = soap_link(soap, SOAP_TYPE_SOAP_ENV__Code, n, soap_fdelete);
struct soap_clist *cp = soap_new_link(soap, SOAP_TYPE_SOAP_ENV__Code, n, soap_fdelete);
if (!cp && soap && n != SOAP_NO_LINK_TO_DELETE)
return NULL;
if (n < 0)
@@ -1133,15 +1124,11 @@ SOAP_FMAC1 struct SOAP_ENV__Code * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Code(st
}
else
{ p = SOAP_NEW_ARRAY(soap, struct SOAP_ENV__Code, n);
k *= n;
k *= (size_t)n;
}
DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated struct SOAP_ENV__Code location=%p n=%d\n", (void*)p, n));
if (size)
*size = k;
if (!p)
soap->error = SOAP_EOM;
else if (cp)
cp->ptr = (void*)p;
soap_set_link(soap, cp, p);
return p;
}
@@ -1221,7 +1208,7 @@ SOAP_FMAC1 struct SOAP_ENV__Header * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Heade
(void)type; (void)arrayType; /* appease -Wall -Werror */
struct SOAP_ENV__Header *p;
size_t k = sizeof(struct SOAP_ENV__Header);
struct soap_clist *cp = soap_link(soap, SOAP_TYPE_SOAP_ENV__Header, n, soap_fdelete);
struct soap_clist *cp = soap_new_link(soap, SOAP_TYPE_SOAP_ENV__Header, n, soap_fdelete);
if (!cp && soap && n != SOAP_NO_LINK_TO_DELETE)
return NULL;
if (n < 0)
@@ -1229,15 +1216,11 @@ SOAP_FMAC1 struct SOAP_ENV__Header * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Heade
}
else
{ p = SOAP_NEW_ARRAY(soap, struct SOAP_ENV__Header, n);
k *= n;
k *= (size_t)n;
}
DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated struct SOAP_ENV__Header location=%p n=%d\n", (void*)p, n));
if (size)
*size = k;
if (!p)
soap->error = SOAP_EOM;
else if (cp)
cp->ptr = (void*)p;
soap_set_link(soap, cp, p);
return p;
}
@@ -1326,7 +1309,7 @@ SOAP_FMAC1 struct ns1__executeCommand * SOAP_FMAC2 soap_instantiate_ns1__execute
(void)type; (void)arrayType; /* appease -Wall -Werror */
struct ns1__executeCommand *p;
size_t k = sizeof(struct ns1__executeCommand);
struct soap_clist *cp = soap_link(soap, SOAP_TYPE_ns1__executeCommand, n, soap_fdelete);
struct soap_clist *cp = soap_new_link(soap, SOAP_TYPE_ns1__executeCommand, n, soap_fdelete);
if (!cp && soap && n != SOAP_NO_LINK_TO_DELETE)
return NULL;
if (n < 0)
@@ -1334,15 +1317,11 @@ SOAP_FMAC1 struct ns1__executeCommand * SOAP_FMAC2 soap_instantiate_ns1__execute
}
else
{ p = SOAP_NEW_ARRAY(soap, struct ns1__executeCommand, n);
k *= n;
k *= (size_t)n;
}
DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated struct ns1__executeCommand location=%p n=%d\n", (void*)p, n));
if (size)
*size = k;
if (!p)
soap->error = SOAP_EOM;
else if (cp)
cp->ptr = (void*)p;
soap_set_link(soap, cp, p);
return p;
}
@@ -1429,7 +1408,7 @@ SOAP_FMAC1 struct ns1__executeCommandResponse * SOAP_FMAC2 soap_instantiate_ns1_
(void)type; (void)arrayType; /* appease -Wall -Werror */
struct ns1__executeCommandResponse *p;
size_t k = sizeof(struct ns1__executeCommandResponse);
struct soap_clist *cp = soap_link(soap, SOAP_TYPE_ns1__executeCommandResponse, n, soap_fdelete);
struct soap_clist *cp = soap_new_link(soap, SOAP_TYPE_ns1__executeCommandResponse, n, soap_fdelete);
if (!cp && soap && n != SOAP_NO_LINK_TO_DELETE)
return NULL;
if (n < 0)
@@ -1437,15 +1416,11 @@ SOAP_FMAC1 struct ns1__executeCommandResponse * SOAP_FMAC2 soap_instantiate_ns1_
}
else
{ p = SOAP_NEW_ARRAY(soap, struct ns1__executeCommandResponse, n);
k *= n;
k *= (size_t)n;
}
DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated struct ns1__executeCommandResponse location=%p n=%d\n", (void*)p, n));
if (size)
*size = k;
if (!p)
soap->error = SOAP_EOM;
else if (cp)
cp->ptr = (void*)p;
soap_set_link(soap, cp, p);
return p;
}
@@ -1750,7 +1725,7 @@ SOAP_FMAC3 char * * SOAP_FMAC4 soap_in_string(struct soap *soap, const char *tag
SOAP_FMAC3 char * * SOAP_FMAC4 soap_new_string(struct soap *soap, int n)
{
char * *a = static_cast<char * *>(soap_malloc(soap, (n = (n < 0 ? 1 : n)) * sizeof(char *)));
char * *a = static_cast<char * *>(soap_malloc(soap, (size_t)(n = (n < 0 ? 1 : n)) * sizeof(char *)));
for (char * *p = a; p && n--; ++p)
soap_default_string(soap, p);
return a;
+2 -2
View File
@@ -1,8 +1,8 @@
/* soapH.h
Generated by gSOAP 2.8.117 for gsoap.stub
Generated by gSOAP 2.8.141 for gsoap.stub
gSOAP XML Web services tools
Copyright (C) 2000-2021, Robert van Engelen, Genivia Inc. All Rights Reserved.
Copyright (C) 2000-2026, Robert van Engelen, Genivia Inc. All Rights Reserved.
The soapcpp2 tool and its generated software are released under the GPL.
This program is released under the GPL with the additional exemption that
compiling, linking, and/or using OpenSSL is allowed.
+3 -3
View File
@@ -1,8 +1,8 @@
/* soapServer.cpp
Generated by gSOAP 2.8.117 for gsoap.stub
Generated by gSOAP 2.8.141 for gsoap.stub
gSOAP XML Web services tools
Copyright (C) 2000-2021, Robert van Engelen, Genivia Inc. All Rights Reserved.
Copyright (C) 2000-2026, Robert van Engelen, Genivia Inc. All Rights Reserved.
The soapcpp2 tool and its generated software are released under the GPL.
This program is released under the GPL with the additional exemption that
compiling, linking, and/or using OpenSSL is allowed.
@@ -17,7 +17,7 @@ A commercial use license is available from Genivia Inc., [email protected]
#endif
#include "soapH.h"
SOAP_SOURCE_STAMP("@(#) soapServer.cpp ver 2.8.117 2021-12-21 00:03:56 GMT")
SOAP_SOURCE_STAMP("@(#) soapServer.cpp ver 2.8.141 2026-04-17 08:51:52 GMT")
extern "C" SOAP_FMAC5 int SOAP_FMAC6 soap_serve(struct soap *soap)
{
#ifndef WITH_FASTCGI
+5 -4
View File
@@ -1,8 +1,8 @@
/* soapStub.h
Generated by gSOAP 2.8.117 for gsoap.stub
Generated by gSOAP 2.8.141 for gsoap.stub
gSOAP XML Web services tools
Copyright (C) 2000-2021, Robert van Engelen, Genivia Inc. All Rights Reserved.
Copyright (C) 2000-2026, Robert van Engelen, Genivia Inc. All Rights Reserved.
The soapcpp2 tool and its generated software are released under the GPL.
This program is released under the GPL with the additional exemption that
compiling, linking, and/or using OpenSSL is allowed.
@@ -15,10 +15,11 @@ A commercial use license is available from Genivia Inc., [email protected]
#ifndef soapStub_H
#define soapStub_H
#include "stdsoap2.h"
#if GSOAP_VERSION != 208117
# error "GSOAP VERSION 208117 MISMATCH IN GENERATED CODE VERSUS LIBRARY CODE: PLEASE REINSTALL PACKAGE"
#if GSOAP_VERSION != 208141
# error "GSOAP VERSION 208141 MISMATCH IN GENERATED CODE VERSUS LIBRARY CODE: PLEASE REINSTALL PACKAGE"
#endif
#include <optional>
/******************************************************************************\
* *
+1093 -421
View File
File diff suppressed because it is too large Load Diff
+79 -52
View File
@@ -1,10 +1,10 @@
/*
stdsoap2.h 2.8.117
stdsoap2.h 2.8.141
gSOAP runtime engine
gSOAP XML Web services tools
Copyright (C) 2000-2021, Robert van Engelen, Genivia Inc., All Rights Reserved.
Copyright (C) 2000-2026, Robert van Engelen, Genivia Inc., All Rights Reserved.
This part of the software is released under ONE of the following licenses:
GPL or the gSOAP public license.
--------------------------------------------------------------------------------
@@ -25,7 +25,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See 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.
Copyright (C) 2000-2021, Robert van Engelen, Genivia Inc., All Rights Reserved.
Copyright (C) 2000-2026, Robert van Engelen, Genivia Inc., All Rights Reserved.
--------------------------------------------------------------------------------
GPL license.
@@ -52,7 +52,7 @@ A commercial use license is available from Genivia, Inc., [email protected]
--------------------------------------------------------------------------------
*/
#define GSOAP_VERSION 208117
#define GSOAP_VERSION 208141
#ifdef WITH_SOAPDEFS_H
# include "soapdefs.h" /* include user-defined stuff in soapdefs.h */
@@ -74,7 +74,7 @@ A commercial use license is available from Genivia, Inc., [email protected]
# endif
#endif
/* for legacy purposes we use WIN32 macro, even when WIN64 is supported */
/* legacy-related: we use WIN32 to detect Windows, even when WIN64 is supported */
#ifdef _WIN64
# ifndef WIN32
# define WIN32
@@ -397,6 +397,7 @@ extern intmax_t __strtoull(const char*, char**, int);
# define SOAP_ULONG_FORMAT "%qu"
# define HAVE_ISNAN
# define HAVE_ISINF
# define HAVE_INTTYPES_H
# define HAVE_LOCALE_H
# define HAVE_XLOCALE_H
# define HAVE_RANDOM
@@ -574,6 +575,7 @@ extern intmax_t __strtoull(const char*, char**, int);
# define HAVE_ASCTIME_R
# define HAVE_LOCALTIME_R
# define HAVE_STRERROR_R
# define HAVE_INTTYPES_H
# define HAVE_LOCALE_H
# endif
#endif
@@ -584,11 +586,11 @@ extern intmax_t __strtoull(const char*, char**, int);
# endif
#endif
/* gSOAP 2.7.15 and higher: always use FAST and retain CDATA in literal XML, unless WITH_LEAN or WITH_NOCDATA */
#ifndef WITH_LEAN
# ifndef WITH_FAST
/* gSOAP 2.7.15 and higher: always use FAST, retain CDATA in literal XML unless WITH_LEAN or WITH_NOCDATA */
#ifndef WITH_FAST
# define WITH_FAST
# endif
#endif
#ifndef WITH_LEAN
# ifndef WITH_NOCDATA
# ifndef WITH_CDATA
# define WITH_CDATA
@@ -662,7 +664,7 @@ extern intmax_t __strtoull(const char*, char**, int);
# include <ctype.h>
# endif
# if !defined(HAVE_CONFIG_H) || defined(HAVE_LIMITS_H)
# include <limits.h> /* for MB_LEN_MAX */
# include <limits.h> /* for MB_LEN_MAX strtol strtoll strtoul strtoull */
# endif
# if !defined(HAVE_CONFIG_H) || defined(HAVE_FLOAT_H)
# include <float.h> /* for INFINITY */
@@ -930,6 +932,10 @@ extern intmax_t __strtoull(const char*, char**, int);
# endif
#endif
#ifdef WITH_WOLFSSL
# include <wolfssl/ssl.h>
#endif
#ifdef WITH_SYSTEMSSL
# include <gskssl.h>
#endif
@@ -1178,11 +1184,11 @@ extern "C" {
# define SOAP_LABLEN (256) /* initial look-aside buffer length */
#endif
#ifndef SOAP_PTRBLK
# define SOAP_PTRBLK (32) /* block allocation for pointer hash table chains */
# define SOAP_PTRBLK (256) /* block allocations for hash table chains */
#endif
#ifndef SOAP_PTRHASH
# ifndef WITH_LEAN
# define SOAP_PTRHASH (4096) /* size of pointer analysis hash table (must be power of 2) */
# define SOAP_PTRHASH (2048) /* size of pointer analysis hash table (must be power of 2) */
# else
# define SOAP_PTRHASH (32)
# endif
@@ -1217,7 +1223,7 @@ extern "C" {
#endif
#ifndef SOAP_TMPLEN
# ifndef WITH_LEAN
# define SOAP_TMPLEN (2048) /* maximum length of msgbuf and tmpbuf short message buffers, must be >=1024 */
# define SOAP_TMPLEN (8192) /* maximum length of msgbuf and tmpbuf message buffers, must be >=1024 */
# else
# define SOAP_TMPLEN (1024)
# endif
@@ -1238,7 +1244,7 @@ extern "C" {
#endif
#ifndef SOAP_MAXALLOCSIZE
# define SOAP_MAXALLOCSIZE (0) /* max size that malloc() can handle, zero for no limit */
# define SOAP_MAXALLOCSIZE (0) /* max size that malloc() can handle, zero means unlimited */
#endif
#ifndef SOAP_MAXLOGS
@@ -1248,6 +1254,11 @@ extern "C" {
# define SOAP_INDEX_TEST (2)
#endif
/* max HTTP chunk size is 2GB by default, can be larger but not to exceed size_t range max */
#ifndef SOAP_MAXHTTPCHUNK
# define SOAP_MAXHTTPCHUNK (2147483647)
#endif
/* Tag name of multiref elements in SOAP 1.1 encoding */
#ifndef SOAP_MULTIREFTAG
# define SOAP_MULTIREFTAG "id"
@@ -1751,6 +1762,7 @@ typedef soap_int32 soap_mode;
#define SOAP_SSL_ALLOW_EXPIRED_CERTIFICATE (0x0008) /* allow self-signed and expired certificates and those w/o CRL */
#define SOAP_SSL_NO_DEFAULT_CA_PATH (0x0010) /* don't use SSL_CTX_set_default_verify_paths */
#define SOAP_SSL_RSA (0x0020) /* use RSA */
#define SOAP_SSL_SNI_HOST_CHECK (0x0040) /* client SNI only with a valid hostname, reject IP */
#define SOAP_SSLv3 (0x0080) /* enable SSL v3 */
#define SOAP_TLSv1_0 (0x0100) /* enable TLS v1.0 */
#define SOAP_TLSv1_1 (0x0200) /* enable TLS v1.1 */
@@ -2054,26 +2066,24 @@ struct soap_pblk
struct soap_plist plist[SOAP_PTRBLK];
};
#ifdef SOAP_MEM_DEBUG
/* malloc/free tracking for debugging */
struct soap_mlist
{
struct soap_mlist *next;
const void *ptr;
const char *file;
int line;
short live;
};
#endif
/* class allocation list */
/* malloc and C++ class instance tracking */
struct soap_clist
{
struct soap_clist *next;
void *ptr;
int type;
int size; /* array size */
int (*fdelete)(struct soap*, struct soap_clist*);
void *ptr; /* points to allocated memory */
union {
int (*fdelete)(struct soap*, struct soap_clist*); /* C++ class instance deleter */
const char *file; /* source location (of unmanaged memory alloc) */
} ref;
LONG64 size; /* malloc() size or array size of C++ objects (-1 = single) or line number (unmanaged memory, <0 when freed) */
int type; /* 0 (managed malloc) or SOAP_TRACK_UNMANAGED_MEM (unmanaged) or SOAP_TYPE C++ class instance type */
};
/* block allocation for allocation management */
struct soap_cblk
{
struct soap_cblk *next;
struct soap_clist clist[SOAP_PTRBLK];
};
/* attributes */
@@ -2402,10 +2412,12 @@ struct SOAP_CMAC soap_dom_attribute
soap_dom_attribute(struct soap *soap, const char *ns, const char *tag, const wchar_t *str);
soap_dom_attribute(struct soap *soap, const char *ns, const wchar_t *tag, const char *str);
soap_dom_attribute(struct soap *soap, const char *ns, const wchar_t *tag, const wchar_t *str);
#ifndef WITH_COMPAT
soap_dom_attribute(struct soap *soap, const char *ns, const char *tag, const std::string& str);
soap_dom_attribute(struct soap *soap, const char *ns, const char *tag, const std::wstring& str);
soap_dom_attribute(struct soap *soap, const char *ns, const wchar_t *tag, const std::string& str);
soap_dom_attribute(struct soap *soap, const char *ns, const wchar_t *tag, const std::wstring& str);
#endif
~soap_dom_attribute();
soap_dom_attribute& set(const char *ns, const char *tag) { return *soap_att_set(this, ns, tag); }
soap_dom_attribute& set(const char *ns, const wchar_t *tag) { return *soap_att_set_w(this, ns, tag); }
@@ -2724,18 +2736,15 @@ struct SOAP_CMAC soap
struct Namespace *local_namespaces; /* Local namespace mapping table */
struct soap_nlist *nlist; /* namespace stack */
struct soap_blist *blist; /* block allocation stack */
struct soap_clist *clist; /* class instance allocation list */
void *alist; /* memory allocation (malloc) list */
#if !defined(WITH_LEANER) || !defined(WITH_NOIDREF)
struct soap_ilist *iht[SOAP_IDHASH];
#endif
struct soap_plist *pht[SOAP_PTRHASH];
struct soap_pblk *pblk; /* plist block allocation */
short pidx; /* plist block allocation */
short shaky; /* objects in reallocatable containers are on shaky grounds */
int idnum;
int pidx; /* plist block allocation */
struct SOAP_ENV__Header *header;
struct SOAP_ENV__Fault *fault;
int idnum;
void *user; /* for user to pass user-defined data to callbacks */
void *data[4]; /* extension data = {smdevp, mecevp, ...} */
struct soap_plugin *plugins; /* linked list of plug-in data */
@@ -2772,6 +2781,7 @@ struct SOAP_CMAC soap
size_t (*frecv)(struct soap*, char*, size_t);
int (*fpoll)(struct soap*);
void (*fseterror)(struct soap*, const char **c, const char **s);
int (*fencoding)(struct soap*, const char*);
int (*fignore)(struct soap*, const char*);
int (*fserveloop)(struct soap*);
void *(*fplugin)(struct soap*, const char*);
@@ -2840,12 +2850,21 @@ struct SOAP_CMAC soap
gnutls_session_t session; /* session pointer */
gnutls_dh_params_t dh_params;
gnutls_rsa_params_t rsa_params;
#elif defined(WITH_WOLFSSL) /* WolfSSL */
int (*fsslauth)(struct soap*);
VerifyCallback fsslverify; /* callback to verify certificates */
void *bio; /* N/A */
WOLFSSL *ssl; /* ssl socket */
WOLFSSL_CTX *ctx; /* environment */
void *session; /* N/A */
const char *dhfile; /* N/A */
const char *randfile; /* N/A */
#elif defined(WITH_SYSTEMSSL) /* SYSTEM SSL */
int (*fsslauth)(struct soap*);
void *fsslverify; /* N/A */
void *bio; /* N/A */
gsk_handle ctx; /* environment */
gsk_handle ssl; /* ssl socket */
gsk_handle ctx; /* environment */
void *session; /* N/A */
const char *dhfile; /* N/A */
const char *randfile; /* N/A */
@@ -2859,13 +2878,13 @@ struct SOAP_CMAC soap
void *dh_params;
void *rsa_params;
#endif
unsigned short ssl_flags;
const char *keyfile;
const char *keyid;
const char *password;
const char *cafile;
const char *capath;
const char *crlfile;
unsigned short ssl_flags;
char session_host[SOAP_TAGLEN];
int session_port;
size_t bufidx; /* index in soap.buf[] */
@@ -2895,6 +2914,7 @@ struct SOAP_CMAC soap
int position;
int positions[SOAP_MAXDIMS];
struct soap_attribute *attributes; /* attribute list */
short shaky; /* objects in reallocatable containers are on shaky grounds */
short other;
short root;
short encoding; /* when set, output encodingStyle */
@@ -2913,10 +2933,10 @@ struct SOAP_CMAC soap
char host[SOAP_TAGLEN];
char *action; /* SOAPAction string */
const char *prolog; /* XML declaration prolog */
const char *override_host; /* to override the client-side host name/IP when connecting */
unsigned int ip; /* IP number retrieved from request */
unsigned int ip6[4]; /* same for IPv6: upper in ip6[0] to lower in ip6[3] requires WITH_IPV6 */
int port; /* port number */
const char *override_host; /* to override the client-side host name/IP when connecting */
int override_port; /* to override client-side port number when connecting */
int keep_alive; /* connection should be kept open (-1, 0, or counts down) */
int tcp_keep_alive; /* enable SO_KEEPALIVE */
@@ -2924,9 +2944,9 @@ struct SOAP_CMAC soap
unsigned int tcp_keep_intvl; /* set TCP_KEEPINTVL */
unsigned int tcp_keep_cnt; /* set TCP_KEEPCNT */
int max_keep_alive; /* maximum keep-alive session (default=100) 0 to always keep open */
int proxy_port; /* Proxy Server port (default = 8080) */
const char *proxy_http_version;/* HTTP version of proxy "1.0" or "1.1" */
const char *proxy_host; /* Proxy Server host name */
int proxy_port; /* Proxy Server port (default = 8080) */
const char *proxy_userid; /* Proxy Authorization user name */
const char *proxy_passwd; /* Proxy Authorization password */
const char *proxy_from; /* X-Forwarding-For header returned by proxy */
@@ -2950,7 +2970,9 @@ struct SOAP_CMAC soap
#endif
const char *logfile[SOAP_MAXLOGS];
FILE *fdebug[SOAP_MAXLOGS];
struct soap_mlist *mht[SOAP_PTRHASH];
struct soap_clist *cht[SOAP_PTRHASH];
struct soap_cblk *cblk; /* clist block allocation */
int cidx; /* clist block allocation */
#ifndef WITH_LEAN
const char *wsuid; /* space-separated string of element tags */
const char *c14nexclude; /* space-separated string of prefixes for c14n exclusion */
@@ -3093,7 +3115,14 @@ SOAP_FMAC1 soap_wchar SOAP_FMAC2 soap_getchar(struct soap*);
#define soap_clr_mode(soap, n) ((soap)->mode &= ~(n), (soap)->imode &= ~(n), (soap)->omode &= ~(n))
#define soap_destroy(soap) soap_delete((soap), NULL)
#define SOAP_NO_LINK_TO_DELETE (-2) /* pass to soap_link() as size n: do not manage, smart pointers are self-managing */
#define SOAP_NO_LINK_TO_DELETE (-2) /* pass to soap_new_link() as size n: do not manage, smart pointers are self-managing */
#ifdef SOAP_MEM_DEBUG
#define SOAP_TRACK_MALLOC (int)((unsigned int)-1 >> 1)
#define soap_is_unmanaged_mem(type) ((type) == SOAP_TRACK_MALLOC)
#else
#define soap_is_unmanaged_mem(type) (0)
#endif
#ifdef HAVE_STRRCHR
# define soap_strrchr(s, t) strrchr(s, t)
@@ -3289,8 +3318,9 @@ SOAP_FMAC1 int SOAP_FMAC2 soap_begin_recv(struct soap*);
SOAP_FMAC1 int SOAP_FMAC2 soap_end_recv(struct soap*);
SOAP_FMAC1 void* SOAP_FMAC2 soap_malloc(struct soap*, size_t);
SOAP_FMAC1 void SOAP_FMAC2 soap_dealloc(struct soap*, void*);
SOAP_FMAC1 struct soap_clist * SOAP_FMAC2 soap_link(struct soap*, int, int, int (*fdelete)(struct soap*, struct soap_clist*));
SOAP_FMAC1 int SOAP_FMAC2 soap_dealloc(struct soap*, void*);
SOAP_FMAC1 struct soap_clist * SOAP_FMAC2 soap_new_link(struct soap*, int, int, int (*fdelete)(struct soap*, struct soap_clist*));
SOAP_FMAC1 void SOAP_FMAC2 soap_set_link(struct soap*, struct soap_clist*, void*);
SOAP_FMAC1 int SOAP_FMAC2 soap_unlink(struct soap*, const void*);
SOAP_FMAC1 void SOAP_FMAC2 soap_free_temp(struct soap*);
SOAP_FMAC1 void SOAP_FMAC2 soap_del(struct soap*);
@@ -3332,8 +3362,8 @@ SOAP_FMAC1 void SOAP_FMAC2 soap_initialize(struct soap*);
SOAP_FMAC1 void SOAP_FMAC2 soap_done(struct soap*);
SOAP_FMAC1 void SOAP_FMAC2 soap_cleanup(struct soap*);
SOAP_FMAC1 void SOAP_FMAC2 soap_begin(struct soap*);
SOAP_FMAC1 void SOAP_FMAC2 soap_end(struct soap*);
SOAP_FMAC1 void SOAP_FMAC2 soap_delete(struct soap*, void*);
SOAP_FMAC1 int SOAP_FMAC2 soap_end(struct soap*);
SOAP_FMAC1 int SOAP_FMAC2 soap_delete(struct soap*, void*);
SOAP_FMAC1 void SOAP_FMAC2 soap_delegate_deletion(struct soap*, struct soap*);
#ifdef WITH_SELF_PIPE
SOAP_FMAC1 void SOAP_FMAC2 soap_close_connection(struct soap*);
@@ -3488,7 +3518,7 @@ SOAP_FMAC1 int SOAP_FMAC2 soap_s2stdwchar(struct soap*, const char*, std::wstrin
#endif
#endif
#ifndef WITH_LEAN
#ifndef WITH_LEANER
SOAP_FMAC1 int SOAP_FMAC2 soap_s2wchar(struct soap*, const char*, wchar_t**, int, long minlen, long maxlen, const char *pattern);
SOAP_FMAC1 int SOAP_FMAC2 soap_s2dateTime(struct soap*, const char*, time_t*);
#endif
@@ -3510,7 +3540,7 @@ SOAP_FMAC1 const char* SOAP_FMAC2 soap_unsignedLong2s(struct soap*, unsigned lon
SOAP_FMAC1 const char* SOAP_FMAC2 soap_ULONG642s(struct soap*, ULONG64);
SOAP_FMAC1 const char* SOAP_FMAC2 soap_QName2s(struct soap*, const char*);
#ifndef WITH_LEAN
#ifndef WITH_LEANER
SOAP_FMAC1 const char* SOAP_FMAC2 soap_wchar2s(struct soap*, const wchar_t*);
SOAP_FMAC1 const char* SOAP_FMAC2 soap_dateTime2s(struct soap*, time_t);
#endif
@@ -3537,11 +3567,8 @@ SOAP_FMAC1 char** SOAP_FMAC2 soap_inliteral(struct soap*, const char *tag, char
SOAP_FMAC1 time_t* SOAP_FMAC2 soap_indateTime(struct soap*, const char *tag, time_t *p, const char *, int);
#endif
#if !defined(WITH_LEAN) || defined(WITH_COOKIES)
#if !defined(WITH_LEANER) || defined(WITH_COOKIES)
SOAP_FMAC1 time_t SOAP_FMAC2 soap_timegm(struct tm*);
#endif
#ifndef WITH_LEANER
SOAP_FMAC1 wchar_t** SOAP_FMAC2 soap_inwstring(struct soap*, const char *tag, wchar_t **p, const char *, int, int, long, long, const char*);
SOAP_FMAC1 wchar_t** SOAP_FMAC2 soap_inwliteral(struct soap*, const char *tag, wchar_t **p);
#endif