clique topology

[oweals/gnunet.git] / src / testbed / testbed_api_services.c

diff --git a/src/testbed/testbed_api_services.c b/src/testbed/testbed_api_services.c
index 62bafb724558426a8061a66b7f7c252c9a22f775..16ea060777307c7f50dd93c687648f91b730fdf1 100644 (file)
--- a/src/testbed/testbed_api_services.c
+++ b/src/testbed/testbed_api_services.c
@@ -34,20 +34,20 @@
  */
 enum State
 {
-    /**
-     * Initial state
-     */
+  /**
+   * Initial state
+   */
   INIT,
 
-    /**
-     * The configuration request has been sent
-     */
+  /**
+   * The configuration request has been sent
+   */
   CFG_REQUEST_QUEUED,
-
-    /**
-     * connected to service
-     */
-  SERVICE_CONNECTED,
+  
+  /**
+   * connected to service
+   */
+  SERVICE_CONNECTED
 
 };
 
@@ -136,12 +136,12 @@ static void
 configuration_receiver (void *cls, const struct GNUNET_MessageHeader *msg)
 {
   struct ServiceConnectData *data = cls;
-  const struct GNUNET_TESTBED_PeerConfigurationInformationMessage *imsg;
   struct GNUNET_TESTBED_Controller *c;
   const char *emsg;
   struct GNUNET_TESTBED_EventInformation info;
   uint16_t mtype;
 
+  c = data->peer->controller;
   mtype = ntohs (msg->type);
   emsg = NULL;
   info.type = GNUNET_TESTBED_ET_OPERATION_FINISHED;
@@ -158,14 +158,11 @@ configuration_receiver (void *cls, const struct GNUNET_MessageHeader *msg)
     info.details.operation_finished.generic = NULL;
     goto call_cb;
   }  
-  imsg =
-      (const struct GNUNET_TESTBED_PeerConfigurationInformationMessage *) msg;
-  data->cfg = GNUNET_TESTBED_get_config_from_peerinfo_msg_ (imsg);
+  data->cfg = GNUNET_TESTBED_extract_config_ (msg);
   GNUNET_assert (NULL == data->op_result);
   data->op_result = data->ca (data->cada_cls, data->cfg);  
   info.details.operation_finished.emsg = NULL;
   info.details.operation_finished.generic = data->op_result;
-  c = data->peer->controller;
   data->state = SERVICE_CONNECTED;
   
  call_cb:
@@ -193,7 +190,7 @@ opstart_service_connect (void *cls)
   GNUNET_assert (NULL != data);
   GNUNET_assert (NULL != data->peer);
   c = data->peer->controller;
-  op_id = c->operation_counter++;
+  op_id = GNUNET_TESTBED_get_next_op_id (c);
   msg =
       GNUNET_TESTBED_generate_peergetconfig_msg_ (data->peer->unique_id, op_id);
   data->opc =