- verboser log, faster start

[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 13eb1d036a2a8b713d60b3b0cae4df04773c4524..8598cc177a8e068b940f4ac9810eb86d6b394210 100644 (file)
--- a/src/testbed/testbed_api_peers.h
+++ b/src/testbed/testbed_api_peers.h
@@ -130,17 +130,17 @@ struct PeerEventData
    * The handle of the peer to start
    */
   struct GNUNET_TESTBED_Peer *peer;
-  
+
   /**
    * The Peer churn callback to call when this operation is completed
    */
   GNUNET_TESTBED_PeerChurnCallback pcc;
-   
+
   /**
    * Closure for the above callback
    */
   void *pcc_cls;
-    
+
 };
 
 
@@ -172,7 +172,7 @@ struct PeerInfoData
    * The Peer info callback to call when this operation has completed
    */
   GNUNET_TESTBED_PeerInfoCallback cb;
-    
+
   /**
    * The closure for peer info callback
    */
@@ -205,7 +205,7 @@ struct OverlayConnectData
    * The operation completion callback to call once this operation is done
    */
   GNUNET_TESTBED_OperationCompletionCallback cb;
-  
+
   /**
    * The closure for the above callback
    */
@@ -219,31 +219,19 @@ struct OverlayConnectData
   struct OperationContext *sub_opc;
 
   /**
-   * State information for this context data
+   * The starting time of this operation
    */
-  enum OCDState {
-    
-    /**
-     * The initial state
-     */
-    OCD_INIT,
+  struct GNUNET_TIME_Absolute tstart;
 
-    /**
-     * State where we attempt to acquire peer2's controller's configuration
-     */
-    OCD_CFG_ACQUIRE,
+  /**
+   * Has this operation failed
+   */
+  int failed;
 
-    /**
-     * State where we link peer1's controller to peer2's controller
-     */
-    OCD_LINK_CONTROLLERS,
-    
-    /**
-     * State where we re-ask controller of peer1 to attempt an overlay connect
-     * between peer1 and peer2
-     */
-    OCD_REATTEMPT_OVERLAY_CONNECT
-  } state;
+  /**
+   * The timing slot index for this operation
+   */
+  unsigned int tslot_index;
 
 };