[GNUnet-SVN] r29135 - gnunet/src/testbed

[gnunet]

Author: harsha
Date: 2013-09-09 16:52:57 +0200 (Mon, 09 Sep 2013)
New Revision: 29135

Added:
   gnunet/src/testbed/test_testbed_api_barriers.h
Modified:
   gnunet/src/testbed/gnunet-service-testbed_barriers.c
Log:
- fix compile


Modified: gnunet/src/testbed/gnunet-service-testbed_barriers.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed_barriers.c        2013-09-09 
13:49:29 UTC (rev 29134)
+++ gnunet/src/testbed/gnunet-service-testbed_barriers.c        2013-09-09 
14:52:57 UTC (rev 29135)
@@ -168,7 +168,7 @@
   /**
    * The client handle to the master controller
    */
-  struct GNUNET_SERVER_Client *client;
+  struct GNUNET_SERVER_Client *mc;
 
   /**
    * The name of the barrier
@@ -308,6 +308,8 @@
   
   mq = GNUNET_malloc (sizeof (struct MessageQueue));
   mq->msg = msg;
+  LOG_DEBUG ("Queueing message of type %u, size %u for sending\n",
+             ntohs (msg->type), ntohs (msg->size));
   GNUNET_CONTAINER_DLL_insert_tail (ctx->mq_head, ctx->mq_tail, mq);
   if (NULL == ctx->tx)
    ctx->tx = GNUNET_SERVER_notify_transmit_ready (client, ntohs (msg->size),
@@ -359,7 +361,7 @@
     cleanup_clientctx (ctx);
   }
   GNUNET_free (barrier->name);
-  GNUNET_SERVER_client_drop (barrier->client);
+  GNUNET_SERVER_client_drop (barrier->mc);
   GNUNET_free (barrier);
 }
 
@@ -430,8 +432,7 @@
 send_barrier_status_msg (struct Barrier *barrier, const char *emsg)
 {
   GNUNET_assert (0 != barrier->status);
-  send_client_status_msg (barrier->client, barrier->name,
-                          barrier->status, emsg);
+  send_client_status_msg (barrier->mc, barrier->name, barrier->status, emsg);
 }
 
 
@@ -529,6 +530,7 @@
     GNUNET_SERVER_client_keep (client);
     client_ctx->barrier = barrier;
     GNUNET_CONTAINER_DLL_insert_tail (barrier->head, barrier->tail, 
client_ctx);
+    GNUNET_SERVER_client_set_user_context (client, client_ctx); 
   }
   barrier->nreached++;
   if ((barrier->num_wbarriers_reached == barrier->num_wbarriers)
@@ -754,7 +756,7 @@
   (void) memcpy (&barrier->hash, &hash, sizeof (struct GNUNET_HashCode));
   barrier->quorum = msg->quorum;
   barrier->name = name;
-  barrier->client = client;
+  barrier->mc = client;
   GNUNET_SERVER_client_keep (client);
   GNUNET_assert (GNUNET_OK ==
                  GNUNET_CONTAINER_multihashmap_put (barrier_map,

Added: gnunet/src/testbed/test_testbed_api_barriers.h
===================================================================
--- gnunet/src/testbed/test_testbed_api_barriers.h                              
(rev 0)
+++ gnunet/src/testbed/test_testbed_api_barriers.h      2013-09-09 14:52:57 UTC 
(rev 29135)
@@ -0,0 +1,5 @@
+
+/**
+ * The name to use for the barrier in the test cases
+ */
+#define TEST_BARRIER_NAME "test_barrier"