- update default values, eliminate obsolete ones

[oweals/gnunet.git] / src / testbed / testbed_api_peers.h

diff --git a/src/testbed/testbed_api_peers.h b/src/testbed/testbed_api_peers.h
index 10deed67d35045d33ae84550ce36ab3e633a49a4..3e471a5546ce6faacc1cf0497b4495b95e849658 100644 (file)
--- a/src/testbed/testbed_api_peers.h
+++ b/src/testbed/testbed_api_peers.h
@@ -40,22 +40,22 @@ enum PeerState
     /**
      * State to signify that this peer is invalid
      */
-  PS_INVALID,
+  TESTBED_PS_INVALID,
 
     /**
      * The peer has been created
      */
-  PS_CREATED,
+  TESTBED_PS_CREATED,
 
     /**
      * The peer is running
      */
-  PS_STARTED,
+  TESTBED_PS_STARTED,
 
     /**
      * The peer is stopped
      */
-  PS_STOPPED,
+  TESTBED_PS_STOPPED,
 };
 
 
@@ -95,6 +95,11 @@ struct GNUNET_TESTBED_Peer
    * Peer's state
    */
   enum PeerState state;
+
+  /**
+   * Has an underlay model already set for this peer?
+   */
+  uint8_t underlay_model_exists;
 };
 
 
@@ -195,6 +200,28 @@ struct PeerInfoData
 };
 
 
+/**
+ * Data for the operations of type OP_PEER_RECONFIGURE
+ */
+struct PeerReconfigureData
+{
+  /**
+   * The peer whose information has been requested
+   */
+  struct GNUNET_TESTBED_Peer *peer;
+
+  /**
+   * The serialized new configuration template
+   */
+  char *config;
+
+  /**
+   * the size of the serialized configuration
+   */
+  uint16_t cfg_size;
+};
+
+
 /**
  * Data structure for OperationType OP_OVERLAY_CONNECT
  */
@@ -228,33 +255,18 @@ struct OverlayConnectData
    */
   struct OperationContext *sub_opc;
 
-  /**
-   * The starting time of this operation
-   */
-  struct GNUNET_TIME_Absolute tstart;
-
-  /**
-   * Has this operation failed
-   */
-  int failed;
-
-  /**
-   * The timing slot index for this operation
-   */
-  unsigned int tslot_index;
-
 };
 
 
 struct ManageServiceData {
   GNUNET_TESTBED_OperationCompletionCallback cb;
-  
+
   void *cb_cls;
-  
+
   struct GNUNET_TESTBED_Peer *peer;
 
   char *service_name;
-  
+
   unsigned int start;
 
   uint16_t msize;