-cleaning up gnunet-service-ats_connectivity-*

3 files changed, 105 insertions, 143 deletions

diff --git a/src/ats/gnunet-service-ats.c b/src/ats/gnunet-service-ats.c
index d54d09a33..b000ae99c 100644
--- a/src/ats/gnunet-service-ats.c
+++ b/src/ats/gnunet-service-ats.c
@@ -189,6 +189,7 @@ run (void *cls,
   GSA_server = server;
   GSA_stats = GNUNET_STATISTICS_create ("ats", cfg);
   GAS_reservations_init ();
+  GAS_connectivity_init ();
   GAS_normalization_start ();
   GAS_addresses_init ();
   if (GNUNET_OK !=
@@ -198,6 +199,7 @@ run (void *cls,
     GAS_addresses_done ();
     GAS_normalization_stop ();
     GAS_reservations_done ();
+    GAS_connectivity_done ();
     if (NULL != GSA_stats)
     {
       GNUNET_STATISTICS_destroy (GSA_stats, GNUNET_NO);
@@ -209,7 +211,7 @@ run (void *cls,
   GAS_scheduling_init (server);
 
   GNUNET_SERVER_disconnect_notify (server,
-                                   &client_disconnect_handler, 
+                                   &client_disconnect_handler,
                                    NULL);
   GNUNET_SERVER_add_handlers (server, handlers);
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
diff --git a/src/ats/gnunet-service-ats_connectivity.c b/src/ats/gnunet-service-ats_connectivity.c
index 4aee2ddb8..56d7abbeb 100644
--- a/src/ats/gnunet-service-ats_connectivity.c
+++ b/src/ats/gnunet-service-ats_connectivity.c
@@ -23,12 +23,6 @@
  * @brief ats service, interaction with 'connecivity' API
  * @author Matthias Wachs
  * @author Christian Grothoff
- *
- * FIXME:
- * - we should track requests by client, and if a client
- *   disconnects cancel all associated requests; right
- *   now, they will persist forever unless the client
- *   explicitly sends us a cancel before disconnecting!
  */
 #include "platform.h"
 #include "gnunet-service-ats.h"
@@ -39,117 +33,21 @@
 
 
 /**
- * Pending Address suggestion requests
+ * Active connection requests.
  */
-struct GAS_Addresses_Suggestion_Requests
+struct ConnectionRequest
 {
   /**
-   * Next in DLL
-   */
-  struct GAS_Addresses_Suggestion_Requests *next;
-
-  /**
-   * Previous in DLL
-   */
-  struct GAS_Addresses_Suggestion_Requests *prev;
-
-  /**
-   * Peer ID
+   * Client that made the request.
    */
-  struct GNUNET_PeerIdentity id;
+  struct GNUNET_SERVER_Client *client;
 };
 
 
 /**
- * Address suggestion requests DLL head.
- * FIXME: This must become a Multipeermap! O(n) operations
- * galore instead of O(1)!!!
- */
-static struct GAS_Addresses_Suggestion_Requests *pending_requests_head;
-
-/**
- * Address suggestion requests DLL tail
- */
-static struct GAS_Addresses_Suggestion_Requests *pending_requests_tail;
-
-
-
-
-/**
- * Cancel address suggestions for a peer
- *
- * @param peer the peer id
+ * Address suggestion requests by peer.
  */
-void
-GAS_addresses_request_address_cancel (const struct GNUNET_PeerIdentity *peer)
-{
-  struct GAS_Addresses_Suggestion_Requests *cur = pending_requests_head;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received request: `%s' for peer %s\n",
-              "request_address_cancel",
-              GNUNET_i2s (peer));
-
-  while (NULL != cur)
-  {
-    if (0 == memcmp (peer, &cur->id, sizeof(cur->id)))
-      break; /* found */
-    cur = cur->next;
-  }
-
-  if (NULL == cur)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "No address requests pending for peer `%s', cannot remove!\n",
-                GNUNET_i2s (peer));
-    return;
-  }
-  GAS_plugin_request_connect_stop (peer);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Removed request pending for peer `%s\n",
-              GNUNET_i2s (peer));
-  GNUNET_CONTAINER_DLL_remove (pending_requests_head,
-                               pending_requests_tail,
-                               cur);
-  GNUNET_free (cur);
-}
-
-
-/**
- * Request address suggestions for a peer
- *
- * @param peer the peer id
- */
-void
-GAS_addresses_request_address (const struct GNUNET_PeerIdentity *peer)
-{
-  struct GAS_Addresses_Suggestion_Requests *cur = pending_requests_head;
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Received `%s' for peer `%s'\n",
-             "REQUEST ADDRESS",
-             GNUNET_i2s (peer));
-
-  while (NULL != cur)
-  {
-    if (0 == memcmp (peer, &cur->id, sizeof(cur->id)))
-      break; /* already suggesting */
-    cur = cur->next;
-  }
-  if (NULL == cur)
-  {
-    cur = GNUNET_new (struct GAS_Addresses_Suggestion_Requests);
-    cur->id = *peer;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Adding new address suggestion request for `%s'\n",
-                GNUNET_i2s (peer));
-    GNUNET_CONTAINER_DLL_insert (pending_requests_head,
-                                 pending_requests_tail,
-                                 cur);
-  }
-  GAS_plugin_request_connect_start (peer);
-}
-
+static struct GNUNET_CONTAINER_MultiPeerMap *connection_requests;
 
 
 /**
@@ -166,18 +64,58 @@ GAS_handle_request_address (void *cls,
 {
   const struct RequestAddressMessage *msg =
       (const struct RequestAddressMessage *) message;
+  struct ConnectionRequest *cr;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Received `%s' message\n",
               "REQUEST_ADDRESS");
   GNUNET_break (0 == ntohl (msg->reserved));
-  GAS_addresses_request_address (&msg->peer);
+  cr = GNUNET_new (struct ConnectionRequest);
+  cr->client = client;
+  (void) GNUNET_CONTAINER_multipeermap_put (connection_requests,
+                                            &msg->peer,
+                                            cr,
+                                            GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+  GAS_plugin_request_connect_start (&msg->peer);
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
 
 
 /**
- * Handle 'request address' messages from clients.
+ * Free the connection request from the map if the
+ * closure matches the client.
+ *
+ * @param cls the client to match
+ * @param pid peer for which the request was made
+ * @param value the `struct ConnectionRequest`
+ * @return #GNUNET_OK (continue to iterate)
+ */
+static int
+free_matching_requests (void *cls,
+                        const struct GNUNET_PeerIdentity *pid,
+                        void *value)
+{
+  struct GNUNET_SERVER_Client *client = cls;
+  struct ConnectionRequest *cr = value;
+
+  if (cr->client == client)
+  {
+    GAS_plugin_request_connect_stop (pid);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Removed request pending for peer `%s\n",
+                GNUNET_i2s (pid));
+    GNUNET_assert (GNUNET_YES ==
+                   GNUNET_CONTAINER_multipeermap_remove (connection_requests,
+                                                         pid,
+                                                         cr));
+    GNUNET_free (cr);
+  }
+  return GNUNET_OK;
+}
+
+
+/**
+ * Handle 'request address cancel' messages from clients.
  *
  * @param cls unused, NULL
  * @param client client that sent the request
@@ -192,10 +130,13 @@ GAS_handle_request_address_cancel (void *cls,
       (const struct RequestAddressMessage *) message;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received `%s' message\n",
-              "REQUEST_ADDRESS_CANCEL");
+              "Received REQUEST_ADDRESS_CANCEL message for peer %s\n",
+              GNUNET_i2s (&msg->peer));
   GNUNET_break (0 == ntohl (msg->reserved));
-  GAS_addresses_request_address_cancel (&msg->peer);
+  GNUNET_CONTAINER_multipeermap_get_multiple (connection_requests,
+                                              &msg->peer,
+                                              &free_matching_requests,
+                                              client);
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
 
@@ -209,7 +150,9 @@ GAS_handle_request_address_cancel (void *cls,
 void
 GAS_connectivity_remove_client (struct GNUNET_SERVER_Client *client)
 {
-  // FIXME
+  GNUNET_CONTAINER_multipeermap_iterate (connection_requests,
+                                         &free_matching_requests,
+                                         client);
 }
 
 
@@ -217,17 +160,44 @@ GAS_connectivity_remove_client (struct GNUNET_SERVER_Client *client)
  * Shutdown connectivity subsystem.
  */
 void
-GAS_connectivity_done ()
+GAS_connectivity_init ()
 {
-  struct GAS_Addresses_Suggestion_Requests *cur;
+  connection_requests = GNUNET_CONTAINER_multipeermap_create (32, GNUNET_NO);
+}
 
-  while (NULL != (cur = pending_requests_head))
-  {
-    GNUNET_CONTAINER_DLL_remove (pending_requests_head,
-                                 pending_requests_tail,
-                                 cur);
-    GNUNET_free(cur);
-  }
+
+/**
+ * Free the connection request from the map.
+ *
+ * @param cls NULL
+ * @param pid peer for which the request was made
+ * @param value the `struct ConnectionRequest`
+ * @return #GNUNET_OK (continue to iterate)
+ */
+static int
+free_request (void *cls,
+              const struct GNUNET_PeerIdentity *pid,
+              void *value)
+{
+  struct ConnectionRequest *cr = value;
+
+  free_matching_requests (cr->client,
+                          pid,
+                          cr);
+  return GNUNET_OK;
+}
+
+
+/**
+ * Shutdown connectivity subsystem.
+ */
+void
+GAS_connectivity_done ()
+{
+  GNUNET_CONTAINER_multipeermap_iterate (connection_requests,
+                                         &free_request,
+                                         NULL);
+  GNUNET_CONTAINER_multipeermap_destroy (connection_requests);
 }
 
 
diff --git a/src/ats/gnunet-service-ats_connectivity.h b/src/ats/gnunet-service-ats_connectivity.h
index faa00ac40..61c1d0ce5 100644
--- a/src/ats/gnunet-service-ats_connectivity.h
+++ b/src/ats/gnunet-service-ats_connectivity.h
@@ -17,34 +17,17 @@
      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
      Boston, MA 02111-1307, USA.
 */
-
 /**
  * @file ats/gnunet-service-ats_connectivity.h
  * @brief ats service, interaction with 'connecivity' API
  * @author Matthias Wachs
  * @author Christian Grothoff
+ *
+ * TODO: will need API to query connectivity requests!
  */
 #ifndef GNUNET_SERVICE_ATS_CONNECTIVITY_H
 #define GNUNET_SERVICE_ATS_CONNECTIVITY_H
 
-/**
- * Request address suggestions for a peer
- *
- * @param peer the peer id
- */
-void
-GAS_addresses_request_address (const struct GNUNET_PeerIdentity *peer);
-
-
-/**
- * Cancel address suggestions for a peer
- *
- * @param peer the peer id
- */
-void
-GAS_addresses_request_address_cancel (const struct GNUNET_PeerIdentity *peer);
-
-
 
 /**
  * Handle 'request address' messages from clients.
@@ -83,6 +66,13 @@ GAS_connectivity_remove_client (struct GNUNET_SERVER_Client *client);
 
 
 /**
+ * Initialize connectivity subsystem.
+ */
+void
+GAS_connectivity_init (void);
+
+
+/**
  * Shutdown connectivity subsystem.
  */
 void