- unique constraint

[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..3e471a5546ce6faacc1cf0497b4495b95e849658 100644 (file)
--- a/src/testbed/testbed_api_peers.h
+++ b/src/testbed/testbed_api_peers.h
@@ -1,6 +1,6 @@
 /*
       This file is part of GNUnet
-      (C) 2008--2012 Christian Grothoff (and other contributing authors)
+      (C) 2008--2013 Christian Grothoff (and other contributing authors)
 
       GNUnet is free software; you can redistribute it and/or modify
       it under the terms of the GNU General Public License as published
@@ -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,
 };
 
 
@@ -65,6 +65,16 @@ enum PeerState
  */
 struct GNUNET_TESTBED_Peer
 {
+  /**
+   * peer list DLL
+   */
+  struct GNUNET_TESTBED_Peer *next;
+
+  /**
+   * peer list DLL
+   */
+  struct GNUNET_TESTBED_Peer *prev;
+
   /**
    * Our controller context (not necessarily the controller
    * that is responsible for starting/running the peer!).
@@ -85,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;
 };
 
 
@@ -130,17 +145,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 +187,7 @@ struct PeerInfoData
    * The Peer info callback to call when this operation has completed
    */
   GNUNET_TESTBED_PeerInfoCallback cb;
-    
+
   /**
    * The closure for peer info callback
    */
@@ -185,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
  */
@@ -205,7 +242,7 @@ struct OverlayConnectData
    * The operation completion callback to call once this operation is done
    */
   GNUNET_TESTBED_OperationCompletionCallback cb;
-  
+
   /**
    * The closure for the above callback
    */
@@ -218,32 +255,21 @@ struct OverlayConnectData
    */
   struct OperationContext *sub_opc;
 
-  /**
-   * State information for this context data
-   */
-  enum OCDState {
-    
-    /**
-     * The initial state
-     */
-    OCD_INIT,
+};
 
-    /**
-     * State where we attempt to acquire peer2's controller's configuration
-     */
-    OCD_CFG_ACQUIRE,
 
-    /**
-     * 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;
+struct ManageServiceData {
+  GNUNET_TESTBED_OperationCompletionCallback cb;
+
+  void *cb_cls;
+
+  struct GNUNET_TESTBED_Peer *peer;
+
+  char *service_name;
+
+  unsigned int start;
+
+  uint16_t msize;
 
 };
 
@@ -260,5 +286,30 @@ struct GNUNET_TESTBED_PeerGetConfigurationMessage *
 GNUNET_TESTBED_generate_peergetconfig_msg_ (uint32_t peer_id,
                                             uint64_t operation_id);
 
+
+/**
+ * Adds a peer to the peer list
+ *
+ * @param peer the peer to add to the peer list
+ */
+void
+GNUNET_TESTBED_peer_register_ (struct GNUNET_TESTBED_Peer *peer);
+
+
+/**
+ * Removes a peer from the peer list
+ *
+ * @param peer the peer to remove
+ */
+void
+GNUNET_TESTBED_peer_deregister_ (struct GNUNET_TESTBED_Peer *peer);
+
+
+/**
+ * Frees all peers
+ */
+void
+GNUNET_TESTBED_cleanup_peers_ (void);
+
 #endif
 /* end of testbed_api_peers.h */