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 caa0a58be28e395eab66afeea8e0688fcf5866f3..16ea060777307c7f50dd93c687648f91b730fdf1 100644 (file)
--- a/src/testbed/testbed_api_services.c
+++ b/src/testbed/testbed_api_services.c
@@ -136,7 +136,6 @@ 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;
@@ -159,9 +158,7 @@ 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;
@@ -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 =