- separate overlay connect message handling as module

1 files changed, 208 insertions, 230 deletions

diff --git a/src/testbed/gnunet-service-testbed.h b/src/testbed/gnunet-service-testbed.h
index 4fa137780..df7d7635c 100644
--- a/src/testbed/gnunet-service-testbed.h
+++ b/src/testbed/gnunet-service-testbed.h
@@ -306,214 +306,51 @@ struct Peer
 
 
 /**
- * Context information for transport try connect
- */
-struct TryConnectContext
-{
-  /**
-   * The identity of the peer to which the transport has to attempt a connection
-   */
-  struct GNUNET_PeerIdentity *pid;
-
-  /**
-   * The transport handle
-   */
-  struct GNUNET_TRANSPORT_Handle *th;
-
-  /**
-   * the try connect handle
-   */
-  struct GNUNET_TRANSPORT_TryConnectHandle *tch;
-
-  /**
-   * The task handle
-   */
-  GNUNET_SCHEDULER_TaskIdentifier task;
-
-  /**
-   * The id of the operation which is resposible for this context
-   */
-  uint64_t op_id;
-
-  /**
-   * The number of times we attempted to connect
-   */
-  unsigned int retries;
-
-};
-
-
-/**
- * Context information for connecting 2 peers in overlay
+ * The main context information associated with the client which started us
  */
-struct OverlayConnectContext
+struct Context
 {
   /**
-   * The next pointer for maintaining a DLL
-   */
-  struct OverlayConnectContext *next;
-
-  /**
-   * The prev pointer for maintaining a DLL
-   */
-  struct OverlayConnectContext *prev;
-  
-  /**
-   * The client which has requested for overlay connection
+   * The client handle associated with this context
    */
   struct GNUNET_SERVER_Client *client;
 
   /**
-   * the peer which has to connect to the other peer
-   */
-  struct Peer *peer;
-
-  /**
-   * Transport handle of the first peer to get its HELLO
-   */
-  struct GNUNET_TRANSPORT_Handle *p1th;
-
-  /**
-   * Core handles of the first peer; used to notify when second peer connects to it
-   */
-  struct GNUNET_CORE_Handle *ch;
-
-  /**
-   * HELLO of the other peer
-   */
-  struct GNUNET_MessageHeader *hello;
-
-  /**
-   * Get hello handle to acquire HELLO of first peer
-   */
-  struct GNUNET_TRANSPORT_GetHelloHandle *ghh;
-
-  /**
-   * The handle for offering HELLO
-   */
-  struct GNUNET_TRANSPORT_OfferHelloHandle *ohh;
-
-  /**
-   * The error message we send if this overlay connect operation has timed out
-   */
-  char *emsg;
-
-  /**
-   * Operation context for suboperations
-   */
-  struct OperationContext *opc;
-
-  /**
-   * Controller of peer 2; NULL if the peer is local
-   */
-  struct GNUNET_TESTBED_Controller *peer2_controller;
-
-  /**
-   * The transport try connect context
-   */
-  struct TryConnectContext tcc;
-
-  /**
-   * The peer identity of the first peer
-   */
-  struct GNUNET_PeerIdentity peer_identity;
-
-  /**
-   * The peer identity of the other peer
-   */
-  struct GNUNET_PeerIdentity other_peer_identity;
-
-  /**
-   * The id of the operation responsible for creating this context
-   */
-  uint64_t op_id;
-
-  /**
-   * The id of the task for sending HELLO of peer 2 to peer 1 and ask peer 1 to
-   * connect to peer 2
-   */
-  GNUNET_SCHEDULER_TaskIdentifier send_hello_task;
-
-  /**
-   * The id of the overlay connect timeout task
-   */
-  GNUNET_SCHEDULER_TaskIdentifier timeout_task;
-
-  /**
-   * The id of the cleanup task
+   * The network address of the master controller
    */
-  GNUNET_SCHEDULER_TaskIdentifier cleanup_task;
+  char *master_ip;
 
   /**
-   * The id of peer A
+   * The TESTING system handle for starting peers locally
    */
-  uint32_t peer_id;
-
+  struct GNUNET_TESTING_System *system;
+  
   /**
-   * The id of peer B
+   * Our host id according to this context
    */
-  uint32_t other_peer_id;
-
+  uint32_t host_id;
 };
 
 
 /**
- * Context information for RequestOverlayConnect
- * operations. RequestOverlayConnect is used when peers A, B reside on different
- * hosts and the host controller for peer B is asked by the host controller of
- * peer A to make peer B connect to peer A
+ * The structure for identifying a shared service
  */
-struct RequestOverlayConnectContext
+struct SharedService
 {
   /**
-   * the next pointer for DLL
-   */
-  struct RequestOverlayConnectContext *next;
-
-  /**
-   * the prev pointer for DLL
-   */
-  struct RequestOverlayConnectContext *prev;
-
-  /**
-   * The peer handle of peer B
-   */
-  struct Peer *peer;
-  
-  /**
-   * Peer A's HELLO
-   */
-  struct GNUNET_MessageHeader *hello;
-
-  /**
-   * The handle for offering HELLO
-   */
-  struct GNUNET_TRANSPORT_OfferHelloHandle *ohh;
-
-  /**
-   * The transport try connect context
+   * The name of the shared service
    */
-  struct TryConnectContext tcc;
+  char *name;
 
   /**
-   * The peer identity of peer A
+   * Number of shared peers per instance of the shared service
    */
-  struct GNUNET_PeerIdentity a_id;
+  uint32_t num_shared;
 
   /**
-   * Task for offering HELLO of A to B and doing try_connect
-   */
-  GNUNET_SCHEDULER_TaskIdentifier attempt_connect_task_id;
-  
-  /**
-   * Task to timeout RequestOverlayConnect
-   */
-  GNUNET_SCHEDULER_TaskIdentifier timeout_rocc_task_id;
-  
-  /**
-   * The id of the operation responsible for creating this context
+   * Number of peers currently sharing the service
    */
-  uint64_t op_id;
+  uint32_t num_sharing;
 };
 
 
@@ -561,55 +398,6 @@ struct ForwardedOverlayConnectContext
 
 
 /**
- * The main context information associated with the client which started us
- */
-struct Context
-{
-  /**
-   * The client handle associated with this context
-   */
-  struct GNUNET_SERVER_Client *client;
-
-  /**
-   * The network address of the master controller
-   */
-  char *master_ip;
-
-  /**
-   * The TESTING system handle for starting peers locally
-   */
-  struct GNUNET_TESTING_System *system;
-  
-  /**
-   * Our host id according to this context
-   */
-  uint32_t host_id;
-};
-
-
-/**
- * The structure for identifying a shared service
- */
-struct SharedService
-{
-  /**
-   * The name of the shared service
-   */
-  char *name;
-
-  /**
-   * Number of shared peers per instance of the shared service
-   */
-  uint32_t num_shared;
-
-  /**
-   * Number of peers currently sharing the service
-   */
-  uint32_t num_sharing;
-};
-
-
-/**
  * This context information will be created for each host that is registered at
  * slave controllers during overlay connects.
  */
@@ -782,6 +570,76 @@ struct LCFContextQueue
   struct LCFContextQueue *prev;
 };
 
+/**
+ * Our configuration
+ */
+struct GNUNET_CONFIGURATION_Handle *our_config;
+
+/**
+ * The master context; generated with the first INIT message
+ */
+extern struct Context *TESTBED_context;
+
+/**
+ * DLL head for forwarded operation contexts
+ */
+extern struct ForwardedOperationContext *fopcq_head;
+
+/**
+ * DLL tail for forwarded operation contexts
+ */
+extern struct ForwardedOperationContext *fopcq_tail;
+
+/**
+ * A list of peers we know about
+ */
+extern struct Peer **TESTBED_peer_list;
+
+/**
+ * Array of hosts
+ */
+extern struct GNUNET_TESTBED_Host **TESTBED_host_list;
+
+/**
+ * A list of directly linked neighbours
+ */
+extern struct Slave **TESTBED_slave_list;
+
+/**
+ * The size of the peer list
+ */
+extern unsigned int TESTBED_peer_list_size;
+
+/**
+ * The size of the host list
+ */
+extern unsigned int TESTBED_host_list_size;
+
+/**
+ * The size of directly linked neighbours list
+ */
+extern unsigned int TESTBED_slave_list_size;
+
+
+/**
+ * Queues a message in send queue for sending to the service
+ *
+ * @param client the client to whom the queued message has to be sent
+ * @param msg the message to queue
+ */
+void
+TESTBED_queue_message (struct GNUNET_SERVER_Client *client,
+                       struct GNUNET_MessageHeader *msg);
+
+
+/**
+ * Function to destroy a peer
+ *
+ * @param peer the peer structure to destroy
+ */
+void
+TESTBED_destroy_peer (struct Peer *peer);
+
 
 /**
  * Looks up in the hello cache and returns the HELLO of the given peer
@@ -820,5 +678,125 @@ void
 TESTBED_cache_clear ();
 
 
+/**
+ * Finds the route with directly connected host as destination through which
+ * the destination host can be reached
+ *
+ * @param host_id the id of the destination host
+ * @return the route with directly connected destination host; NULL if no route
+ *           is found
+ */
+struct Route *
+TESTBED_find_dest_route (uint32_t host_id);
+
+
+/**
+ * Handler for GNUNET_MESSAGE_TYPE_TESTBED_OLCONNECT messages
+ *
+ * @param cls NULL
+ * @param client identification of the client
+ * @param message the actual message
+ */
+void
+TESTBED_handle_overlay_connect (void *cls, struct GNUNET_SERVER_Client *client,
+                                const struct GNUNET_MessageHeader *message);
+
+
+/**
+ * Adds a host registration's request to a slave's registration queue
+ *
+ * @param slave the slave controller at which the given host has to be
+ *          registered 
+ * @param cb the host registration completion callback
+ * @param cb_cls the closure for the host registration completion callback
+ * @param host the host which has to be registered
+ */
+void
+TESTBED_queue_host_registration (struct Slave *slave,
+                                 GNUNET_TESTBED_HostRegistrationCompletion cb,
+                                 void *cb_cls,
+                                 struct GNUNET_TESTBED_Host *host);
+
+
+/**
+ * Callback to relay the reply msg of a forwarded operation back to the client
+ *
+ * @param cls ForwardedOperationContext
+ * @param msg the message to relay
+ */
+void
+TESTBED_forwarded_operation_reply_relay (void *cls,
+                                         const struct GNUNET_MessageHeader *msg);
+
+
+/**
+ * Task to free resources when forwarded operation has been timedout
+ *
+ * @param cls the ForwardedOperationContext
+ * @param tc the task context from scheduler
+ */
+void
+TESTBED_forwarded_operation_timeout (void *cls,
+                                     const struct GNUNET_SCHEDULER_TaskContext *tc);
+
+
+/**
+ * Send operation failure message to client
+ *
+ * @param client the client to which the failure message has to be sent to
+ * @param operation_id the id of the failed operation
+ * @param emsg the error message; can be NULL
+ */
+void
+TESTBED_send_operation_fail_msg (struct GNUNET_SERVER_Client *client,
+                                 uint64_t operation_id, const char *emsg);
+
+
+/**
+ * Handler for GNUNET_MESSAGE_TYPE_TESTBED_REQUESTCONNECT messages
+ *
+ * @param cls NULL
+ * @param client identification of the client
+ * @param message the actual message
+ */
+void
+TESTBED_handle_overlay_request_connect (void *cls,
+                                        struct GNUNET_SERVER_Client *client, 
+                                        const struct GNUNET_MessageHeader
+                                        *message);
+
+
+/**
+ * Processes a forwarded overlay connect context in the queue of the given RegisteredHostContext
+ *
+ * @param rhc the RegisteredHostContext
+ */
+void
+TESTBED_process_next_focc (struct RegisteredHostContext *rhc);
+
+
+/**
+ * Cleans up ForwardedOverlayConnectContext
+ *
+ * @param focc the ForwardedOverlayConnectContext to cleanup
+ */
+void
+TESTBED_cleanup_focc (struct ForwardedOverlayConnectContext *focc);
+
+
+/**
+ * Clears all pending overlay connect contexts in queue
+ */
+void
+TESTBED_free_occq ();
+
+
+/**
+ * Clears all pending remote overlay connect contexts in queue
+ */
+void
+TESTBED_free_roccq ();
+
+
 
 /* End of gnunet-service-testbed.h */