Index: trunk/Nebulous/nebclient/src/soapServer.c =================================================================== --- trunk/Nebulous/nebclient/src/soapServer.c (revision 13096) +++ trunk/Nebulous/nebclient/src/soapServer.c (revision 19542) @@ -1,5 +1,5 @@ /* soapServer.c - Generated by gSOAP 2.7.2 from src/nebulous.h - Copyright (C) 2000-2005, Robert van Engelen, Genivia Inc. All Rights Reserved. + Generated by gSOAP 2.7.11 from src/nebulous.h + Copyright(C) 2000-2008, Robert van Engelen, Genivia Inc. All Rights Reserved. This part of the software is released under one of the following licenses: GPL, the gSOAP public license, or Genivia's license for commercial use. @@ -10,29 +10,64 @@ #endif -SOAP_BEGIN_NAMESPACE(soap) - -SOAP_SOURCE_STAMP("@(#) soapServer.c ver 2.7.2 2007-05-01 02:53:36 GMT") +SOAP_SOURCE_STAMP("@(#) soapServer.c ver 2.7.11 2008-09-13 01:14:39 GMT") SOAP_FMAC5 int SOAP_FMAC6 soap_serve(struct soap *soap) { - unsigned int n = soap->max_keep_alive; +#ifndef WITH_FASTCGI + unsigned int k = soap->max_keep_alive; +#endif + do - { soap_begin(soap); - if (!--n) + { +#ifdef WITH_FASTCGI + if (FCGI_Accept() < 0) + { + soap->error = SOAP_EOF; + return soap_send_fault(soap); + } +#endif + + soap_begin(soap); + +#ifndef WITH_FASTCGI + if (soap->max_keep_alive > 0 && !--k) soap->keep_alive = 0; +#endif + if (soap_begin_recv(soap)) { if (soap->error < SOAP_STOP) + { +#ifdef WITH_FASTCGI + soap_send_fault(soap); +#else return soap_send_fault(soap); +#endif + } soap_closesock(soap); + continue; } + if (soap_envelope_begin_in(soap) || soap_recv_header(soap) || soap_body_begin_in(soap) - || soap_serve_request(soap) || (soap->fserveloop && soap->fserveloop(soap))) + || soap_serve_request(soap) + || (soap->fserveloop && soap->fserveloop(soap))) + { +#ifdef WITH_FASTCGI + soap_send_fault(soap); +#else return soap_send_fault(soap); - +#endif + } + +#ifdef WITH_FASTCGI + soap_destroy(soap); + soap_end(soap); + } while (1); +#else } while (soap->keep_alive); +#endif return SOAP_OK; } @@ -79,7 +114,4 @@ if (soap_body_end_in(soap) || soap_envelope_end_in(soap) -#ifndef WITH_LEANER - || soap_resolve_attachments(soap) -#endif || soap_end_recv(soap)) return soap->error; @@ -89,14 +121,17 @@ soap_serializeheader(soap); soap_serialize_ns1__create_USCOREobjectResponse(soap, &soap_tmp_ns1__create_USCOREobjectResponse); - soap_begin_count(soap); - if (soap->mode & SOAP_IO_LENGTH) - { soap_envelope_begin_out(soap); - soap_putheader(soap); - soap_body_begin_out(soap); - soap_put_ns1__create_USCOREobjectResponse(soap, &soap_tmp_ns1__create_USCOREobjectResponse, "ns1:create_objectResponse", ""); - soap_body_end_out(soap); - soap_envelope_end_out(soap); - }; - if (soap_response(soap, SOAP_OK) + if (soap_begin_count(soap)) + return soap->error; + if (soap->mode & SOAP_IO_LENGTH) + { if (soap_envelope_begin_out(soap) + || soap_putheader(soap) + || soap_body_begin_out(soap) + || soap_put_ns1__create_USCOREobjectResponse(soap, &soap_tmp_ns1__create_USCOREobjectResponse, "ns1:create_objectResponse", "") + || soap_body_end_out(soap) + || soap_envelope_end_out(soap)) + return soap->error; + }; + if (soap_end_count(soap) + || soap_response(soap, SOAP_OK) || soap_envelope_begin_out(soap) || soap_putheader(soap) @@ -123,7 +158,4 @@ if (soap_body_end_in(soap) || soap_envelope_end_in(soap) -#ifndef WITH_LEANER - || soap_resolve_attachments(soap) -#endif || soap_end_recv(soap)) return soap->error; @@ -133,14 +165,17 @@ soap_serializeheader(soap); soap_serialize_ns1__rename_USCOREobjectResponse(soap, &soap_tmp_ns1__rename_USCOREobjectResponse); - soap_begin_count(soap); - if (soap->mode & SOAP_IO_LENGTH) - { soap_envelope_begin_out(soap); - soap_putheader(soap); - soap_body_begin_out(soap); - soap_put_ns1__rename_USCOREobjectResponse(soap, &soap_tmp_ns1__rename_USCOREobjectResponse, "ns1:rename_objectResponse", ""); - soap_body_end_out(soap); - soap_envelope_end_out(soap); - }; - if (soap_response(soap, SOAP_OK) + if (soap_begin_count(soap)) + return soap->error; + if (soap->mode & SOAP_IO_LENGTH) + { if (soap_envelope_begin_out(soap) + || soap_putheader(soap) + || soap_body_begin_out(soap) + || soap_put_ns1__rename_USCOREobjectResponse(soap, &soap_tmp_ns1__rename_USCOREobjectResponse, "ns1:rename_objectResponse", "") + || soap_body_end_out(soap) + || soap_envelope_end_out(soap)) + return soap->error; + }; + if (soap_end_count(soap) + || soap_response(soap, SOAP_OK) || soap_envelope_begin_out(soap) || soap_putheader(soap) @@ -167,7 +202,4 @@ if (soap_body_end_in(soap) || soap_envelope_end_in(soap) -#ifndef WITH_LEANER - || soap_resolve_attachments(soap) -#endif || soap_end_recv(soap)) return soap->error; @@ -177,14 +209,17 @@ soap_serializeheader(soap); soap_serialize_ns1__rename_USCOREobject_Response(soap, &soap_tmp_ns1__rename_USCOREobject_Response); - soap_begin_count(soap); - if (soap->mode & SOAP_IO_LENGTH) - { soap_envelope_begin_out(soap); - soap_putheader(soap); - soap_body_begin_out(soap); - soap_put_ns1__rename_USCOREobject_Response(soap, &soap_tmp_ns1__rename_USCOREobject_Response, "ns1:rename_object-Response", ""); - soap_body_end_out(soap); - soap_envelope_end_out(soap); - }; - if (soap_response(soap, SOAP_OK) + if (soap_begin_count(soap)) + return soap->error; + if (soap->mode & SOAP_IO_LENGTH) + { if (soap_envelope_begin_out(soap) + || soap_putheader(soap) + || soap_body_begin_out(soap) + || soap_put_ns1__rename_USCOREobject_Response(soap, &soap_tmp_ns1__rename_USCOREobject_Response, "ns1:rename_object-Response", "") + || soap_body_end_out(soap) + || soap_envelope_end_out(soap)) + return soap->error; + }; + if (soap_end_count(soap) + || soap_response(soap, SOAP_OK) || soap_envelope_begin_out(soap) || soap_putheader(soap) @@ -211,7 +246,4 @@ if (soap_body_end_in(soap) || soap_envelope_end_in(soap) -#ifndef WITH_LEANER - || soap_resolve_attachments(soap) -#endif || soap_end_recv(soap)) return soap->error; @@ -221,14 +253,17 @@ soap_serializeheader(soap); soap_serialize_ns1__replicate_USCOREobjectResponse(soap, &soap_tmp_ns1__replicate_USCOREobjectResponse); - soap_begin_count(soap); - if (soap->mode & SOAP_IO_LENGTH) - { soap_envelope_begin_out(soap); - soap_putheader(soap); - soap_body_begin_out(soap); - soap_put_ns1__replicate_USCOREobjectResponse(soap, &soap_tmp_ns1__replicate_USCOREobjectResponse, "ns1:replicate_objectResponse", ""); - soap_body_end_out(soap); - soap_envelope_end_out(soap); - }; - if (soap_response(soap, SOAP_OK) + if (soap_begin_count(soap)) + return soap->error; + if (soap->mode & SOAP_IO_LENGTH) + { if (soap_envelope_begin_out(soap) + || soap_putheader(soap) + || soap_body_begin_out(soap) + || soap_put_ns1__replicate_USCOREobjectResponse(soap, &soap_tmp_ns1__replicate_USCOREobjectResponse, "ns1:replicate_objectResponse", "") + || soap_body_end_out(soap) + || soap_envelope_end_out(soap)) + return soap->error; + }; + if (soap_end_count(soap) + || soap_response(soap, SOAP_OK) || soap_envelope_begin_out(soap) || soap_putheader(soap) @@ -255,7 +290,4 @@ if (soap_body_end_in(soap) || soap_envelope_end_in(soap) -#ifndef WITH_LEANER - || soap_resolve_attachments(soap) -#endif || soap_end_recv(soap)) return soap->error; @@ -265,14 +297,17 @@ soap_serializeheader(soap); soap_serialize_ns1__lock_USCOREobjectResponse(soap, &soap_tmp_ns1__lock_USCOREobjectResponse); - soap_begin_count(soap); - if (soap->mode & SOAP_IO_LENGTH) - { soap_envelope_begin_out(soap); - soap_putheader(soap); - soap_body_begin_out(soap); - soap_put_ns1__lock_USCOREobjectResponse(soap, &soap_tmp_ns1__lock_USCOREobjectResponse, "ns1:lock_objectResponse", ""); - soap_body_end_out(soap); - soap_envelope_end_out(soap); - }; - if (soap_response(soap, SOAP_OK) + if (soap_begin_count(soap)) + return soap->error; + if (soap->mode & SOAP_IO_LENGTH) + { if (soap_envelope_begin_out(soap) + || soap_putheader(soap) + || soap_body_begin_out(soap) + || soap_put_ns1__lock_USCOREobjectResponse(soap, &soap_tmp_ns1__lock_USCOREobjectResponse, "ns1:lock_objectResponse", "") + || soap_body_end_out(soap) + || soap_envelope_end_out(soap)) + return soap->error; + }; + if (soap_end_count(soap) + || soap_response(soap, SOAP_OK) || soap_envelope_begin_out(soap) || soap_putheader(soap) @@ -299,7 +334,4 @@ if (soap_body_end_in(soap) || soap_envelope_end_in(soap) -#ifndef WITH_LEANER - || soap_resolve_attachments(soap) -#endif || soap_end_recv(soap)) return soap->error; @@ -309,14 +341,17 @@ soap_serializeheader(soap); soap_serialize_ns1__unlock_USCOREobjectResponse(soap, &soap_tmp_ns1__unlock_USCOREobjectResponse); - soap_begin_count(soap); - if (soap->mode & SOAP_IO_LENGTH) - { soap_envelope_begin_out(soap); - soap_putheader(soap); - soap_body_begin_out(soap); - soap_put_ns1__unlock_USCOREobjectResponse(soap, &soap_tmp_ns1__unlock_USCOREobjectResponse, "ns1:unlock_objectResponse", ""); - soap_body_end_out(soap); - soap_envelope_end_out(soap); - }; - if (soap_response(soap, SOAP_OK) + if (soap_begin_count(soap)) + return soap->error; + if (soap->mode & SOAP_IO_LENGTH) + { if (soap_envelope_begin_out(soap) + || soap_putheader(soap) + || soap_body_begin_out(soap) + || soap_put_ns1__unlock_USCOREobjectResponse(soap, &soap_tmp_ns1__unlock_USCOREobjectResponse, "ns1:unlock_objectResponse", "") + || soap_body_end_out(soap) + || soap_envelope_end_out(soap)) + return soap->error; + }; + if (soap_end_count(soap) + || soap_response(soap, SOAP_OK) || soap_envelope_begin_out(soap) || soap_putheader(soap) @@ -332,6 +367,6 @@ SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns1__find_USCOREobjects(struct soap *soap) { struct ns1__find_USCOREobjects soap_tmp_ns1__find_USCOREobjects; - struct ns1__find_USCOREobjectsResponse param_1; - soap_default_ns1__find_USCOREobjectsResponse(soap, ¶m_1); + struct ns1__find_USCOREobjectsResponse _param_1; + soap_default_ns1__find_USCOREobjectsResponse(soap, &_param_1); soap_default_ns1__find_USCOREobjects(soap, &soap_tmp_ns1__find_USCOREobjects); soap->encodingStyle = "http://schemas.xmlsoap.org/soap/encoding/"; @@ -340,28 +375,28 @@ if (soap_body_end_in(soap) || soap_envelope_end_in(soap) -#ifndef WITH_LEANER - || soap_resolve_attachments(soap) -#endif - || soap_end_recv(soap)) - return soap->error; - soap->error = ns1__find_USCOREobjects(soap, soap_tmp_ns1__find_USCOREobjects.pattern, ¶m_1); - if (soap->error) - return soap->error; - soap_serializeheader(soap); - soap_serialize_ns1__find_USCOREobjectsResponse(soap, ¶m_1); - soap_begin_count(soap); - if (soap->mode & SOAP_IO_LENGTH) - { soap_envelope_begin_out(soap); - soap_putheader(soap); - soap_body_begin_out(soap); - soap_put_ns1__find_USCOREobjectsResponse(soap, ¶m_1, "ns1:find_objectsResponse", ""); - soap_body_end_out(soap); - soap_envelope_end_out(soap); - }; - if (soap_response(soap, SOAP_OK) - || soap_envelope_begin_out(soap) - || soap_putheader(soap) - || soap_body_begin_out(soap) - || soap_put_ns1__find_USCOREobjectsResponse(soap, ¶m_1, "ns1:find_objectsResponse", "") + || soap_end_recv(soap)) + return soap->error; + soap->error = ns1__find_USCOREobjects(soap, soap_tmp_ns1__find_USCOREobjects.pattern, &_param_1); + if (soap->error) + return soap->error; + soap_serializeheader(soap); + soap_serialize_ns1__find_USCOREobjectsResponse(soap, &_param_1); + if (soap_begin_count(soap)) + return soap->error; + if (soap->mode & SOAP_IO_LENGTH) + { if (soap_envelope_begin_out(soap) + || soap_putheader(soap) + || soap_body_begin_out(soap) + || soap_put_ns1__find_USCOREobjectsResponse(soap, &_param_1, "ns1:find_objectsResponse", "") + || soap_body_end_out(soap) + || soap_envelope_end_out(soap)) + return soap->error; + }; + if (soap_end_count(soap) + || soap_response(soap, SOAP_OK) + || soap_envelope_begin_out(soap) + || soap_putheader(soap) + || soap_body_begin_out(soap) + || soap_put_ns1__find_USCOREobjectsResponse(soap, &_param_1, "ns1:find_objectsResponse", "") || soap_body_end_out(soap) || soap_envelope_end_out(soap) @@ -373,6 +408,6 @@ SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns1__find_USCOREinstances(struct soap *soap) { struct ns1__find_USCOREinstances soap_tmp_ns1__find_USCOREinstances; - struct ns1__find_USCOREinstancesResponse param_2; - soap_default_ns1__find_USCOREinstancesResponse(soap, ¶m_2); + struct ns1__find_USCOREinstancesResponse _param_2; + soap_default_ns1__find_USCOREinstancesResponse(soap, &_param_2); soap_default_ns1__find_USCOREinstances(soap, &soap_tmp_ns1__find_USCOREinstances); soap->encodingStyle = "http://schemas.xmlsoap.org/soap/encoding/"; @@ -381,28 +416,28 @@ if (soap_body_end_in(soap) || soap_envelope_end_in(soap) -#ifndef WITH_LEANER - || soap_resolve_attachments(soap) -#endif - || soap_end_recv(soap)) - return soap->error; - soap->error = ns1__find_USCOREinstances(soap, soap_tmp_ns1__find_USCOREinstances.key, soap_tmp_ns1__find_USCOREinstances.volume, ¶m_2); - if (soap->error) - return soap->error; - soap_serializeheader(soap); - soap_serialize_ns1__find_USCOREinstancesResponse(soap, ¶m_2); - soap_begin_count(soap); - if (soap->mode & SOAP_IO_LENGTH) - { soap_envelope_begin_out(soap); - soap_putheader(soap); - soap_body_begin_out(soap); - soap_put_ns1__find_USCOREinstancesResponse(soap, ¶m_2, "ns1:find_instancesResponse", ""); - soap_body_end_out(soap); - soap_envelope_end_out(soap); - }; - if (soap_response(soap, SOAP_OK) - || soap_envelope_begin_out(soap) - || soap_putheader(soap) - || soap_body_begin_out(soap) - || soap_put_ns1__find_USCOREinstancesResponse(soap, ¶m_2, "ns1:find_instancesResponse", "") + || soap_end_recv(soap)) + return soap->error; + soap->error = ns1__find_USCOREinstances(soap, soap_tmp_ns1__find_USCOREinstances.key, soap_tmp_ns1__find_USCOREinstances.volume, &_param_2); + if (soap->error) + return soap->error; + soap_serializeheader(soap); + soap_serialize_ns1__find_USCOREinstancesResponse(soap, &_param_2); + if (soap_begin_count(soap)) + return soap->error; + if (soap->mode & SOAP_IO_LENGTH) + { if (soap_envelope_begin_out(soap) + || soap_putheader(soap) + || soap_body_begin_out(soap) + || soap_put_ns1__find_USCOREinstancesResponse(soap, &_param_2, "ns1:find_instancesResponse", "") + || soap_body_end_out(soap) + || soap_envelope_end_out(soap)) + return soap->error; + }; + if (soap_end_count(soap) + || soap_response(soap, SOAP_OK) + || soap_envelope_begin_out(soap) + || soap_putheader(soap) + || soap_body_begin_out(soap) + || soap_put_ns1__find_USCOREinstancesResponse(soap, &_param_2, "ns1:find_instancesResponse", "") || soap_body_end_out(soap) || soap_envelope_end_out(soap) @@ -425,7 +460,4 @@ if (soap_body_end_in(soap) || soap_envelope_end_in(soap) -#ifndef WITH_LEANER - || soap_resolve_attachments(soap) -#endif || soap_end_recv(soap)) return soap->error; @@ -435,14 +467,17 @@ soap_serializeheader(soap); soap_serialize_ns1__delete_USCOREinstanceResponse(soap, &soap_tmp_ns1__delete_USCOREinstanceResponse); - soap_begin_count(soap); - if (soap->mode & SOAP_IO_LENGTH) - { soap_envelope_begin_out(soap); - soap_putheader(soap); - soap_body_begin_out(soap); - soap_put_ns1__delete_USCOREinstanceResponse(soap, &soap_tmp_ns1__delete_USCOREinstanceResponse, "ns1:delete_instanceResponse", ""); - soap_body_end_out(soap); - soap_envelope_end_out(soap); - }; - if (soap_response(soap, SOAP_OK) + if (soap_begin_count(soap)) + return soap->error; + if (soap->mode & SOAP_IO_LENGTH) + { if (soap_envelope_begin_out(soap) + || soap_putheader(soap) + || soap_body_begin_out(soap) + || soap_put_ns1__delete_USCOREinstanceResponse(soap, &soap_tmp_ns1__delete_USCOREinstanceResponse, "ns1:delete_instanceResponse", "") + || soap_body_end_out(soap) + || soap_envelope_end_out(soap)) + return soap->error; + }; + if (soap_end_count(soap) + || soap_response(soap, SOAP_OK) || soap_envelope_begin_out(soap) || soap_putheader(soap) @@ -458,6 +493,6 @@ SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns1__stat_USCOREobject(struct soap *soap) { struct ns1__stat_USCOREobject soap_tmp_ns1__stat_USCOREobject; - struct ns1__stat_USCOREobjectResponse param_3; - soap_default_ns1__stat_USCOREobjectResponse(soap, ¶m_3); + struct ns1__stat_USCOREobjectResponse _param_3; + soap_default_ns1__stat_USCOREobjectResponse(soap, &_param_3); soap_default_ns1__stat_USCOREobject(soap, &soap_tmp_ns1__stat_USCOREobject); soap->encodingStyle = "http://schemas.xmlsoap.org/soap/encoding/"; @@ -466,36 +501,34 @@ if (soap_body_end_in(soap) || soap_envelope_end_in(soap) -#ifndef WITH_LEANER - || soap_resolve_attachments(soap) -#endif - || soap_end_recv(soap)) - return soap->error; - soap->error = ns1__stat_USCOREobject(soap, soap_tmp_ns1__stat_USCOREobject.key, ¶m_3); - if (soap->error) - return soap->error; - soap_serializeheader(soap); - soap_serialize_ns1__stat_USCOREobjectResponse(soap, ¶m_3); - soap_begin_count(soap); - if (soap->mode & SOAP_IO_LENGTH) - { soap_envelope_begin_out(soap); - soap_putheader(soap); - soap_body_begin_out(soap); - soap_put_ns1__stat_USCOREobjectResponse(soap, ¶m_3, "ns1:stat_objectResponse", ""); - soap_body_end_out(soap); - soap_envelope_end_out(soap); - }; - if (soap_response(soap, SOAP_OK) - || soap_envelope_begin_out(soap) - || soap_putheader(soap) - || soap_body_begin_out(soap) - || soap_put_ns1__stat_USCOREobjectResponse(soap, ¶m_3, "ns1:stat_objectResponse", "") - || soap_body_end_out(soap) - || soap_envelope_end_out(soap) - || soap_end_send(soap)) - return soap->error; - return soap_closesock(soap); -} - -SOAP_END_NAMESPACE(soap) + || soap_end_recv(soap)) + return soap->error; + soap->error = ns1__stat_USCOREobject(soap, soap_tmp_ns1__stat_USCOREobject.key, &_param_3); + if (soap->error) + return soap->error; + soap_serializeheader(soap); + soap_serialize_ns1__stat_USCOREobjectResponse(soap, &_param_3); + if (soap_begin_count(soap)) + return soap->error; + if (soap->mode & SOAP_IO_LENGTH) + { if (soap_envelope_begin_out(soap) + || soap_putheader(soap) + || soap_body_begin_out(soap) + || soap_put_ns1__stat_USCOREobjectResponse(soap, &_param_3, "ns1:stat_objectResponse", "") + || soap_body_end_out(soap) + || soap_envelope_end_out(soap)) + return soap->error; + }; + if (soap_end_count(soap) + || soap_response(soap, SOAP_OK) + || soap_envelope_begin_out(soap) + || soap_putheader(soap) + || soap_body_begin_out(soap) + || soap_put_ns1__stat_USCOREobjectResponse(soap, &_param_3, "ns1:stat_objectResponse", "") + || soap_body_end_out(soap) + || soap_envelope_end_out(soap) + || soap_end_send(soap)) + return soap->error; + return soap_closesock(soap); +} #ifdef __cplusplus