fix related to #4909/12605: force desirability of path if path is in use

[oweals/gnunet.git] / src / testbed / testbed_api_barriers.c

diff --git a/src/testbed/testbed_api_barriers.c b/src/testbed/testbed_api_barriers.c
index 74139cc53822402391421d0bb81264ce79a6761d..93698d4b729ce0432e7744b944ece11bfa635b25 100644 (file)
--- a/src/testbed/testbed_api_barriers.c
+++ b/src/testbed/testbed_api_barriers.c
@@ -105,6 +105,9 @@ handle_status (void *cls,
 {
   struct GNUNET_TESTBED_BarrierWaitHandle *h = cls;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Got barrier status %d\n",
+              (int) ntohs (msg->status));
   switch (ntohs (msg->status))
   {
   case GNUNET_TESTBED_BARRIERSTATUS_ERROR:
@@ -171,13 +174,13 @@ GNUNET_TESTBED_barrier_wait (const char *name,
                              GNUNET_TESTBED_barrier_wait_cb cb,
                              void *cb_cls)
 {
-  GNUNET_MQ_hd_var_size (status,
-                         GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_STATUS,
-                         struct GNUNET_TESTBED_BarrierStatusMsg);
   struct GNUNET_TESTBED_BarrierWaitHandle *h
     = GNUNET_new (struct GNUNET_TESTBED_BarrierWaitHandle);
   struct GNUNET_MQ_MessageHandler handlers[] = {
-    make_status_handler (h),
+    GNUNET_MQ_hd_var_size (status,
+                           GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_STATUS,
+                           struct GNUNET_TESTBED_BarrierStatusMsg,
+                           h),
     GNUNET_MQ_handler_end ()
   };
   struct GNUNET_MQ_Envelope *env;
@@ -206,10 +209,13 @@ GNUNET_TESTBED_barrier_wait (const char *name,
     GNUNET_free (h);
     return NULL;
   }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Waiting on barrier `%s'\n",
+              name);
   h->name = GNUNET_strdup (name);
   h->cb = cb;
   h->cb_cls = cb_cls;
-  h->mq = GNUNET_CLIENT_connecT (h->cfg,
+  h->mq = GNUNET_CLIENT_connect (h->cfg,
                                  "testbed-barrier",
                                  handlers,
                                  &mq_error_handler,
@@ -225,9 +231,9 @@ GNUNET_TESTBED_barrier_wait (const char *name,
   env = GNUNET_MQ_msg_extra (msg,
                              name_len,
                              GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_WAIT);
-  memcpy (msg->name,
-          name,
-          name_len);
+  GNUNET_memcpy (msg->name,
+                 name,
+                 name_len);
   GNUNET_MQ_send (h->mq,
                   env);
   return h;