-removing dead options

[oweals/gnunet.git] / src / experimentation / gnunet-daemon-experimentation.h

diff --git a/src/experimentation/gnunet-daemon-experimentation.h b/src/experimentation/gnunet-daemon-experimentation.h
index 181256b948d3ddd20782b2ff42415bc0b6575f3e..999c565ad35ed32a51b29a2541147d1be5d7044a 100644 (file)
--- a/src/experimentation/gnunet-daemon-experimentation.h
+++ b/src/experimentation/gnunet-daemon-experimentation.h
@@ -34,7 +34,7 @@
 /**
  * Timeout between request and expected response
  */
-#define EXP_RESPONSE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1)
+#define EXP_RESPONSE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
 
 /**
  * Default experiment frequency
@@ -66,7 +66,7 @@ extern uint32_t GSE_node_capabilities;
 
 extern uint32_t GSE_my_issuer_count;
 
-extern struct Experimentation_Request_Issuer *GSE_my_issuer;
+extern struct Experimentation_Issuer *GSE_my_issuer;
 
 /**
  * Capabilities a node has or an experiment requires
@@ -167,7 +167,7 @@ struct Node
        struct GNUNET_PeerIdentity *issuer_id;
 };
 
-struct Experimentation_Request_Issuer
+struct Experimentation_Issuer
 {
        struct GNUNET_PeerIdentity issuer_id;
 };
@@ -192,14 +192,22 @@ struct Experimentation_Request
 /**
  * Experimentation response message
  * Sent if peer is running the daemon
+ *
+ * This struct is followed by issuer identities:
+ * (issuer_count * struct Experimentation_Request_Issuer)
  */
 struct Experimentation_Response
 {
        struct GNUNET_MessageHeader msg;
 
        uint32_t capabilities;
+
+       uint32_t issuer_count;
 };
 
+void
+GNUNET_EXPERIMENT_nodes_request_start (struct Node *n, struct Experiment *e);
+
 
 /**
  * Start the nodes management
@@ -286,7 +294,7 @@ GNUNET_EXPERIMENTATION_experiments_stop ();
  * Start the scheduler component
  */
 void
-GNUNET_EXPERIMENTATION_scheduler_add (struct Experiment *e);
+GNUNET_EXPERIMENTATION_scheduler_add (struct Node *n, struct Experiment *e);
 
 /**
  * Start the scheduler component