changed testbed API to include convenience callbacks

8 files changed, 241 insertions, 140 deletions

diff --git a/src/testbed/test_testbed_api.c b/src/testbed/test_testbed_api.c
index caa3d09fd..529072cee 100644
--- a/src/testbed/test_testbed_api.c
+++ b/src/testbed/test_testbed_api.c
@@ -207,6 +207,64 @@ dht_disconnect_adapter (void *cls, void *op_result)
 }
 
 
+/**
+ * Callback to be called when an operation is completed
+ *
+ * @param cls the callback closure from functions generating an operation
+ * @param op the operation that has been finished
+ * @param emsg error message in case the operation has failed; will be NULL if
+ *          operation has executed successfully.
+ */
+static void 
+op_comp_cb (void *cls, struct GNUNET_TESTBED_Operation *op, const char *emsg)
+{
+  switch (sub_test)
+  {
+  case PEER_SERVICE_CONNECT:
+    GNUNET_assert (operation == op);
+    GNUNET_assert (NULL == emsg);
+    GNUNET_assert (NULL == cls);
+    GNUNET_TESTBED_operation_done (operation);        /* This results in call to
+                                                         * disconnect adapter */
+    break;
+  default:
+    GNUNET_assert (0);
+  }
+}
+
+
+/**
+ * Callback to be called when the requested peer information is available
+ *
+ * @param cb_cls the closure from GNUNET_TETSBED_peer_get_information()
+ * @param op the operation this callback corresponds to
+ * @param pinfo the result; will be NULL if the operation has failed
+ * @param emsg error message if the operation has failed; will be NULL if the
+ *          operation is successfull
+ */
+static void 
+peerinfo_cb (void *cb_cls, struct GNUNET_TESTBED_Operation *op,
+             const struct GNUNET_TESTBED_PeerInformation *pinfo,
+             const char *emsg)
+{
+  switch (sub_test)
+  {
+  case PEER_GETCONFIG:
+    GNUNET_assert (NULL != pinfo);
+    GNUNET_assert (NULL == emsg);
+    GNUNET_assert (NULL == cb_cls);
+    GNUNET_assert (operation == op);
+    GNUNET_assert (GNUNET_TESTBED_PIT_CONFIGURATION == pinfo->pit);
+    GNUNET_assert (NULL != pinfo->result.cfg);
+    sub_test = PEER_DESTROY;
+    GNUNET_TESTBED_operation_done (operation);
+    operation = GNUNET_TESTBED_peer_destroy (peer);
+    break;
+  default:
+    GNUNET_assert (0);
+  }
+}
+
 
 /**
  * Signature of the event handler function called by the
@@ -223,25 +281,11 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
   case GNUNET_TESTBED_ET_OPERATION_FINISHED:
     switch (sub_test)
     {
-    case PEER_GETCONFIG:
-      GNUNET_assert (event->details.operation_finished.operation == operation);
-      GNUNET_assert (NULL == event->details.operation_finished.op_cls);
-      GNUNET_assert (NULL == event->details.operation_finished.emsg);
-      GNUNET_assert (GNUNET_TESTBED_PIT_CONFIGURATION ==
-                     event->details.operation_finished.pit);
-      GNUNET_assert (NULL != event->details.operation_finished.op_result.cfg);
-      sub_test = PEER_DESTROY;
-      GNUNET_TESTBED_operation_done (operation);
-      operation = GNUNET_TESTBED_peer_destroy (peer);
-      break;
     case PEER_DESTROY:
       GNUNET_assert (event->details.operation_finished.operation == operation);
       GNUNET_assert (NULL == event->details.operation_finished.op_cls);
       GNUNET_assert (NULL == event->details.operation_finished.emsg);
-      GNUNET_assert (GNUNET_TESTBED_PIT_GENERIC ==
-                     event->details.operation_finished.pit);
-      GNUNET_assert (NULL ==
-                     event->details.operation_finished.op_result.generic);
+      GNUNET_assert (NULL == event->details.operation_finished.generic);
       GNUNET_TESTBED_operation_done (operation);
       GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
       break;
@@ -249,15 +293,10 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
       GNUNET_assert (event->details.operation_finished.operation == operation);
       GNUNET_assert (NULL == event->details.operation_finished.op_cls);
       GNUNET_assert (NULL == event->details.operation_finished.emsg);
-      GNUNET_assert (GNUNET_TESTBED_PIT_GENERIC ==
-                     event->details.operation_finished.pit);
       GNUNET_assert (NULL != dht_handle);
-      GNUNET_assert (event->details.operation_finished.op_result.generic ==
-                     dht_handle);
-      GNUNET_TESTBED_operation_done (operation);        /* This results in call to
-                                                         * disconnect adapter */
+      GNUNET_assert (event->details.operation_finished.generic == dht_handle);     
       break;
-    case OTHER:
+    default:
       GNUNET_assert (0);
       break;
     }
@@ -268,8 +307,9 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
     GNUNET_assert (OTHER == sub_test);
     GNUNET_TESTBED_operation_done (operation);
     operation =
-        GNUNET_TESTBED_service_connect (NULL, peer, "dht", &dht_connect_adapter,
-                                        &dht_disconnect_adapter, NULL);
+        GNUNET_TESTBED_service_connect (NULL, peer, "dht", &op_comp_cb, NULL,
+                                        &dht_connect_adapter,
+                                        &dht_disconnect_adapter, NULL);
     GNUNET_assert (NULL != operation);
     break;
   case GNUNET_TESTBED_ET_PEER_STOP:
@@ -278,9 +318,10 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
     result = GNUNET_YES;
     sub_test = PEER_GETCONFIG;
     GNUNET_TESTBED_operation_done (operation);
-    operation =
-        GNUNET_TESTBED_peer_get_information (peer,
-                                             GNUNET_TESTBED_PIT_CONFIGURATION);
+    operation = 
+        GNUNET_TESTBED_peer_get_information (peer,
+                                             GNUNET_TESTBED_PIT_CONFIGURATION,
+                                             &peerinfo_cb, NULL);
     break;
   default:
     GNUNET_assert (0);          /* We should never reach this state */
diff --git a/src/testbed/test_testbed_api_2peers.c b/src/testbed/test_testbed_api_2peers.c
index e1445d961..63810187b 100644
--- a/src/testbed/test_testbed_api_2peers.c
+++ b/src/testbed/test_testbed_api_2peers.c
@@ -196,6 +196,30 @@ do_abort (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 /**
+ * Callback to be called when an operation is completed
+ *
+ * @param cls the callback closure from functions generating an operation
+ * @param op the operation that has been finished
+ * @param emsg error message in case the operation has failed; will be NULL if
+ *          operation has executed successfully.
+ */
+static void 
+op_comp_cb (void *cls, struct GNUNET_TESTBED_Operation *op, const char *emsg)
+{
+  GNUNET_assert (PEERS_STARTED == result);
+  GNUNET_assert (NULL == peer1.operation);
+  GNUNET_assert (NULL == peer2.operation);
+  GNUNET_assert (NULL != common_operation);
+  GNUNET_TESTBED_operation_done (common_operation);
+  common_operation = NULL;
+  result = PEERS_CONNECTED;
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Peers connected\n");
+  peer1.operation = GNUNET_TESTBED_peer_stop (peer1.peer);
+  peer2.operation = GNUNET_TESTBED_peer_stop (peer2.peer);
+}
+
+
+/**
  * Signature of the event handler function called by the
  * respective event controller.
  *
@@ -211,9 +235,7 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
     GNUNET_assert (PEERS_STOPPED == result);
     GNUNET_assert (NULL == event->details.operation_finished.op_cls);
     GNUNET_assert (NULL == event->details.operation_finished.emsg);
-    GNUNET_assert (GNUNET_TESTBED_PIT_GENERIC ==
-                   event->details.operation_finished.pit);
-    GNUNET_assert (NULL == event->details.operation_finished.op_result.generic);
+    GNUNET_assert (NULL == event->details.operation_finished.generic);
     if (event->details.operation_finished.operation == peer1.operation)
     {
       GNUNET_TESTBED_operation_done (peer1.operation);
@@ -255,7 +277,8 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
     {
       result = PEERS_STARTED;
       common_operation =
-          GNUNET_TESTBED_overlay_connect (NULL, peer1.peer, peer2.peer);
+          GNUNET_TESTBED_overlay_connect (NULL, &op_comp_cb, NULL, peer1.peer,
+                                          peer2.peer);
     }
     break;
   case GNUNET_TESTBED_ET_PEER_STOP:
@@ -284,12 +307,6 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
     GNUNET_assert (NULL != common_operation);
     GNUNET_assert ((event->details.peer_connect.peer1 == peer1.peer) &&
                    (event->details.peer_connect.peer2 == peer2.peer));
-    GNUNET_TESTBED_operation_done (common_operation);
-    common_operation = NULL;
-    result = PEERS_CONNECTED;
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "Peers connected\n");
-    peer1.operation = GNUNET_TESTBED_peer_stop (peer1.peer);
-    peer2.operation = GNUNET_TESTBED_peer_stop (peer2.peer);
     break;
   default:
     GNUNET_assert (0);
diff --git a/src/testbed/test_testbed_api_controllerlink.c b/src/testbed/test_testbed_api_controllerlink.c
index b10e454de..ee62bf1aa 100644
--- a/src/testbed/test_testbed_api_controllerlink.c
+++ b/src/testbed/test_testbed_api_controllerlink.c
@@ -305,9 +305,7 @@ check_operation_success (const struct GNUNET_TESTBED_EventInformation *event)
   GNUNET_assert (event->details.operation_finished.operation == op);
   GNUNET_assert (NULL == event->details.operation_finished.op_cls);
   GNUNET_assert (NULL == event->details.operation_finished.emsg);
-  GNUNET_assert (GNUNET_TESTBED_PIT_GENERIC ==
-                 event->details.operation_finished.pit);
-  GNUNET_assert (NULL == event->details.operation_finished.op_result.generic);
+  GNUNET_assert (NULL == event->details.operation_finished.generic);
 }
 
 
diff --git a/src/testbed/test_testbed_api_test.c b/src/testbed/test_testbed_api_test.c
index 43a5628ad..f552d1a78 100644
--- a/src/testbed/test_testbed_api_test.c
+++ b/src/testbed/test_testbed_api_test.c
@@ -63,6 +63,52 @@ do_shutdown (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 /**
+ * Callback to be called when the requested peer information is available
+ *
+ * @param cb_cls the closure from GNUNET_TETSBED_peer_get_information()
+ * @param op the operation this callback corresponds to
+ * @param pinfo the result; will be NULL if the operation has failed
+ * @param emsg error message if the operation has failed; will be NULL if the
+ *          operation is successfull
+ */
+static void 
+peerinfo_cb (void *cb_cls, struct GNUNET_TESTBED_Operation *op_,
+             const struct GNUNET_TESTBED_PeerInformation *pinfo,
+             const char *emsg)
+{
+  GNUNET_assert (op == op_);
+  GNUNET_assert (NULL == cb_cls);
+  GNUNET_assert (NULL == emsg);
+  GNUNET_assert (GNUNET_TESTBED_PIT_IDENTITY == pinfo->pit);
+  GNUNET_assert (NULL != pinfo->result.id);
+  GNUNET_TESTBED_operation_done (op);
+  result = GNUNET_OK;
+  GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+}
+
+
+/**
+ * Callback to be called when an operation is completed
+ *
+ * @param cls the callback closure from functions generating an operation
+ * @param op the operation that has been finished
+ * @param emsg error message in case the operation has failed; will be NULL if
+ *          operation has executed successfully.
+ */
+static void 
+op_comp_cb (void *cls, struct GNUNET_TESTBED_Operation *op_, const char *emsg)
+{
+  GNUNET_assert (NULL == cls);
+  GNUNET_assert (op == op_);
+  GNUNET_assert (NULL == emsg);
+  GNUNET_TESTBED_operation_done (op);
+  op = GNUNET_TESTBED_peer_get_information (peers[0],
+                                            GNUNET_TESTBED_PIT_IDENTITY,
+                                            &peerinfo_cb, NULL);
+}
+
+
+/**
  * Controller event callback
  *
  * @param cls NULL
@@ -76,21 +122,7 @@ controller_event_cb (void *cls,
   {
   case GNUNET_TESTBED_ET_CONNECT:
     GNUNET_assert (event->details.peer_connect.peer1 == peers[0]);
-    GNUNET_assert (event->details.peer_connect.peer2 == peers[1]);
-    GNUNET_TESTBED_operation_done (op);
-    op = GNUNET_TESTBED_peer_get_information (peers[0],
-                                              GNUNET_TESTBED_PIT_IDENTITY);
-    break;
-  case GNUNET_TESTBED_ET_OPERATION_FINISHED:
-    GNUNET_assert (event->details.operation_finished.operation == op);
-    GNUNET_assert (NULL == event->details.operation_finished.op_cls);
-    GNUNET_assert (NULL == event->details.operation_finished.emsg);
-    GNUNET_assert (GNUNET_TESTBED_PIT_IDENTITY ==
-                   event->details.operation_finished.pit);
-    GNUNET_assert (NULL != event->details.operation_finished.op_result.pid);
-    GNUNET_TESTBED_operation_done (op);
-    result = GNUNET_OK;
-    GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+    GNUNET_assert (event->details.peer_connect.peer2 == peers[1]);    
     break;
   default:
     GNUNET_assert (0);
@@ -117,7 +149,7 @@ test_master (void *cls, unsigned int num_peers,
   for (peer = 0; peer < num_peers; peer++)
     GNUNET_assert (NULL != peers_[peer]);
   peers = peers_;
-  op = GNUNET_TESTBED_overlay_connect (NULL, peers[0], peers[1]);  
+  op = GNUNET_TESTBED_overlay_connect (NULL, &op_comp_cb, NULL, peers[0], peers[1]);
 }
 
 
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c
index 48c55e470..665c19486 100644
--- a/src/testbed/testbed_api.c
+++ b/src/testbed/testbed_api.c
@@ -322,8 +322,7 @@ handle_opsuccess (struct GNUNET_TESTBED_Controller *c,
     event->details.operation_finished.operation = opc->op;
     event->details.operation_finished.op_cls = NULL;
     event->details.operation_finished.emsg = NULL;
-    event->details.operation_finished.pit = GNUNET_TESTBED_PIT_GENERIC;
-    event->details.operation_finished.op_result.generic = NULL;
+    event->details.operation_finished.generic = NULL;
   }
   GNUNET_CONTAINER_DLL_remove (opc->c->ocq_head, opc->c->ocq_tail, opc);
   opc->state = OPC_STATE_FINISHED;
@@ -480,6 +479,8 @@ handle_peer_conevent (struct GNUNET_TESTBED_Controller *c,
 {
   struct OperationContext *opc;
   struct OverlayConnectData *data;
+  GNUNET_TESTBED_OperationCompletionCallback cb;
+  void *cb_cls;
   struct GNUNET_TESTBED_EventInformation event;
   uint64_t op_id;
 
@@ -507,6 +508,8 @@ handle_peer_conevent (struct GNUNET_TESTBED_Controller *c,
     GNUNET_assert (0);          /* Should never reach here */
     break;
   }
+  cb = data->cb;
+  cb_cls = data->cb_cls;
   GNUNET_CONTAINER_DLL_remove (opc->c->ocq_head, opc->c->ocq_tail, opc);
   opc->state = OPC_STATE_FINISHED;
   GNUNET_free (data);
@@ -517,6 +520,8 @@ handle_peer_conevent (struct GNUNET_TESTBED_Controller *c,
     if (NULL != c->cc)
       c->cc (c->cc_cls, &event);
   }
+  if (NULL != cb)
+    cb (cb_cls, opc->op, NULL);
   return GNUNET_YES;
 }
 
@@ -538,8 +543,9 @@ handle_peer_config (struct GNUNET_TESTBED_Controller *c,
   struct OperationContext *opc;
   struct GNUNET_TESTBED_Peer *peer;
   struct PeerInfoData *data;
-  struct PeerInfoData2 *response_data;
-  struct GNUNET_TESTBED_EventInformation info;
+  struct GNUNET_TESTBED_PeerInformation *pinfo;
+  GNUNET_TESTBED_PeerInfoCallback cb;
+  void *cb_cls;
   uint64_t op_id;
 
   op_id = GNUNET_ntohll (msg->operation_id);
@@ -565,52 +571,32 @@ handle_peer_config (struct GNUNET_TESTBED_Controller *c,
   peer = data->peer;
   GNUNET_assert (NULL != peer);
   GNUNET_assert (ntohl (msg->peer_id) == peer->unique_id);
-  if (0 == (c->event_mask & (1L << GNUNET_TESTBED_ET_OPERATION_FINISHED)))
-  {
-    LOG_DEBUG ("Skipping operation callback as flag not set\n");
-    return GNUNET_YES;
-  }
-  response_data = GNUNET_malloc (sizeof (struct PeerInfoData2));
-  response_data->pit = data->pit;
+  pinfo = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_PeerInformation));
+  pinfo->pit = data->pit;
+  cb = data->cb;
+  cb_cls = data->cb_cls;
   GNUNET_free (data);
   opc->data = NULL;
-  info.type = GNUNET_TESTBED_ET_OPERATION_FINISHED;
-  info.details.operation_finished.operation = opc->op;
-  info.details.operation_finished.op_cls = NULL;
-  info.details.operation_finished.emsg = NULL;
-  info.details.operation_finished.pit = response_data->pit;
-  switch (response_data->pit)
+  switch (pinfo->pit)
   {
   case GNUNET_TESTBED_PIT_IDENTITY:
-  {
-    struct GNUNET_PeerIdentity *peer_identity;
-
-    peer_identity = GNUNET_malloc (sizeof (struct GNUNET_PeerIdentity));
-    (void) memcpy (peer_identity, &msg->peer_identity,
-                   sizeof (struct GNUNET_PeerIdentity));
-    response_data->details.peer_identity = peer_identity;
-    info.details.operation_finished.op_result.pid = peer_identity;
-  }
+    pinfo->result.id = GNUNET_malloc (sizeof (struct GNUNET_PeerIdentity));
+    (void) memcpy (pinfo->result.id, &msg->peer_identity,
+                   sizeof (struct GNUNET_PeerIdentity));
     break;
   case GNUNET_TESTBED_PIT_CONFIGURATION:
-    response_data->details.cfg =        /* Freed in oprelease_peer_getinfo */
-        GNUNET_TESTBED_get_config_from_peerinfo_msg_ (msg);
-    info.details.operation_finished.op_result.cfg = response_data->details.cfg;
+    pinfo->result.cfg =        /* Freed in oprelease_peer_getinfo */
+        GNUNET_TESTBED_get_config_from_peerinfo_msg_ (msg);    
     break;
   case GNUNET_TESTBED_PIT_GENERIC:
     GNUNET_assert (0);          /* never reach here */
     break;
   }
-  opc->data = response_data;
+  opc->data = pinfo;
   GNUNET_CONTAINER_DLL_remove (opc->c->ocq_head, opc->c->ocq_tail, opc);
   opc->state = OPC_STATE_FINISHED;
-  if (0 !=
-      ((GNUNET_TESTBED_ET_CONNECT | GNUNET_TESTBED_ET_DISCONNECT) &
-       c->event_mask))
-  {
-    if (NULL != c->cc)
-      c->cc (c->cc_cls, &info);
-  }
+  if (NULL != cb)
+    cb (cb_cls, opc->op, pinfo, NULL);
   return GNUNET_YES;
 }
 
@@ -676,8 +662,7 @@ handle_op_fail_event (struct GNUNET_TESTBED_Controller *c,
     event.details.operation_finished.operation = opc->op;
     event.details.operation_finished.op_cls = NULL;
     event.details.operation_finished.emsg = emsg;
-    event.details.operation_finished.pit = GNUNET_TESTBED_PIT_GENERIC;
-    event.details.operation_finished.op_result.generic = NULL;
+    event.details.operation_finished.generic = NULL;
     c->cc (c->cc_cls, &event);
   }
   return GNUNET_YES;
diff --git a/src/testbed/testbed_api_peers.c b/src/testbed/testbed_api_peers.c
index 9ced75973..9465c66bb 100644
--- a/src/testbed/testbed_api_peers.c
+++ b/src/testbed/testbed_api_peers.c
@@ -279,7 +279,7 @@ static void
 oprelease_peer_getinfo (void *cls)
 {
   struct OperationContext *opc = cls;
-  struct PeerInfoData2 *data;
+  struct GNUNET_TESTBED_PeerInformation *data;
 
   if (OPC_STATE_FINISHED != opc->state)
   {
@@ -293,10 +293,10 @@ oprelease_peer_getinfo (void *cls)
     switch (data->pit)
     {
     case GNUNET_TESTBED_PIT_CONFIGURATION:
-      GNUNET_CONFIGURATION_destroy (data->details.cfg);
+      GNUNET_CONFIGURATION_destroy (data->result.cfg);
       break;
     case GNUNET_TESTBED_PIT_IDENTITY:
-      GNUNET_free (data->details.peer_identity);
+      GNUNET_free (data->result.id);
       break;
     default:
       GNUNET_assert (0);        /* We should never reach here */
@@ -532,16 +532,23 @@ GNUNET_TESTBED_peer_stop (struct GNUNET_TESTBED_Peer *peer)
 
 
 /**
- * Request information about a peer.
+ * Request information about a peer. The controller callback will be called with
+ * event type GNUNET_TESTBED_ET_OPERATION_FINISHED when result for this
+ * operation is available
  *
  * @param peer peer to request information about
  * @param pit desired information
+ * @param cb the convenience callback to be called when results for this
+ *          operation are available
+ * @param cb_cls the closure for the above callback
  * @return handle to the operation
  */
 struct GNUNET_TESTBED_Operation *
 GNUNET_TESTBED_peer_get_information (struct GNUNET_TESTBED_Peer *peer,
-                                     enum GNUNET_TESTBED_PeerInformationType
-                                     pit)
+                                     enum GNUNET_TESTBED_PeerInformationType
+                                     pit,
+                                     GNUNET_TESTBED_PeerInfoCallback cb,
+                                     void *cb_cls)
 {
   struct OperationContext *opc;
   struct PeerInfoData *data;
@@ -550,6 +557,8 @@ GNUNET_TESTBED_peer_get_information (struct GNUNET_TESTBED_Peer *peer,
   data = GNUNET_malloc (sizeof (struct PeerInfoData));
   data->peer = peer;
   data->pit = pit;
+  data->cb = cb;
+  data->cb_cls = cb_cls;
   opc = GNUNET_malloc (sizeof (struct OperationContext));
   opc->c = peer->controller;
   opc->data = data;
@@ -635,13 +644,14 @@ GNUNET_TESTBED_underlay_configure_link (void *op_cls,
 }
 
 
-
 /**
  * Both peers must have been started before calling this function.
  * This function then obtains a HELLO from 'p1', gives it to 'p2'
  * and asks 'p2' to connect to 'p1'.
  *
  * @param op_cls closure argument to give with the operation event
+ * @param cb the callback to call when this operation has finished
+ * @param cb_cls the closure for the above callback
  * @param p1 first peer
  * @param p2 second peer
  * @return handle to the operation, NULL if connecting these two
@@ -649,8 +659,11 @@ GNUNET_TESTBED_underlay_configure_link (void *op_cls,
  *         not running or underlay disallows)
  */
 struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_overlay_connect (void *op_cls, struct GNUNET_TESTBED_Peer *p1,
-                                struct GNUNET_TESTBED_Peer *p2)
+GNUNET_TESTBED_overlay_connect (void *op_cls,
+                                GNUNET_TESTBED_OperationCompletionCallback cb,
+                                void *cb_cls,
+                                struct GNUNET_TESTBED_Peer *p1,
+                                struct GNUNET_TESTBED_Peer *p2)
 {
   struct OperationContext *opc;
   struct OverlayConnectData *data;
@@ -660,6 +673,8 @@ GNUNET_TESTBED_overlay_connect (void *op_cls, struct GNUNET_TESTBED_Peer *p1,
   data = GNUNET_malloc (sizeof (struct OverlayConnectData));
   data->p1 = p1;
   data->p2 = p2;
+  data->cb = cb;
+  data->cb_cls = cb_cls;
   opc = GNUNET_malloc (sizeof (struct OperationContext));
   opc->data = data;
   opc->c = p1->controller;
diff --git a/src/testbed/testbed_api_peers.h b/src/testbed/testbed_api_peers.h
index 21cae976b..16c4ea42f 100644
--- a/src/testbed/testbed_api_peers.h
+++ b/src/testbed/testbed_api_peers.h
@@ -146,37 +146,19 @@ struct PeerInfoData
   struct GNUNET_TESTBED_Peer *peer;
 
   /**
-   * The type of peer information requested
+   * The Peer info callback to call when this operation has completed
    */
-  enum GNUNET_TESTBED_PeerInformationType pit;
-};
-
-
-/**
- * Data for the OperationType OP_PEER_INFO
- */
-struct PeerInfoData2
-{
+  GNUNET_TESTBED_PeerInfoCallback cb;
+    
   /**
-   * The type of peer information requested
+   * The closure for peer info callback
    */
-  enum GNUNET_TESTBED_PeerInformationType pit;
+  void *cb_cls;
 
   /**
-   * The data from reply
+   * The type of peer information requested
    */
-  union
-  {
-    /**
-     * Configuration handle
-     */
-    struct GNUNET_CONFIGURATION_Handle *cfg;
-
-    /**
-     * Peer Identity
-     */
-    struct GNUNET_PeerIdentity *peer_identity;
-  } details;
+  enum GNUNET_TESTBED_PeerInformationType pit;
 };
 
 
@@ -195,6 +177,16 @@ struct OverlayConnectData
    */
   struct GNUNET_TESTBED_Peer *p2;
 
+  /**
+   * The operation completion callback to call once this operation is done
+   */
+  GNUNET_TESTBED_OperationCompletionCallback cb;
+  
+  /**
+   * The closure for the above callback
+   */
+  void *cb_cls;
+
 };
 
 
diff --git a/src/testbed/testbed_api_services.c b/src/testbed/testbed_api_services.c
index f37ada310..3e8484022 100644
--- a/src/testbed/testbed_api_services.c
+++ b/src/testbed/testbed_api_services.c
@@ -49,9 +49,6 @@ enum State
      */
   SERVICE_CONNECTED,
 
-    /**
-     *
-     */
 };
 
 
@@ -111,6 +108,16 @@ struct ServiceConnectData
   void *op_result;
 
   /**
+   * The operation completion callback
+   */
+  GNUNET_TESTBED_OperationCompletionCallback cb;
+
+  /**
+   * The closure for operation completion callback
+   */
+  void *cb_cls;
+
+  /**
    * State information
    */
   enum State state;
@@ -132,7 +139,13 @@ configuration_receiver (void *cls, const struct GNUNET_MessageHeader *msg)
   const struct GNUNET_TESTBED_PeerConfigurationInformationMessage *imsg;
   struct GNUNET_TESTBED_Controller *c;
   struct GNUNET_TESTBED_EventInformation info;
+  uint16_t mtype;
 
+  mtype = ntohs (msg->type);
+  if (GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONEVENT == mtype)
+  {
+    GNUNET_assert (0);          /* FIXME: Add notification for failure */
+  }
   imsg =
       (const struct GNUNET_TESTBED_PeerConfigurationInformationMessage *) msg;
   data->cfg = GNUNET_TESTBED_get_config_from_peerinfo_msg_ (imsg);
@@ -141,13 +154,14 @@ configuration_receiver (void *cls, const struct GNUNET_MessageHeader *msg)
   info.details.operation_finished.operation = data->operation;
   info.details.operation_finished.op_cls = data->op_cls;
   info.details.operation_finished.emsg = NULL;
-  info.details.operation_finished.pit = GNUNET_TESTBED_PIT_GENERIC;
-  info.details.operation_finished.op_result.generic = data->op_result;
+  info.details.operation_finished.generic = data->op_result;
   c = data->peer->controller;
   data->state = SERVICE_CONNECTED;
   if ((0 != (GNUNET_TESTBED_ET_OPERATION_FINISHED & c->event_mask)) &&
       (NULL != c->cc))
     c->cc (c->cc_cls, &info);
+  if (NULL != data->cb)
+    data->cb (data->cb_cls, data->operation, NULL);
 }
 
 
@@ -214,7 +228,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.
@@ -222,17 +236,22 @@ oprelease_service_connect (void *cls)
  * @param op_cls closure to pass in operation event
  * @param peer peer that runs the service
  * @param service_name name of the service to connect to
+ * @param cb the callback to call when this operation finishes
+ * @param cb_cls closure for the above callback
  * @param ca helper function to establish the connection
  * @param da helper function to close the connection
  * @param cada_cls closure for ca and da
  * @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_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_OperationCompletionCallback cb,
+                                void *cb_cls,
+                                GNUNET_TESTBED_ConnectAdapter ca,
+                                GNUNET_TESTBED_DisconnectAdapter da,
+                                void *cada_cls)
 {
   struct ServiceConnectData *data;
 
@@ -243,6 +262,8 @@ GNUNET_TESTBED_service_connect (void *op_cls, struct GNUNET_TESTBED_Peer *peer,
   data->op_cls = op_cls;
   data->peer = peer;
   data->state = INIT;
+  data->cb = cb;
+  data->cb_cls = cb_cls;
   data->operation =
       GNUNET_TESTBED_operation_create_ (data, &opstart_service_connect,
                                         &oprelease_service_connect);