diff options
Diffstat (limited to 'libcsoap/soap-client.c')
| -rw-r--r-- | libcsoap/soap-client.c | 223 |
1 files changed, 22 insertions, 201 deletions
diff --git a/libcsoap/soap-client.c b/libcsoap/soap-client.c index 3513d36..4e12650 100644 --- a/libcsoap/soap-client.c +++ b/libcsoap/soap-client.c @@ -1,5 +1,5 @@ /****************************************************************** -* $Id: soap-client.c,v 1.28 2006/11/19 09:40:14 m0gg Exp $ +* $Id: soap-client.c,v 1.29 2006/11/21 20:59:02 m0gg Exp $ * * CSOAP Project: A SOAP client/server library in C * Copyright (C) 2003 Ferhat Ayaz @@ -25,230 +25,51 @@ #include <config.h> #endif -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#endif - -#ifdef HAVE_STRING_H -#include <string.h> -#endif - -#ifdef HAVE_STDIO_H -#include <stdio.h> -#endif - #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif +#include <libxml/tree.h> +#include <libxml/uri.h> + #include <nanohttp/nanohttp-common.h> #include <nanohttp/nanohttp-socket.h> #include <nanohttp/nanohttp-stream.h> #include <nanohttp/nanohttp-request.h> -#include <nanohttp/nanohttp-response.h> -#include <nanohttp/nanohttp-client.h> +#include <nanohttp/nanohttp-server.h> #include <nanohttp/nanohttp-logging.h> +#include "soap-fault.h" +#include "soap-env.h" +#include "soap-ctx.h" +#include "soap-addressing.h" +#include "soap-service.h" +#include "soap-router.h" +#include "soap-transport.h" #include "soap-client.h" -static herror_t -_soap_client_build_result(hresponse_t * res, SoapEnv ** env) -{ - log_verbose2("Building result (%p)", res); - - if (res == NULL) - return herror_new("_soap_client_build_result", - GENERAL_INVALID_PARAM, "hresponse_t is NULL"); - - - if (res->in == NULL) - return herror_new("_soap_client_build_result", - GENERAL_INVALID_PARAM, "Empty response from server"); - - if (res->errcode != 200) - return herror_new("_soap_client_build_result", - GENERAL_INVALID_PARAM, "HTTP code is not OK (%i)", res->errcode); - - return soap_env_new_from_stream(res->in, env); -} - herror_t -soap_client_init_args(int argc, char *argv[]) +soap_client_init_args(int argc, char **argv) { - - return httpc_init(argc, argv); + return soap_transport_client_init_args(argc, argv); } void soap_client_destroy(void) { - httpc_destroy(); - + soap_transport_client_destroy(); + return; } herror_t -soap_client_invoke(SoapCtx * call, SoapCtx ** response, const char *url, - const char *soap_action) +soap_client_invoke(SoapCtx *req, SoapCtx **res, const char *url, const char *action) { - /* Status */ - herror_t status; - - /* Result document */ - SoapEnv *res_env; - - /* Buffer variables */ - xmlBufferPtr buffer; - char *content; - char tmp[15]; - - /* Transport variables */ - httpc_conn_t *conn; - hresponse_t *res; - - /* multipart/related start id */ - char start_id[150]; - static int counter = 1; - part_t *part; - - /* for copy attachments */ - char href[MAX_HREF_SIZE]; + log_verbose2("action = \"%s\"", action); + soap_addressing_set_action_string(req->env, action); - /* Create buffer */ - buffer = xmlBufferCreate(); - xmlNodeDump(buffer, call->env->root->doc, call->env->root, 1, 0); - content = (char *) xmlBufferContent(buffer); + log_verbose2("url = \"%s\"", url); + soap_addressing_set_to_address_string(req->env, url); - /* Transport via HTTP */ - if (!(conn = httpc_new())) - { - return herror_new("soap_client_invoke", SOAP_ERROR_CLIENT_INIT, - "Unable to create SOAP client!"); - } - - /* Set soap action */ - if (soap_action != NULL) - httpc_set_header(conn, "SoapAction", soap_action); - - httpc_set_header(conn, HEADER_CONNECTION, "Close"); - - /* check for attachments */ - if (!call->attachments) - { - /* content-type is always 'text/xml' */ - httpc_set_header(conn, HEADER_CONTENT_TYPE, "text/xml"); - - sprintf(tmp, "%d", (int) strlen(content)); - httpc_set_header(conn, HEADER_CONTENT_LENGTH, tmp); - - if ((status = httpc_post_begin(conn, url)) != H_OK) - { - httpc_close_free(conn); - xmlBufferFree(buffer); - return status; - } - - if ((status = http_output_stream_write_string(conn->out, content)) != H_OK) - { - httpc_close_free(conn); - xmlBufferFree(buffer); - return status; - } - - if ((status = httpc_post_end(conn, &res)) != H_OK) - { - httpc_close_free(conn); - xmlBufferFree(buffer); - return status; - } - } - else - { - - /* Use chunked transport */ - httpc_set_header(conn, HEADER_TRANSFER_ENCODING, - TRANSFER_ENCODING_CHUNKED); - - sprintf(start_id, "289247829121218%d", counter++); - if ((status = httpc_mime_begin(conn, url, start_id, "", "text/xml")) != H_OK) - { - httpc_close_free(conn); - xmlBufferFree(buffer); - return status; - } - - if ((status = httpc_mime_next(conn, start_id, "text/xml", "binary")) != H_OK) - { - httpc_close_free(conn); - xmlBufferFree(buffer); - return status; - } - - if ((status = http_output_stream_write(conn->out, content, strlen(content))) != H_OK) - { - httpc_close_free(conn); - xmlBufferFree(buffer); - return status; - } - - - for (part = call->attachments->parts; part; part = part->next) - { - status = httpc_mime_send_file(conn, part->id, - part->content_type, - part->transfer_encoding, part->filename); - if (status != H_OK) - { - log_error2("Send file failed. Status:%d", status); - httpc_close_free(conn); - xmlBufferFree(buffer); - return status; - } - } - - if ((status = httpc_mime_end(conn, &res)) != H_OK) - { - httpc_close_free(conn); - xmlBufferFree(buffer); - return status; - } - } - - /* Free buffer */ - xmlBufferFree(buffer); - - /* Build result */ - if ((status = _soap_client_build_result(res, &res_env)) != H_OK) - { - hresponse_free(res); - httpc_close_free(conn); - return status; - } - - /* Create Context */ - *response = soap_ctx_new(res_env); -/* soap_ctx_add_files(*response, res->attachments);*/ - - if (res->attachments != NULL) - { - part = res->attachments->parts; - while (part) - { - soap_ctx_add_file(*response, part->filename, part->content_type, href); - part->deleteOnExit = 0; - part = part->next; - } - part = (*response)->attachments->parts; - while (part) - { - part->deleteOnExit = 1; - part = part->next; - } - } - - hresponse_free(res); - httpc_close_free(conn); - - return H_OK; + return soap_transport_client_invoke(req, res); } - |