-testbed message types

2 files changed, 120 insertions, 20 deletions

diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index b655f0896..b194cf6c4 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -1304,8 +1304,108 @@ extern "C"
  */
 #define GNUNET_MESSAGE_TYPE_LOCKMANAGER_SUCCESS 442
 
+/*******************************************************************************
+ * TESTBED message types
+ ******************************************************************************/
+
+/**
+ * Initial message from a client to a testing control service
+ */
+#define GNUNET_MESSAGE_TYPE_TESTBED_INIT 460
+
+/**
+ * Message to add host
+ */
+#define GNUNET_MESSAGE_TYPE_TESTBED_ADDHOST 461
+
+/**
+ * Message to signal that a add host succeeded
+ */
+#define GNUNET_MESSAGE_TYPE_TESTBED_ADDHOSTSUCCESS 462
+
+/**
+ * Message to configure a service to be shared among peers
+ */
+#define GNUNET_MESSAGE_TYPE_TESTBED_SERVICESHARE 463
+
+/**
+ * Message to link delegated controller to slave controller
+ */
+#define GNUNET_MESSAGE_TYPE_TESTBED_LCONTROLLERS 464
+
+/**
+ * Message to create a peer at a host
+ */
+#define GNUNET_MESSAGE_TYPE_TESTBED_CREATEPEER 465
+
+/**
+ * Message to reconfigure a peer
+ */
+#define GNUNET_MESSAGE_TYPE_TESTBED_PEERRECONF 466
+
+/**
+ * Message to start a peer at a host
+ */
+#define GNUNET_MESSAGE_TYPE_TESTBED_STARTPEER 467
+
+/**
+ * Message to stop a peer at a host
+ */
+#define GNUNET_MESSAGE_TYPE_TESTBED_STOPPEER 468
+
+/**
+ * Message to destroy a peer
+ */
+#define GNUNET_MESSAGE_TYPE_TESTBED_DESTROYPEER 469
+
+/**
+ * Configure underlay link message
+ */
+#define GNUNET_MESSAGE_TYPE_TESTBED_CONFIGULLINK 470
+
+/**
+ * Message to connect peers in a overlay
+ */
+#define GNUNET_MESSAGE_TYPE_TESTBED_OLCONNECT 471
+
+/**
+ * Message for peer events
+ */
+#define GNUNET_MESSAGE_TYPE_TESTBED_PEEREVENT 472
+
+/**
+ * Message for peer connect events
+ */
+#define GNUNET_MESSAGE_TYPE_TESTBED_PEERCONEVENT 473
+
+/**
+ * Message for operation events
+ */
+#define GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONEVENT 474
+
+/**
+ * Message to signal successful peer creation
+ */
+#define GNUNET_MESSAGE_TYPE_TESTBED_PEERCREATESUCCESS 475
+
+/**
+ * Message to signal a generic operation has been successful
+ */
+#define GNUNET_MESSAGE_TYPE_TESTBED_GENERICOPSUCCESS 476
+
+/**
+ * Message to get the configuration of a peer
+ */
+#define GNUNET_MESSAGE_TYPE_TESTBED_GETPEERCONFIG 477
+
+/**
+ * Message containing the peer configuration
+ */
+#define GNUNET_MESSAGE_TYPE_TESTBED_PEERCONFIG 478
+
+
 /**
- *  Next available: 450
+ *  Next available: 500
  */
 
 /*******************************************************************************
diff --git a/src/testbed/testbed.h b/src/testbed/testbed.h
index 8fd847bb2..703ca0308 100644
--- a/src/testbed/testbed.h
+++ b/src/testbed/testbed.h
@@ -37,7 +37,7 @@ struct GNUNET_TESTBED_Message
 {
 
   /**
-   * Type is 
+   * Type is GNUNET_MESSAGE_TYPE_TESTBED_INIT
    */
   struct GNUNET_MessageHeader header;
 
@@ -65,7 +65,7 @@ struct GNUNET_TESTBED_AddHostMessage
 {
 
   /**
-   * Type is 
+   * Type is GNUNET_MESSAGE_TYPE_TESTBED_ADDHOST
    */
   struct GNUNET_MessageHeader header;
 
@@ -101,7 +101,7 @@ struct GNUNET_TESTBED_HostConfirmedMessage
 {
 
   /**
-   * Type is 
+   * Type is GNUNET_MESSAGE_TYPE_TESTBED_ADDHOSTSUCCESS
    */
   struct GNUNET_MessageHeader header;
 
@@ -125,7 +125,7 @@ struct GNUNET_TESTBED_ConfigureSharedServiceMessage
 {
 
   /**
-   * Type is 
+   * Type is GNUNET_MESSAGE_TYPE_TESTBED_SERVICESHARE
    */
   struct GNUNET_MessageHeader header;
 
@@ -154,7 +154,7 @@ struct GNUNET_TESTBED_ControllerLinkMessage
 {
 
   /**
-   * Type is 
+   * Type is GNUNET_MESSAGE_TYPE_TESTBED_LCONTROLLERS
    */
   struct GNUNET_MessageHeader header;
 
@@ -188,7 +188,7 @@ struct GNUNET_TESTBED_PeerCreateMessage
 {
 
   /**
-   * Type is 
+   * Type is GNUNET_MESSAGE_TYPE_TESTBED_CREATEPEER
    */
   struct GNUNET_MessageHeader header;
 
@@ -216,7 +216,7 @@ struct GNUNET_TESTBED_PeerReconfigureMessage
 {
 
   /**
-   * Type is 
+   * Type is GNUNET_MESSAGE_TYPDE_TESTBED_PEERRECONF
    */
   struct GNUNET_MessageHeader header;
 
@@ -244,7 +244,7 @@ struct GNUNET_TESTBED_PeerStartMessage
 {
 
   /**
-   * Type is 
+   * Type is GNUNET_MESSAGE_TYPE_TESTBED_STARTPEER
    */
   struct GNUNET_MessageHeader header;
 
@@ -269,7 +269,7 @@ struct GNUNET_TESTBED_PeerStopMessage
 {
 
   /**
-   * Type is 
+   * Type is GNUNET_MESSAGE_TYPE_TESTBED_STOPPEER
    */
   struct GNUNET_MessageHeader header;
 
@@ -294,7 +294,7 @@ struct GNUNET_TESTBED_PeerDestroyMessage
 {
 
   /**
-   * Type is 
+   * Type is GNUNET_MESSAGE_TYPE_TESTBED_DESTROYPEER
    */
   struct GNUNET_MessageHeader header;
 
@@ -319,7 +319,7 @@ struct GNUNET_TESTBED_ConfigureUnderlayLinkMessage
 {
 
   /**
-   * Type is 
+   * Type is GNUNET_MESSAGE_TYPE_TESTBED_CONFIGULLINK
    */
   struct GNUNET_MessageHeader header;
 
@@ -356,7 +356,7 @@ struct GNUNET_TESTBED_OverlayConnectMessage
 {
 
   /**
-   * Type is 
+   * Type is GNUNET_MESSAGE_TYPE_TESTBED_OLCONNECT
    */
   struct GNUNET_MessageHeader header;
 
@@ -385,7 +385,7 @@ struct GNUNET_TESTBED_PeerEventMessage
 {
 
   /**
-   * Type is 
+   * Type is GNUNET_MESSAGE_TYPE_TESTBED_PEEREVENT
    */
   struct GNUNET_MessageHeader header;
 
@@ -420,7 +420,7 @@ struct GNUNET_TESTBED_ConnectionEventMessage
 {
 
   /**
-   * Type is 
+   * Type is GNUNET_MESSAGE_TYPE_TESTBED_PEERCONEVENT
    */
   struct GNUNET_MessageHeader header;
 
@@ -455,7 +455,7 @@ struct GNUNET_TESTBED_OperationFailureEventMessage
 {
 
   /**
-   * Type is 
+   * Type is GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONEVENT
    */
   struct GNUNET_MessageHeader header;
 
@@ -482,7 +482,7 @@ struct GNUNET_TESTBED_PeerCreateSuccessEventMessage
 {
 
   /**
-   * Type is 
+   * Type is GNUNET_MESSAGE_TYPE_TESTBED_PEERCREATESUCCESS
    */
   struct GNUNET_MessageHeader header;
 
@@ -508,7 +508,7 @@ struct GNUNET_TESTBED_GenericOperationSuccessEventMessage
 {
 
   /**
-   * Type is 
+   * Type is GNUNET_MESSAGE_TYPE_TESTBED_GENERICOPSUCCESS
    */
   struct GNUNET_MessageHeader header;
 
@@ -536,7 +536,7 @@ struct GNUNET_TESTBED_PeerGetConfigurationMessage
 {
 
   /**
-   * Type is 
+   * Type is GNUNET_MESSAGE_TYPE_TESTBED_GETPEERCONFIG
    */
   struct GNUNET_MessageHeader header;
 
@@ -561,7 +561,7 @@ struct GNUNET_TESTBED_PeerConfigurationInformationMessage
 {
 
   /**
-   * Type is 
+   * Type is GNUNET_MESSAGE_TYPE_TESTBED_PEERCONFIG
    */
   struct GNUNET_MessageHeader header;