-ensure stats queues do not grow too big

[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 50fb29bf6adc3e40712d7abff1fdc2df05adf133..3c8cf86884c9d4e19bb401e980c56101b2b188a2 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--2013 Christian Grothoff (and other contributing authors)
+      Copyright (C) 2008--2013 GNUnet e.V.
 
       GNUnet is free software; you can redistribute it and/or modify
       it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
       You should have received a copy of the GNU General Public License
       along with GNUnet; see the file COPYING.  If not, write to the
-      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-      Boston, MA 02111-1307, USA.
+      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+      Boston, MA 02110-1301, USA.
  */
 
 /**
@@ -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;
 };
 
 
@@ -250,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;