soap.udp socket errors fixed

5 files changed, 46 insertions, 23 deletions

diff --git a/libcsoap/soap-nudp.c b/libcsoap/soap-nudp.c
index cde774a..e7f4dc1 100644
--- a/libcsoap/soap-nudp.c
+++ b/libcsoap/soap-nudp.c
@@ -1,5 +1,5 @@
 /******************************************************************
-*  $Id: soap-nudp.c,v 1.8 2006/12/10 19:21:06 m0gg Exp $
+*  $Id: soap-nudp.c,v 1.9 2006/12/16 15:55:24 m0gg Exp $
 *
 * CSOAP Project:  A SOAP client/server library in C
 * Copyright (C) 2006 Heiko Ronsdorf
@@ -130,17 +130,22 @@ static herror_t
 _soap_nudp_send_document(int socket, xmlDocPtr doc, const struct sockaddr *addr, socklen_t addr_len)
 {
   xmlChar *buf;
+  herror_t ret;
   int size;
+  size_t sent;
+
+  ret = H_OK;
 
   xmlDocDumpMemory(doc, &buf, &size);
-  if (sendto(socket, buf, size, 0, addr, addr_len) < 0)
+  if ((sent = sendto(socket, buf, size, 0, addr, addr_len)) == -1)
   {
     log_error2("sendto failed (%s)", strerror(errno));
-    return herror_new("soap_nudp_client_invoke", 0, "Cannot send message");
+    ret = herror_new("soap_nudp_client_invoke", 0, "Cannot send message");
   }
+
   xmlFree(buf);
 
-  return H_OK;
+  return ret;
 }
 
 static herror_t
@@ -149,11 +154,13 @@ _soap_nudp_receive_document(int socket, xmlDocPtr *doc, struct sockaddr *addr, s
   int cnt;
   char buf[4096];
 
-  if ((cnt = recvfrom(socket, buf, 4096, 0, addr, addr_len)) < 0)
+  /** @todo: use a timeout ??? */
+  if ((cnt = recvfrom(socket, buf, 4095, 0, addr, addr_len)) < 0)
   {
     log_error2("recvfrom failed (%s)", strerror(errno));
     return herror_new("_soap_nudp_receive_document", 0, "Receiving document failed");
   }
+  buf[cnt] = '\0';
 
   if (!(*doc = xmlReadDoc(buf, NULL, NULL, XML_PARSE_NONET)))
   {
@@ -165,15 +172,17 @@ _soap_nudp_receive_document(int socket, xmlDocPtr *doc, struct sockaddr *addr, s
 }
 
 static herror_t
-_soap_nudp_client_invoke(void *unused, struct SoapCtx *req, struct SoapCtx **res)
+_soap_nudp_client_invoke(void *unused, struct SoapCtx *request, struct SoapCtx **response)
 {
   xmlURI *to;
   xmlDocPtr doc;
   int sd;
   herror_t status;
   struct sockaddr_in addr;
+  struct sockaddr saddr;
+  socklen_t saddr_len;
 
-  if (!(to = soap_addressing_get_to_address(req->env)))
+  if (!(to = soap_addressing_get_to_address(request->env)))
   {
     log_error1("soap_addressing_get_to_address returned NULL");
     return herror_new("soap_nudp_client_invoke", 0, "Destination address is missing");
@@ -198,20 +207,24 @@ _soap_nudp_client_invoke(void *unused, struct SoapCtx *req, struct SoapCtx **res
     return herror_new("soap_nudp_client_invoke", 0, "Cannot create socket");
   }
 
-  _soap_nudp_send_document(sd, req->env->root->doc, (struct sockaddr *)&addr, sizeof(struct sockaddr_in));
+  _soap_nudp_send_document(sd, request->env->root->doc, (struct sockaddr *)&addr, sizeof(struct sockaddr_in));
 
-  if ((status = _soap_nudp_receive_document(sd, &doc, NULL, NULL)) != H_OK)
+  saddr_len = sizeof(struct sockaddr);
+  if ((status = _soap_nudp_receive_document(sd, &doc, &saddr, &saddr_len)) != H_OK)
   {
     log_error2("_soap_nudp_receive_document failed (%s)", herror_message(status));
     return status;
   }
 
-  if ((status = soap_env_new_from_doc(doc, &(*res)->env)) != H_OK)
+  *response = soap_ctx_new(NULL);
+  if ((status = soap_env_new_from_doc(doc, &(*response)->env)) != H_OK)
   {
     log_error2("soap_env_new_from_doc failed (%s)", herror_message(status));
     return status;
   }
 
+  /** @todo: set saddr in SOAP:Header */
+
   return H_OK;
 }
 
@@ -259,12 +272,19 @@ soap_nudp_server_run(void *unused)
   struct SoapCtx *req;
   struct SoapCtx *res;
   xmlURI *to;
+  herror_t status;
 
   while (_soap_nudp_running)
   {
     /* XXX: select with timeout */
 
-    _soap_nudp_receive_document(_soap_nudp_socket, &doc, &addr, &addr_len);
+    addr_len = sizeof(struct sockaddr);
+    if (_soap_nudp_receive_document(_soap_nudp_socket, &doc, &addr, &addr_len) != H_OK)
+    {
+      log_error2("_soap_nudp_receive_document failed (%s)", herror_message(status));
+      herror_release(status);
+      continue;
+    }
 
     /* log_error1(__FUNCTION__);
      xmlDocFormatDump(stdout, doc, 1); */
@@ -277,10 +297,12 @@ soap_nudp_server_run(void *unused)
     to = soap_addressing_get_to_address(req->env);
     soap_addressing_set_to_address_string(req->env, to->path);
 
-    xmlFreeDoc(doc);
+    // xmlFreeDoc(doc);
 
     soap_transport_process(req, &res);
 
+    xmlDocFormatDump(stderr, res->env->root->doc, 1);
+
     _soap_nudp_send_document(_soap_nudp_socket, res->env->root->doc, &addr, addr_len);
 
     soap_ctx_free(res);
diff --git a/nanohttp/nanohttp-common.c b/nanohttp/nanohttp-common.c
index a7f7f50..9b5015e 100644
--- a/nanohttp/nanohttp-common.c
+++ b/nanohttp/nanohttp-common.c
@@ -1,5 +1,5 @@
 /******************************************************************
-*  $Id: nanohttp-common.c,v 1.36 2006/12/10 19:21:06 m0gg Exp $
+*  $Id: nanohttp-common.c,v 1.37 2006/12/16 15:55:24 m0gg Exp $
 *
 * CSOAP Project:  A http client/server library in C
 * Copyright (C) 2003  Ferhat Ayaz
@@ -193,8 +193,11 @@ hpairnode_free(hpair_t * pair)
   if (pair == NULL)
     return;
 
-  free(pair->key);
-  free(pair->value);
+  if (pair->key)
+    free(pair->key);
+
+  if (pair->value)
+    free(pair->value);
 
   free(pair);
 
@@ -462,7 +465,7 @@ attachments_free(struct attachments_t *message)
 {
   struct part_t *tmp, *part;
 
-  if (message == NULL)
+  if (!message)
     return;
 
   part = message->parts;
diff --git a/nanohttp/nanohttp-mime.c b/nanohttp/nanohttp-mime.c
index 59b50c0..4798bf4 100755
--- a/nanohttp/nanohttp-mime.c
+++ b/nanohttp/nanohttp-mime.c
@@ -3,7 +3,7 @@
 * | \/ | | | | \/ | | _/
 * |_''_| |_| |_''_| |_'/  PARSER
 *
-*  $Id: nanohttp-mime.c,v 1.18 2006/12/11 08:35:58 m0gg Exp $
+*  $Id: nanohttp-mime.c,v 1.19 2006/12/16 15:55:24 m0gg Exp $
 *
 * CSOAP Project:  A http client/server library in C
 * Copyright (C) 2003-2004  Ferhat Ayaz
@@ -964,8 +964,7 @@ mime_get_attachments(content_type_t * ctype, struct http_input_stream_t * in,
                       "'start' not set for multipart/related");
   }
 
-  mimeMessage =
-    mime_message_parse(in, root_id, boundary, ".");
+  mimeMessage = mime_message_parse(in, root_id, boundary, ".");
   if (mimeMessage == NULL)
   {
     /* TODO (#1#): Handle Error in http form */
diff --git a/nanohttp/nanohttp-response.c b/nanohttp/nanohttp-response.c
index 5741683..ec35c40 100755
--- a/nanohttp/nanohttp-response.c
+++ b/nanohttp/nanohttp-response.c
@@ -1,5 +1,5 @@
 /******************************************************************
-*  $Id: nanohttp-response.c,v 1.17 2006/12/10 19:21:07 m0gg Exp $
+*  $Id: nanohttp-response.c,v 1.18 2006/12/16 15:55:24 m0gg Exp $
 *
 * CSOAP Project:  A http client/server library in C
 * Copyright (C) 2003-2004  Ferhat Ayaz
@@ -204,7 +204,6 @@ read_header:                   /* for errorcode: 100 (continue) */
   /* Create input stream */
   res->in = http_input_stream_new(sock, res->header);
 
-
   /* Check for MIME message */
   if ((res->content_type &&
        !strcmp(res->content_type->type, "multipart/related")))
diff --git a/nanohttp/nanohttp-server.c b/nanohttp/nanohttp-server.c
index 1808b32..bc7bffe 100644
--- a/nanohttp/nanohttp-server.c
+++ b/nanohttp/nanohttp-server.c
@@ -1,5 +1,5 @@
 /******************************************************************
-*  $Id: nanohttp-server.c,v 1.74 2006/12/10 19:21:07 m0gg Exp $
+*  $Id: nanohttp-server.c,v 1.75 2006/12/16 15:55:24 m0gg Exp $
 *
 * CSOAP Project:  A http client/server library in C
 * Copyright (C) 2003  Ferhat Ayaz
@@ -749,7 +749,7 @@ httpd_session_main(void *data)
             {
               char buffer[256];
 
-              sprintf(buffer, "service '%s' not registered properly (func == NULL)", req->path);
+              sprintf(buffer, "service '%s' not registered properly (service function is NULL)", req->path);
               log_verbose1(buffer);
               httpd_send_internal_error(rconn, buffer);
             }