- simplify on-demand linking in overlay connects

[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 28978e10ef53353c203f7eaf9cf28c7aa649ccab..ea618d8a8869ad451d29df96fd8c507773206f4c 100644 (file)
--- a/src/testbed/testbed_api_services.c
+++ b/src/testbed/testbed_api_services.c
@@ -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
@@ -43,12 +43,11 @@ enum State
    * The configuration request has been sent
    */
   CFG_REQUEST_QUEUED,
-  
+
   /**
    * connected to service
    */
   SERVICE_CONNECTED
-
 };
 
 
@@ -145,27 +144,28 @@ configuration_receiver (void *cls, const struct GNUNET_MessageHeader *msg)
   mtype = ntohs (msg->type);
   emsg = NULL;
   info.type = GNUNET_TESTBED_ET_OPERATION_FINISHED;
-  info.details.operation_finished.operation = data->operation;
-  info.details.operation_finished.op_cls = data->op_cls;
-  if (GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONFAILEVENT == mtype)
+  info.op = data->operation;
+  info.op_cls = data->op_cls;
+  if (GNUNET_MESSAGE_TYPE_TESTBED_OPERATION_FAIL_EVENT == mtype)
   {
-    emsg = GNUNET_TESTBED_parse_error_string_ ((const struct
-                                                GNUNET_TESTBED_OperationFailureEventMessage
-                                                *) msg);
+    emsg =
+        GNUNET_TESTBED_parse_error_string_ ((const struct
+                                             GNUNET_TESTBED_OperationFailureEventMessage
+                                             *) msg);
     if (NULL == emsg)
       emsg = "Unknown error";
     info.details.operation_finished.emsg = emsg;
     info.details.operation_finished.generic = NULL;
     goto call_cb;
-  }  
-  data->cfg = GNUNET_TESTBED_get_config_from_peerinfo_msg_ (msg);
+  }
+  data->cfg = GNUNET_TESTBED_extract_config_ (msg);
   GNUNET_assert (NULL == data->op_result);
-  data->op_result = data->ca (data->cada_cls, data->cfg);  
+  data->op_result = data->ca (data->cada_cls, data->cfg);
   info.details.operation_finished.emsg = NULL;
   info.details.operation_finished.generic = data->op_result;
   data->state = SERVICE_CONNECTED;
-  
- call_cb:
+
+call_cb:
   if ((0 != (GNUNET_TESTBED_ET_OPERATION_FINISHED & c->event_mask)) &&
       (NULL != c->cc))
     c->cc (c->cc_cls, &info);
@@ -190,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 =
@@ -237,7 +237,7 @@ oprelease_service_connect (void *cls)
  * maintain connections with other systems.  The actual service
  * handle is then returned via the 'op_result' member in the event
  * callback.  The 'ca' callback is used to create the connection
- * when the time is right; the 'da' callback will be used to 
+ * when the time is right; the 'da' callback will be used to
  * destroy the connection (upon 'GNUNET_TESTBED_operation_done').
  * 'GNUNET_TESTBED_operation_cancel' can be used to abort this
  * operation until the event callback has been called.
@@ -253,14 +253,13 @@ oprelease_service_connect (void *cls)
  * @return handle for the operation
  */
 struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_service_connect (void *op_cls,
-                               struct GNUNET_TESTBED_Peer *peer,
-                               const char *service_name,
-                                GNUNET_TESTBED_ServiceConnectCompletionCallback cb,
-                                void *cb_cls,
-                               GNUNET_TESTBED_ConnectAdapter ca,
-                               GNUNET_TESTBED_DisconnectAdapter da,
-                               void *cada_cls)
+GNUNET_TESTBED_service_connect (void *op_cls, struct GNUNET_TESTBED_Peer *peer,
+                                const char *service_name,
+                                GNUNET_TESTBED_ServiceConnectCompletionCallback
+                                cb, void *cb_cls,
+                                GNUNET_TESTBED_ConnectAdapter ca,
+                                GNUNET_TESTBED_DisconnectAdapter da,
+                                void *cada_cls)
 {
   struct ServiceConnectData *data;
 
@@ -282,6 +281,7 @@ GNUNET_TESTBED_service_connect (void *op_cls,
   GNUNET_TESTBED_operation_queue_insert_ (peer->
                                           controller->opq_parallel_operations,
                                           data->operation);
+  GNUNET_TESTBED_operation_begin_wait_ (data->operation);
   return data->operation;
 }