From d24d6ab7bbfda8e302af3a5cf8be62299d543c1a Mon Sep 17 00:00:00 2001
From: snowdrop
Date: Thu, 28 Oct 2004 10:30:41 +0000
Subject: changed hstatus_t to herror_t and chagend the API function to return
herror_t. Added herror_*() functions and fixed a bug in the socket receive
comm.
---
libcsoap/soap-server.c | 76 +++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 59 insertions(+), 17 deletions(-)
(limited to 'libcsoap/soap-server.c')
diff --git a/libcsoap/soap-server.c b/libcsoap/soap-server.c
index 690fa6b..65bef3f 100644
--- a/libcsoap/soap-server.c
+++ b/libcsoap/soap-server.c
@@ -1,5 +1,5 @@
/******************************************************************
-* $Id: soap-server.c,v 1.6 2004/10/20 14:17:36 snowdrop Exp $
+* $Id: soap-server.c,v 1.7 2004/10/28 10:30:46 snowdrop Exp $
*
* CSOAP Project: A SOAP client/server library in C
* Copyright (C) 2003 Ferhat Ayaz
@@ -58,9 +58,9 @@ void _soap_server_send_fault(httpd_conn_t *conn, hpair_t *header,
/*---------------------------------*/
-int soap_server_init_args(int argc, char *argv[])
+herror_t soap_server_init_args(int argc, char *argv[])
{
- return !httpd_init(argc, argv);
+ return httpd_init(argc, argv);
}
@@ -82,7 +82,7 @@ int soap_server_register_router(SoapRouter *router, const char* context)
}
-int soap_server_run()
+herror_t soap_server_run()
{
return httpd_run();
}
@@ -113,7 +113,8 @@ void soap_server_entry(httpd_conn_t *conn, hrequest_t *req)
SoapCtx *ctx, *ctxres;
SoapRouter *router;
SoapService *service;
- SoapEnv *env;
+ SoapEnv *env;
+ herror_t err;
if (req->method != HTTP_REQUEST_POST) {
@@ -125,10 +126,17 @@ void soap_server_entry(httpd_conn_t *conn, hrequest_t *req)
return;
}
-/* postdata = httpd_get_postdata(conn, req, &received, -1);*/
- env = soap_env_new_from_stream(req->in);
- header = hpairnode_new(HEADER_CONTENT_TYPE, "text/xml", NULL);
+ header = hpairnode_new(HEADER_CONTENT_TYPE, "text/xml", NULL);
+
+ err = soap_env_new_from_stream(req->in, &env);
+ if (err != H_OK)
+ {
+ _soap_server_send_fault(conn, header, herror_message(err));
+ herror_release(err);
+ return;
+ }
+
if (env == NULL) {
@@ -183,13 +191,22 @@ void soap_server_entry(httpd_conn_t *conn, hrequest_t *req)
return;
} else {
- log_verbose2("func: %p", service->func);
+ log_verbose2("func: %p", service->func);
+ ctxres = soap_ctx_new(NULL);
/* ===================================== */
/* CALL SERVICE FUNCTION */
/* ===================================== */
- ctxres = service->func(ctx);
- log_verbose2("func returned: (%p)", ctxres);
- if (ctxres == NULL) {
+ err = service->func(ctx, ctxres);
+ if (err != H_OK) {
+ sprintf(buffer, "Service returned following error message: '%s'",
+ herror_message(err));
+ herror_release(err);
+ _soap_server_send_fault(conn, header, buffer);
+ soap_ctx_free(ctx);
+ return;
+ }
+
+ if (ctxres->env == NULL) {
sprintf(buffer, "Service '%s' returned no envelope", urn);
_soap_server_send_fault(conn, header, buffer);
@@ -271,13 +288,38 @@ static
void _soap_server_send_fault(httpd_conn_t *conn, hpair_t *header,
const char* errmsg)
{
- SoapEnv *envres;
+ SoapEnv *envres;
+ herror_t err;
+ char buffer[45];
httpd_set_headers(conn, header);
- httpd_send_header(conn, 500, "FAILED");
- envres = soap_env_new_with_fault(Fault_Server,
+ err = httpd_send_header(conn, 500, "FAILED");
+ if (err != H_OK) {
+ /* WARNING: unhandled exception !*/
+ log_error4("%s():%s [%d]", herror_func(err), herror_message(err), herror_code(err));
+ return;
+ }
+
+ err = soap_env_new_with_fault(Fault_Server,
errmsg?errmsg:"General error",
- "cSOAP_Server", NULL);
- _soap_server_send_env(conn->out, envres);
+ "cSOAP_Server", NULL, &envres);
+ if (err != H_OK) {
+ log_error1(herror_message(err));
+ http_output_stream_write_string(conn->out, "");
+ http_output_stream_write_string(conn->out, "Error
");
+ http_output_stream_write_string(conn->out, "Error while sending fault object:
Message: ");
+ http_output_stream_write_string(conn->out, herror_message(err));
+ http_output_stream_write_string(conn->out, "
Function: ");
+ http_output_stream_write_string(conn->out, herror_func(err));
+ http_output_stream_write_string(conn->out, "
Error code: ");
+ sprintf(buffer, "%d", herror_code(err));
+ http_output_stream_write_string(conn->out, buffer);
+ http_output_stream_write_string(conn->out, "");
+ return;
+
+ herror_release(err);
+ } else {
+ _soap_server_send_env(conn->out, envres);
+ }
}
--
cgit v1.1-32-gdbae