redefine GNUNET_MQ_queue_for_connection_client to capture client handle

3 files changed, 52 insertions, 17 deletions

diff --git a/src/util/client.c b/src/util/client.c
index d00e8bbd0..e30ce6589 100644
--- a/src/util/client.c
+++ b/src/util/client.c
@@ -404,6 +404,36 @@ do_connect (const char *service_name,
 
 
 /**
+ * Create a message queue to connect to a GNUnet service.
+ * If handlers are specfied, receive messages from the connection.
+ *
+ * @param connection the client connection
+ * @param handlers handlers for receiving messages, can be NULL
+ * @param error_handler error handler
+ * @param error_handler_cls closure for the @a error_handler
+ * @return the message queue, NULL on error
+ */
+struct GNUNET_MQ_Handle *
+GNUNET_CLIENT_connecT (const struct GNUNET_CONFIGURATION_Handle *cfg,
+                       const char *service_name,
+                       const struct GNUNET_MQ_MessageHandler *handlers,
+                       GNUNET_MQ_ErrorHandler error_handler,
+                       void *error_handler_cls)
+{
+  struct GNUNET_CLIENT_Connection *c;
+
+  c = GNUNET_CLIENT_connect (service_name,
+                             cfg);
+  if (NULL == c)
+    return NULL;
+  return GNUNET_MQ_queue_for_connection_client (c,
+                                                handlers,
+                                                error_handler,
+                                                error_handler_cls);
+}
+
+
+/**
  * Get a connection with a service.
  *
  * @param service_name name of the service
diff --git a/src/util/mq.c b/src/util/mq.c
index 4170338ad..c14b4b91d 100644
--- a/src/util/mq.c
+++ b/src/util/mq.c
@@ -206,7 +206,7 @@ GNUNET_MQ_inject_message (struct GNUNET_MQ_Handle *mq,
   const struct GNUNET_MQ_MessageHandler *handler;
   int handled = GNUNET_NO;
   uint16_t ms = ntohs (mh->size);
-  
+
   if (NULL == mq->handlers)
     goto done;
   for (handler = mq->handlers; NULL != handler->cb; handler++)
@@ -665,6 +665,9 @@ static void
 connection_client_destroy_impl (struct GNUNET_MQ_Handle *mq,
                                 void *impl_state)
 {
+  struct ClientConnectionState *state = impl_state;
+
+  GNUNET_CLIENT_disconnect (state->connection);
   GNUNET_free (impl_state);
 }
 
@@ -692,6 +695,7 @@ connection_client_cancel_impl (struct GNUNET_MQ_Handle *mq,
                                void *impl_state)
 {
   struct ClientConnectionState *state = impl_state;
+
   GNUNET_assert (NULL != state->th);
   GNUNET_CLIENT_notify_transmit_ready_cancel (state->th);
   state->th = NULL;
@@ -723,9 +727,9 @@ GNUNET_MQ_queue_for_connection_client (struct GNUNET_CLIENT_Connection *connecti
   state = GNUNET_new (struct ClientConnectionState);
   state->connection = connection;
   mq->impl_state = state;
-  mq->send_impl = connection_client_send_impl;
-  mq->destroy_impl = connection_client_destroy_impl;
-  mq->cancel_impl = connection_client_cancel_impl;
+  mq->send_impl = &connection_client_send_impl;
+  mq->destroy_impl = &connection_client_destroy_impl;
+  mq->cancel_impl = &connection_client_cancel_impl;
   if (NULL != handlers)
     state->receive_requested = GNUNET_YES;
 
diff --git a/src/util/test_mq_client.c b/src/util/test_mq_client.c
index f894c3912..27458ec0a 100644
--- a/src/util/test_mq_client.c
+++ b/src/util/test_mq_client.c
@@ -32,8 +32,6 @@
 
 static struct GNUNET_SERVER_Handle *server;
 
-static struct GNUNET_CLIENT_Connection *client;
-
 static struct GNUNET_CONFIGURATION_Handle *cfg;
 
 static int ok;
@@ -44,13 +42,15 @@ static int received = 0;
 
 
 static void
-recv_cb (void *cls, struct GNUNET_SERVER_Client *argclient,
+recv_cb (void *cls,
+         struct GNUNET_SERVER_Client *argclient,
          const struct GNUNET_MessageHeader *message)
 {
   received++;
   if (received == 2)
   {
-    GNUNET_SERVER_receive_done (argclient, GNUNET_NO);
+    GNUNET_SERVER_receive_done (argclient,
+                                GNUNET_NO);
     return;
   }
 
@@ -79,7 +79,8 @@ clean_up (void *cls)
  * @param client identification of the client
  */
 static void
-notify_disconnect (void *cls, struct GNUNET_SERVER_Client *client)
+notify_disconnect (void *cls,
+                   struct GNUNET_SERVER_Client *client)
 {
   if (client == NULL)
     return;
@@ -110,11 +111,15 @@ send_trap_cb (void *cls)
 
 
 static void
-test_mq (struct GNUNET_CLIENT_Connection *client)
+test_mq ()
 {
+  struct GNUNET_CLIENT_Connection *client;
   struct GNUNET_MQ_Handle *mq;
   struct GNUNET_MQ_Envelope *mqm;
 
+  client = GNUNET_CLIENT_connect ("test", cfg);
+  GNUNET_assert (client != NULL);
+
   /* FIXME: test handling responses */
   mq = GNUNET_MQ_queue_for_connection_client (client, NULL, NULL, NULL);
 
@@ -122,14 +127,13 @@ test_mq (struct GNUNET_CLIENT_Connection *client)
   GNUNET_MQ_send (mq, mqm);
 
   mqm = GNUNET_MQ_msg_header (MY_TYPE);
-  GNUNET_MQ_notify_sent (mqm, send_trap_cb, NULL);
+  GNUNET_MQ_notify_sent (mqm, &send_trap_cb, NULL);
   GNUNET_MQ_send (mq, mqm);
   GNUNET_MQ_send_cancel (mqm);
 
   mqm = GNUNET_MQ_msg_header (MY_TYPE);
-  GNUNET_MQ_notify_sent (mqm, send_cb, NULL);
+  GNUNET_MQ_notify_sent (mqm, &send_cb, NULL);
   GNUNET_MQ_send (mq, mqm);
-
 }
 
 
@@ -163,10 +167,7 @@ task (void *cls)
   GNUNET_CONFIGURATION_set_value_string (cfg, "test", "HOSTNAME", "localhost");
   GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME",
                                          "localhost");
-  client = GNUNET_CLIENT_connect ("test", cfg);
-  GNUNET_assert (client != NULL);
-
-  test_mq (client);
+  test_mq ();
 }