1 files changed, 16 insertions, 9 deletions

diff --git a/src/testbed/testbed.h b/src/testbed/testbed.h
index 73cf8c294..7b0406502 100644
--- a/src/testbed/testbed.h
+++ b/src/testbed/testbed.h
@@ -784,22 +784,29 @@ struct GNUNET_TESTBED_BarrierInit
   struct GNUNET_MessageHeader header;
 
   /**
-   * Unused.  Only of alignment.
+   * The quorum percentage needed for crossing the barrier
    */
-  uint32_t unused;
-  
+  uint8_t quorum;
+
   /**
-   * The operation id
+   * name of the barrier.  Non NULL-terminated.
    */
-  uint64_t op_id;
-  
+  char name[0];
+};
+
+
+/**
+ * Message to cancel a barrier
+ */
+struct GNUNET_TESTBED_BarrierCancel
+{
   /**
-   * The quorum percentage needed for crossing the barrier
+   * Type is GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_CANCEL
    */
-  uint8_t quorum;
+  struct GNUNET_MessageHeader header;
 
   /**
-   * name of the barrier.  Non NULL-terminated.
+   * The barrier name.  Non NULL terminated
    */
   char name[0];
 };