You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rh...@apache.org on 2012/08/22 18:30:49 UTC

svn commit: r1376132 - in /qpid/proton/trunk: proton-c/include/proton/driver.h proton-c/include/proton/error.h proton-c/src/driver.c proton-c/src/error.c proton-c/src/messenger.c tests/proton_tests/messenger.py

Author: rhs
Date: Wed Aug 22 16:30:49 2012
New Revision: 1376132

URL: http://svn.apache.org/viewvc?rev=1376132&view=rev
Log:
added error info to driver; added iterator interface for listeners and connectors; made pn_messenger_stop close listeners

Modified:
    qpid/proton/trunk/proton-c/include/proton/driver.h
    qpid/proton/trunk/proton-c/include/proton/error.h
    qpid/proton/trunk/proton-c/src/driver.c
    qpid/proton/trunk/proton-c/src/error.c
    qpid/proton/trunk/proton-c/src/messenger.c
    qpid/proton/trunk/tests/proton_tests/messenger.py

Modified: qpid/proton/trunk/proton-c/include/proton/driver.h
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/include/proton/driver.h?rev=1376132&r1=1376131&r2=1376132&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/include/proton/driver.h (original)
+++ qpid/proton/trunk/proton-c/include/proton/driver.h Wed Aug 22 16:30:49 2012
@@ -52,6 +52,22 @@ typedef struct pn_connector_t pn_connect
  */
 pn_driver_t *pn_driver(void);
 
+/** Return the most recent error code.
+ *
+ * @param[in] d the driver
+ *
+ * @return the most recent error text for d
+ */
+int pn_driver_errno(pn_driver_t *d);
+
+/** Return the most recent error text for d.
+ *
+ * @param[in] d the driver
+ *
+ * @return the most recent error text for d
+ */
+const char *pn_driver_error(pn_driver_t *d);
+
 /** Set the tracing level for the given driver.
  *
  * @param[in] driver the driver to trace
@@ -124,6 +140,23 @@ pn_listener_t *pn_listener(pn_driver_t *
  */
 pn_listener_t *pn_listener_fd(pn_driver_t *driver, int fd, void *context);
 
+/** Access the head listener for a driver.
+ *
+ * @param[in] driver the driver whose head listener will be returned
+ *
+ * @return the head listener for driver or NULL if there is none
+ */
+pn_listener_t *pn_listener_head(pn_driver_t *driver);
+
+/** Access the next listener.
+ *
+ * @param[in] listener the listener whose next listener will be
+ *            returned
+ *
+ * @return the next listener
+ */
+pn_listener_t *pn_listener_next(pn_listener_t *listener);
+
 /**
  * @todo pn_listener_trace needs documentation
  */
@@ -184,6 +217,23 @@ pn_connector_t *pn_connector(pn_driver_t
  */
 pn_connector_t *pn_connector_fd(pn_driver_t *driver, int fd, void *context);
 
+/** Access the head connector for a driver.
+ *
+ * @param[in] driver the driver whose head connector will be returned
+ *
+ * @return the head connector for driver or NULL if there is none
+ */
+pn_connector_t *pn_connector_head(pn_driver_t *driver);
+
+/** Access the next connector.
+ *
+ * @param[in] connector the connector whose next connector will be
+ *            returned
+ *
+ * @return the next connector
+ */
+pn_connector_t *pn_connector_next(pn_connector_t *connector);
+
 /** Set the tracing level for the given connector.
  *
  * @param[in] connector the connector to trace

Modified: qpid/proton/trunk/proton-c/include/proton/error.h
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/include/proton/error.h?rev=1376132&r1=1376131&r2=1376132&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/include/proton/error.h (original)
+++ qpid/proton/trunk/proton-c/include/proton/error.h Wed Aug 22 16:30:49 2012
@@ -42,6 +42,7 @@ void pn_error_clear(pn_error_t *error);
 int pn_error_set(pn_error_t *error, int code, const char *text);
 int pn_error_vformat(pn_error_t *error, int code, const char *fmt, va_list ap);
 int pn_error_format(pn_error_t *error, int code, const char *fmt, ...);
+int pn_error_from_errno(pn_error_t *error, const char *msg);
 int pn_error_code(pn_error_t *error);
 const char *pn_error_text(pn_error_t *error);
 

Modified: qpid/proton/trunk/proton-c/src/driver.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/driver.c?rev=1376132&r1=1376131&r2=1376132&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/driver.c (original)
+++ qpid/proton/trunk/proton-c/src/driver.c Wed Aug 22 16:30:49 2012
@@ -31,6 +31,7 @@
 #include <unistd.h>
 
 #include <proton/driver.h>
+#include <proton/error.h>
 #include <proton/sasl.h>
 #include "util.h"
 
@@ -41,6 +42,7 @@
 #define PN_SEL_WR (0x0002)
 
 struct pn_driver_t {
+  pn_error_t *error;
   pn_listener_t *listener_head;
   pn_listener_t *listener_tail;
   pn_listener_t *listener_next;
@@ -136,24 +138,24 @@ pn_listener_t *pn_listener(pn_driver_t *
   struct addrinfo *addr;
   int code = getaddrinfo(host, port, NULL, &addr);
   if (code) {
-    fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(code));
+    pn_error_format(driver->error, PN_ERR, "getaddrinfo: %s\n", gai_strerror(code));
     return NULL;
   }
 
   int sock = socket(AF_INET, SOCK_STREAM, getprotobyname("tcp")->p_proto);
   if (sock == -1) {
-    perror("socket");
+    pn_error_from_errno(driver->error, "socket");
     return NULL;
   }
 
   int optval = 1;
   if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)) == -1) {
-    perror("setsockopt");
+    pn_error_from_errno(driver->error, "setsockopt");
     return NULL;
   }
 
   if (bind(sock, addr->ai_addr, addr->ai_addrlen) == -1) {
-    perror("bind");
+    pn_error_from_errno(driver->error, "bind");
     freeaddrinfo(addr);
     return NULL;
   }
@@ -161,14 +163,14 @@ pn_listener_t *pn_listener(pn_driver_t *
   freeaddrinfo(addr);
 
   if (listen(sock, 50) == -1) {
-    perror("listen");
+    pn_error_from_errno(driver->error, "listen");
     return NULL;
   }
 
   pn_listener_t *l = pn_listener_fd(driver, sock, context);
 
   if (driver->trace & (PN_TRACE_FRM | PN_TRACE_RAW | PN_TRACE_DRV))
-    printf("Listening on %s:%s\n", host, port);
+    fprintf(stderr, "Listening on %s:%s\n", host, port);
   return l;
 }
 
@@ -190,6 +192,16 @@ pn_listener_t *pn_listener_fd(pn_driver_
   return l;
 }
 
+pn_listener_t *pn_listener_head(pn_driver_t *driver)
+{
+  return driver ? driver->listener_head : NULL;
+}
+
+pn_listener_t *pn_listener_next(pn_listener_t *listener)
+{
+  return listener ? listener->listener_next : NULL;
+}
+
 void pn_listener_trace(pn_listener_t *l, pn_trace_t trace) {
   // XXX
 }
@@ -289,17 +301,20 @@ pn_connector_t *pn_connector(pn_driver_t
   struct addrinfo *addr;
   int code = getaddrinfo(host, port, NULL, &addr);
   if (code) {
-    fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(code));
+    pn_error_format(driver->error, PN_ERR, "getaddrinfo: %s", gai_strerror(code));
     return NULL;
   }
 
   int sock = socket(AF_INET, SOCK_STREAM, getprotobyname("tcp")->p_proto);
-  if (sock == -1)
+  if (sock == -1) {
+    pn_error_from_errno(driver->error, "socket");
     return NULL;
+  }
 
   pn_configure_sock(sock);
 
   if (connect(sock, addr->ai_addr, addr->ai_addrlen) == -1) {
+    pn_error_from_errno(driver->error, "connect");
     freeaddrinfo(addr);
     return NULL;
   }
@@ -367,6 +382,16 @@ pn_connector_t *pn_connector_fd(pn_drive
   return c;
 }
 
+pn_connector_t *pn_connector_head(pn_driver_t *driver)
+{
+  return driver ? driver->connector_head : NULL;
+}
+
+pn_connector_t *pn_connector_next(pn_connector_t *connector)
+{
+  return connector ? connector->connector_next : NULL;
+}
+
 void pn_connector_trace(pn_connector_t *ctor, pn_trace_t trace)
 {
   if (!ctor) return;
@@ -679,6 +704,7 @@ pn_driver_t *pn_driver()
 {
   pn_driver_t *d = malloc(sizeof(pn_driver_t));
   if (!d) return NULL;
+  d->error = pn_error();
   d->listener_head = NULL;
   d->listener_tail = NULL;
   d->listener_next = NULL;
@@ -705,6 +731,16 @@ pn_driver_t *pn_driver()
   return d;
 }
 
+int pn_driver_errno(pn_driver_t *d)
+{
+  return d ? pn_error_code(d->error) : PN_ARG_ERR;
+}
+
+const char *pn_driver_error(pn_driver_t *d)
+{
+  return d ? pn_error_text(d->error) : NULL;
+}
+
 void pn_driver_trace(pn_driver_t *d, pn_trace_t trace)
 {
   d->trace = trace;
@@ -721,6 +757,7 @@ void pn_driver_free(pn_driver_t *d)
   while (d->listener_head)
     pn_listener_free(d->listener_head);
   free(d->fds);
+  pn_error_free(d->error);
   free(d);
 }
 

Modified: qpid/proton/trunk/proton-c/src/error.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/error.c?rev=1376132&r1=1376131&r2=1376132&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/error.c (original)
+++ qpid/proton/trunk/proton-c/src/error.c Wed Aug 22 16:30:49 2012
@@ -19,8 +19,11 @@
  *
  */
 
+#define _POSIX_C_SOURCE (200112)
+
 #include <proton/error.h>
 #include <stdlib.h>
+#include <string.h>
 #include "util.h"
 
 struct pn_error_t {
@@ -83,6 +86,13 @@ int pn_error_format(pn_error_t *error, i
   return rcode;
 }
 
+int pn_error_from_errno(pn_error_t *error, const char *msg)
+{
+  char err[1024];
+  strerror_r(errno, err, 1024);
+  return pn_error_format(error, PN_ERR, "%s: %s", msg, err);
+}
+
 int pn_error_code(pn_error_t *error)
 {
   return error ? error->code : PN_ARG_ERR;

Modified: qpid/proton/trunk/proton-c/src/messenger.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/messenger.c?rev=1376132&r1=1376131&r2=1376132&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/messenger.c (original)
+++ qpid/proton/trunk/proton-c/src/messenger.c Wed Aug 22 16:30:49 2012
@@ -284,6 +284,14 @@ int pn_messenger_stop(pn_messenger_t *me
     pn_connection_close(conn);
   }
 
+  pn_listener_t *l = pn_listener_head(messenger->driver);
+  while (l) {
+    pn_listener_close(l);
+    pn_listener_t *prev = l;
+    l = pn_listener_next(l);
+    pn_listener_free(prev);
+  }
+
   return pn_messenger_sync(messenger, pn_messenger_stopped);
 }
 
@@ -313,7 +321,7 @@ bool pn_streq(const char *a, const char 
 
 pn_connection_t *pn_messenger_domain(pn_messenger_t *messenger, const char *domain)
 {
-  char buf[strlen(domain) + 1];
+  char buf[domain ? strlen(domain) + 1 : 1];
   if (domain) {
     strcpy(buf, domain);
   } else {
@@ -430,7 +438,8 @@ int pn_messenger_subscribe(pn_messenger_
       return 0;
     } else {
       return pn_error_format(messenger->error, PN_ERR,
-                             "unable to subscribe to source: %s", source);
+                             "unable to subscribe to source: %s (%s)", source,
+                             pn_driver_error(messenger->driver));
     }
   } else if (len >= 2 && source[0] == '/' && source[1] == '/') {
     pn_link_t *src = pn_messenger_source(messenger, source);
@@ -438,7 +447,8 @@ int pn_messenger_subscribe(pn_messenger_
       return 0;
     } else {
       return pn_error_format(messenger->error, PN_ERR,
-                             "unable to subscribe to source: %s", source);
+                             "unable to subscribe to source: %s (%s)", source,
+                             pn_driver_error(messenger->driver));
     }
   } else {
     return 0;
@@ -471,7 +481,8 @@ int pn_messenger_put(pn_messenger_t *mes
   pn_link_t *sender = pn_messenger_target(messenger, address);
   if (!sender)
     return pn_error_format(messenger->error, PN_ERR,
-                           "unable to send to address: %s", address);
+                           "unable to send to address: %s (%s)", address,
+                           pn_driver_error(messenger->driver));
   // XXX: proper tag
   char tag[8];
   void *ptr = &tag;

Modified: qpid/proton/trunk/tests/proton_tests/messenger.py
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/tests/proton_tests/messenger.py?rev=1376132&r1=1376131&r2=1376132&view=diff
==============================================================================
--- qpid/proton/trunk/tests/proton_tests/messenger.py (original)
+++ qpid/proton/trunk/tests/proton_tests/messenger.py Wed Aug 22 16:30:49 2012
@@ -86,3 +86,9 @@ class MessengerTest(Test):
 
     pn_message_free(msg)
     pn_message_free(reply)
+
+  def testSendBogus(self):
+    msg = pn_message()
+    pn_message_set_address(msg, "totally-bogus-address")
+    assert pn_messenger_put(self.client, msg) == PN_ERR
+    assert "unable to send to address: totally-bogus-address (getaddrinfo:" in pn_messenger_error(self.client)



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org