/**
* Initial message from a client to a testing control service.
*/
- struct GNUNET_TESTBED_InitMessage
+struct GNUNET_TESTBED_InitMessage
{
/**
- * Type is GNUNET_MESSAGE_TYPE_TESTBED_INIT
+ * Type is #GNUNET_MESSAGE_TYPE_TESTBED_INIT
*/
struct GNUNET_MessageHeader header;
*/
struct GNUNET_TESTBED_ControllerLinkResponse
{
-
+
/**
* Type is GNUNET_MESSAGE_TYPE_TESTBED_LINK_CONTROLLERS_RESULT
*/
{
/**
- * Type is GNUNET_MESSAGE_TYPE_TESTBED_RECONFIGURE_PEER
+ * Type is #GNUNET_MESSAGE_TYPE_TESTBED_RECONFIGURE_PEER
*/
struct GNUNET_MessageHeader header;
{
/**
- * Type is GNUNET_MESSAGE_TYPE_TESTBED_START_PEER
+ * Type is #GNUNET_MESSAGE_TYPE_TESTBED_START_PEER
*/
struct GNUNET_MessageHeader header;
{
/**
- * Type is GNUNET_MESSAGE_TYPE_TESTBED_STOP_PEER
+ * Type is #GNUNET_MESSAGE_TYPE_TESTBED_STOP_PEER
*/
struct GNUNET_MessageHeader header;
{
/**
- * Type is GNUNET_MESSAGE_TYPE_TESTBED_DESTROY_PEER
+ * Type is #GNUNET_MESSAGE_TYPE_TESTBED_DESTROY_PEER
*/
struct GNUNET_MessageHeader header;
{
/**
- * Type is GNUNET_MESSAGE_TYPE_TESTBED_CONFIGURE_UNDERLAY_LINK
+ * Type is #GNUNET_MESSAGE_TYPE_TESTBED_CONFIGURE_UNDERLAY_LINK
*/
struct GNUNET_MessageHeader header;
{
/**
- * Type is GNUNET_MESSAGE_TYPE_TESTBED_OVERLAY_CONNECT
+ * Type is #GNUNET_MESSAGE_TYPE_TESTBED_OVERLAY_CONNECT
*/
struct GNUNET_MessageHeader header;
struct GNUNET_TESTBED_RemoteOverlayConnectMessage
{
/**
- * Type is GNUNET_MESSAGE_TYPE_TESTBED_REMOTE_OVERLAY_CONNECT
+ * Type is #GNUNET_MESSAGE_TYPE_TESTBED_REMOTE_OVERLAY_CONNECT
*/
struct GNUNET_MessageHeader header;
* To be followed by the HELLO message of A
*/
struct GNUNET_MessageHeader hello[0];
+ // FIXME: we usually do not use this gcc-hack as some
+ // compilers / tools really get messed up by it...
};
{
/**
- * Type is GNUNET_MESSAGE_TYPE_TESTBED_PEER_EVENT
+ * Type is #GNUNET_MESSAGE_TYPE_TESTBED_PEER_EVENT
*/
struct GNUNET_MessageHeader header;
/**
- * 'enum GNUNET_TESTBED_EventType' (in NBO);
- * either GNUNET_TESTBED_ET_PEER_START or GNUNET_TESTBED_ET_PEER_STOP.
+ * `enum GNUNET_TESTBED_EventType` (in NBO);
+ * either #GNUNET_TESTBED_ET_PEER_START or #GNUNET_TESTBED_ET_PEER_STOP.
*/
int32_t event_type GNUNET_PACKED;
{
/**
- * Type is GNUNET_MESSAGE_TYPE_TESTBED_PEER_INFORMATION
+ * Type is #GNUNET_MESSAGE_TYPE_TESTBED_PEER_INFORMATION
*/
struct GNUNET_MessageHeader header;
/**
- * Reply to GNUNET_MESSAGE_TYPE_TESTBED_GET_SLAVE_CONFIG message
+ * Reply to #GNUNET_MESSAGE_TYPE_TESTBED_GET_SLAVE_CONFIG message
*/
struct GNUNET_TESTBED_SlaveConfiguration
{
* set this to 1 to start the service; 0 to stop the service
*/
uint8_t start;
-
+
/**
* The NULL-terminated name of the service to start/stop follows here
*/
};
+/**************************************/
+/* Barriers IPC messages and protocol */
+/**************************************/
+
+
+/**
+ * The environmental variable which when available refers to the configuration
+ * file the local testbed controller is using
+ */
+#define ENV_TESTBED_CONFIG "GNUNET_TESTBED_CONTROLLER_CONFIG"
+
+
/**
* Message to initialise a barrier
*/
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];
};
/**
* Message for signalling status changes of a barrier
*/
-struct GNUNET_TESTBED_BarrierStatus
+struct GNUNET_TESTBED_BarrierStatusMsg
{
/**
* Type is GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_STATUS
*/
struct GNUNET_MessageHeader header;
-
+
/**
- * status. 0 to signal success (barrier is crossed). 1 for error.
+ * status. Use enumerated values of enum BarrierStatus
*/
- uint16_t status;
+ uint16_t status GNUNET_PACKED;
/**
* strlen of the barrier name
*/
- uint16_t name_len;
-
+ uint16_t name_len GNUNET_PACKED;
+
/**
* the barrier name (NULL terminated) concatenated with an error message (NULL
* terminated) if the status were to indicate an error