-minor edits

2 files changed, 70 insertions, 17 deletions

diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h
index ab8db8783..6b50efe97 100644
--- a/src/include/gnunet_testbed_service.h
+++ b/src/include/gnunet_testbed_service.h
@@ -58,12 +58,13 @@ struct GNUNET_TESTBED_Peer;
 struct GNUNET_TESTBED_Operation;
 
 /**
- * Handle to interact with a GNUnet testbed controller.  Each controller has at
- * least one master handle which is created when the controller is created; this
- * master handle interacts with the controller via stdin/stdout of the controller
- * process.  Additionally, controllers can interact with each other (in a P2P
- * fashion); those links are established via TCP/IP on the controller's service
- * port.
+ * Handle to interact with a GNUnet testbed controller.  Each
+ * controller has at least one master handle which is created when the
+ * controller is created; this master handle interacts with the
+ * controller process, destroying it destroys the controller (by
+ * closing stdin of the controller process).  Additionally,
+ * controllers can interact with each other (in a P2P fashion); those
+ * links are established via TCP/IP on the controller's service port.
  */
 struct GNUNET_TESTBED_Controller;
 
diff --git a/src/testbed/testbed.h b/src/testbed/testbed.h
index b7b10ffa6..8fd847bb2 100644
--- a/src/testbed/testbed.h
+++ b/src/testbed/testbed.h
@@ -42,10 +42,10 @@ struct GNUNET_TESTBED_Message
   struct GNUNET_MessageHeader header;
 
   /**
-   * Host ID that the controller is either given
-   * (if this is the dominating client communicating
-   * via stdin) or assumed to have (for peer-connections
-   * between controllers).
+   * Host ID that the controller is either given (if this is the
+   * dominating client) or assumed to have (for peer-connections
+   * between controllers).  A controller must check that all 
+   * connections make consistent claims...
    */
   uint32_t host_id GNUNET_PACKED;
 
@@ -496,13 +496,6 @@ struct GNUNET_TESTBED_PeerCreateSuccessEventMessage
    */
   uint64_t operation_id GNUNET_PACKED;
 
-  /**
-   * Identity of the peer.
-   */
-  struct GNUNET_PeerIdentity peer_id;
-
-  /* followed by gzip-compressed configuration of the peer */
-
 };
 
 
@@ -532,4 +525,63 @@ struct GNUNET_TESTBED_GenericOperationSuccessEventMessage
 
 };
 
+
+
+
+/**
+ * Message sent from client to testing service to 
+ * obtain the configuration of a peer.
+ */
+struct GNUNET_TESTBED_PeerGetConfigurationMessage
+{
+
+  /**
+   * Type is 
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * Unique ID for the peer.
+   */
+  uint32_t peer_id GNUNET_PACKED;
+
+  /**
+   * Operation ID that is used to identify this operation.
+   */
+  uint64_t operation_id GNUNET_PACKED;
+
+};
+
+
+
+/**
+ * Event notification from a controller to a client.
+ */
+struct GNUNET_TESTBED_PeerConfigurationInformationMessage
+{
+
+  /**
+   * Type is 
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * Peer identity of the peer that was created.
+   */
+  uint32_t peer_id GNUNET_PACKED;
+  
+  /**
+   * Operation ID of the operation that created this event.
+   */
+  uint64_t operation_id GNUNET_PACKED;
+
+  /**
+   * Identity of the peer.
+   */
+  struct GNUNET_PeerIdentity peer_id;
+
+  /* followed by gzip-compressed configuration of the peer */
+
+};
+
 #endif