5 files changed, 150 insertions, 10 deletions

diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c
index 42167a5cb..1a779c3c1 100644
--- a/src/testbed/testbed_api.c
+++ b/src/testbed/testbed_api.c
@@ -1160,6 +1160,7 @@ GNUNET_TESTBED_controller_connect (const struct GNUNET_CONFIGURATION_Handle *cfg
   struct GNUNET_TESTBED_InitMessage *msg;
   const char *controller_hostname;
   unsigned long long max_parallel_operations;
+  unsigned long long max_parallel_service_connections;
 
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_number (cfg, "testbed",
@@ -1169,6 +1170,14 @@ GNUNET_TESTBED_controller_connect (const struct GNUNET_CONFIGURATION_Handle *cfg
     GNUNET_break (0);
     return NULL;
   }
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_number (cfg, "testbed",
+                                             "MAX_PARALLEL_SERVICE_CONNECTIONS",
+                                             &max_parallel_service_connections))
+  {
+    GNUNET_break (0);
+    return NULL;
+  }
   controller = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Controller));
   controller->cc = cc;
   controller->cc_cls = cc_cls;
@@ -1201,6 +1210,9 @@ GNUNET_TESTBED_controller_connect (const struct GNUNET_CONFIGURATION_Handle *cfg
   controller->opq_parallel_operations =
     GNUNET_TESTBED_operation_queue_create_ ((unsigned int)
                                             max_parallel_operations);
+  controller->opq_parallel_service_connections =
+    GNUNET_TESTBED_operation_queue_create_ ((unsigned int)
+                                            max_parallel_service_connections);
   controller_hostname = GNUNET_TESTBED_host_get_hostname_ (host);
   if (NULL == controller_hostname)
     controller_hostname = "127.0.0.1";
diff --git a/src/testbed/testbed_api.h b/src/testbed/testbed_api.h
index 89e6800d7..09fb52569 100644
--- a/src/testbed/testbed_api.h
+++ b/src/testbed/testbed_api.h
@@ -27,6 +27,7 @@
 #ifndef TESTBED_API_H
 #define TESTBED_API_H
 
+#include "gnunet_testbed_service.h"
 
 /**
  * Enumeration of operations
@@ -73,6 +74,11 @@ enum OperationType
      */
     OP_LINK_CONTROLLERS,
 
+    /**
+     * Service connect operation
+     */
+    OP_SERVICE_CONNECT
+
   };
 
 
@@ -280,6 +286,11 @@ struct GNUNET_TESTBED_Controller
   struct OperationQueue *opq_parallel_operations;
 
   /**
+   * Operation queue for simultaneous service connections
+   */
+  struct OperationQueue *opq_parallel_service_connections;
+
+  /**
    * The operation id counter. use current value and increment
    */
   uint64_t operation_counter;
diff --git a/src/testbed/testbed_api_peers.c b/src/testbed/testbed_api_peers.c
index 25362df0d..9ef1829a7 100644
--- a/src/testbed/testbed_api_peers.c
+++ b/src/testbed/testbed_api_peers.c
@@ -223,6 +223,32 @@ oprelease_peer_stop (void *cls)
 
 
 /**
+ * Generate PeerGetConfigurationMessage
+ *
+ * @param peer_id the id of the peer whose information we have to get
+ * @param operation_id the ip of the operation that should be represented in
+ *          the message
+ * @param 
+ * @return the PeerGetConfigurationMessage
+ */
+struct GNUNET_TESTBED_PeerGetConfigurationMessage *
+GNUNET_TESTBED_generate_peergetconfig_msg_ (uint32_t peer_id,
+                                            uint64_t operation_id)
+{
+  struct GNUNET_TESTBED_PeerGetConfigurationMessage *msg;
+
+  msg = GNUNET_malloc (sizeof (struct
+                               GNUNET_TESTBED_PeerGetConfigurationMessage));
+  msg->header.size = htons
+    (sizeof (struct GNUNET_TESTBED_PeerGetConfigurationMessage));
+  msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_GETPEERCONFIG);
+  msg->peer_id = htonl (peer_id);
+  msg->operation_id = GNUNET_htonll (operation_id);
+  return msg;
+}
+
+
+/**
  * Function called when a peer get information operation is ready
  *
  * @param cls the closure from GNUNET_TESTBED_operation_create_()
@@ -237,13 +263,8 @@ opstart_peer_getinfo (void *cls)
   data = opc->data;
   GNUNET_assert (NULL != data);
   opc->state = OPC_STATE_STARTED;
-  msg = GNUNET_malloc (sizeof (struct
-                               GNUNET_TESTBED_PeerGetConfigurationMessage));
-  msg->header.size = htons
-    (sizeof (struct GNUNET_TESTBED_PeerGetConfigurationMessage));
-  msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_GETPEERCONFIG);
-  msg->peer_id = htonl (data->peer->unique_id);
-  msg->operation_id = GNUNET_htonll (opc->id);
+  msg = GNUNET_TESTBED_generate_peergetconfig_msg_ (data->peer->unique_id,
+                                                    opc->id);  
   GNUNET_CONTAINER_DLL_insert_tail (opc->c->ocq_head, opc->c->ocq_tail, opc);
   GNUNET_TESTBED_queue_message_ (opc->c, &msg->header);
 }
@@ -534,7 +555,7 @@ GNUNET_TESTBED_peer_get_information (struct GNUNET_TESTBED_Peer *peer,
   opc->type = OP_PEER_INFO;
   opc->id = opc->c->operation_counter++;
   opc->op = GNUNET_TESTBED_operation_create_ (opc, &opstart_peer_getinfo,
-                                             &oprelease_peer_getinfo);
+                                              &oprelease_peer_getinfo);
   GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_parallel_operations,
                                           opc->op);
   return opc->op;
diff --git a/src/testbed/testbed_api_peers.h b/src/testbed/testbed_api_peers.h
index 17db0d3b4..9256bf54f 100644
--- a/src/testbed/testbed_api_peers.h
+++ b/src/testbed/testbed_api_peers.h
@@ -239,6 +239,18 @@ GNUNET_TESTBED_peer_create_with_id_ (uint32_t unique_id,
                                      void *cls);
 
 
+/**
+ * Generate PeerGetConfigurationMessage
+ *
+ * @param peer_id the id of the peer whose information we have to get
+ * @param operation_id the ip of the operation that should be represented in
+ *          the message
+ * @param 
+ * @return the PeerGetConfigurationMessage
+ */
+struct GNUNET_TESTBED_PeerGetConfigurationMessage *
+GNUNET_TESTBED_generate_peergetconfig_msg_ (uint32_t peer_id,
+                                            uint64_t operation_id);
 
 #endif
 /* end of testbed_api_peers.h */
diff --git a/src/testbed/testbed_api_services.c b/src/testbed/testbed_api_services.c
index 34de0fd84..9fbb92797 100644
--- a/src/testbed/testbed_api_services.c
+++ b/src/testbed/testbed_api_services.c
@@ -24,7 +24,73 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
+#include "testbed_api.h"
 #include "testbed_api_peers.h"
+#include "testbed_api_operations.h"
+
+struct ServiceConnectData
+{
+  /**
+   * helper function callback to establish the connection
+   */
+  GNUNET_TESTBED_ConnectAdapter ca;
+
+  /**
+   * helper function callback to close the connection
+   */
+  GNUNET_TESTBED_DisconnectAdapter da;
+
+  /**
+   * Closure to the above callbacks
+   */
+  void *cada_cls;
+
+  /**
+   * Service name
+   */
+  char *service_name;
+  
+  /**
+   * Closure for operation event
+   */
+  void *op_cls;
+
+};
+
+
+/**
+ * Context information for forwarded operation used in service connect
+ */
+struct SCFOContext
+{
+  
+};
+
+
+
+/**
+ * Function called when a service connect operation is ready
+ *
+ * @param cls the closure from GNUNET_TESTBED_operation_create_()
+ */
+static void 
+opstart_service_connect (void *cls)
+{
+  GNUNET_break (0);
+}
+
+
+/**
+ * Callback which will be called when service connect type operation is
+ * released
+ *
+ * @param cls the closure from GNUNET_TESTBED_operation_create_()
+ */
+static void 
+oprelease_service_connect (void *cls)
+{
+  GNUNET_break (0); 
+}
 
 
 /**
@@ -54,8 +120,26 @@ GNUNET_TESTBED_service_connect (void *op_cls,
                                 GNUNET_TESTBED_DisconnectAdapter da,
                                 void *cada_cls)
 {
-  GNUNET_break (0);
-  return NULL;
+  struct OperationContext *opc;
+  struct ServiceConnectData *data;
+
+  data = GNUNET_malloc (sizeof (struct ServiceConnectData));
+  data->ca = ca;
+  data->da = da;
+  data->cada_cls = cada_cls;
+  data->op_cls = op_cls;  
+  opc = GNUNET_malloc (sizeof (struct OperationContext));
+  opc->data = data;
+  opc->c = peer->controller;
+  opc->id = peer->controller->operation_counter++;
+  opc->type = OP_SERVICE_CONNECT;
+  opc->op = GNUNET_TESTBED_operation_create_ (opc, &opstart_service_connect,
+                                              &oprelease_service_connect);
+  GNUNET_TESTBED_operation_queue_insert_
+    (opc->c->opq_parallel_service_connections, opc->op);
+  GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_parallel_operations,
+                                          opc->op);
+  return opc->op;
 }
 
 /* end of testbed_api_services.c */