-skeletons for transport-ng

[oweals/gnunet.git] / src / ats / gnunet-service-ats_connectivity.c

diff --git a/src/ats/gnunet-service-ats_connectivity.c b/src/ats/gnunet-service-ats_connectivity.c
index 1ced117ca5f02da0d3ed9692089be8ed731b81d8..2cf434c70b7024f054d37530a1ba138744528e33 100644 (file)
--- a/src/ats/gnunet-service-ats_connectivity.c
+++ b/src/ats/gnunet-service-ats_connectivity.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     Copyright (C) 2011-2015 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2011-2015 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 /**
@@ -64,6 +64,8 @@ unsigned int
 GAS_connectivity_has_peer (void *cls,
                            const struct GNUNET_PeerIdentity *peer)
 {
+  if (NULL == connection_requests)
+    return 0;
   /* TODO: return sum of 'strength's of connectivity requests */
   return GNUNET_CONTAINER_multipeermap_contains (connection_requests,
                                                  peer);
@@ -71,7 +73,7 @@ GAS_connectivity_has_peer (void *cls,
 
 
 /**
- * Handle 'request address' messages from clients.
+ * Handle #GNUNET_MESSAGE_TYPE_ATS_REQUEST_ADDRESS messages from clients.
  *
  * @param cls unused, NULL
  * @param client client that sent the request
@@ -88,8 +90,8 @@ GAS_handle_request_address (void *cls,
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Received `%s' message\n",
-              "REQUEST_ADDRESS");
-  GNUNET_break (0 == ntohl (msg->reserved));
+              "GNUNET_MESSAGE_TYPE_ATS_REQUEST_ADDRESS");
+  /* FIXME: should not ignore "msg->strength" */
   cr = GNUNET_new (struct ConnectionRequest);
   cr->client = client;
   (void) GNUNET_CONTAINER_multipeermap_put (connection_requests,
@@ -135,7 +137,8 @@ free_matching_requests (void *cls,
 
 
 /**
- * Handle 'request address cancel' messages from clients.
+ * Handle #GNUNET_MESSAGE_TYPE_ATS_REQUEST_ADDRESS_CANCEL messages
+ * from clients.
  *
  * @param cls unused, NULL
  * @param client client that sent the request
@@ -150,9 +153,9 @@ GAS_handle_request_address_cancel (void *cls,
       (const struct RequestAddressMessage *) message;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received REQUEST_ADDRESS_CANCEL message for peer %s\n",
+              "Received GNUNET_MESSAGE_TYPE_ATS_REQUEST_ADDRESS_CANCEL message for peer %s\n",
               GNUNET_i2s (&msg->peer));
-  GNUNET_break (0 == ntohl (msg->reserved));
+  GNUNET_break (0 == ntohl (msg->strength));
   GNUNET_CONTAINER_multipeermap_get_multiple (connection_requests,
                                               &msg->peer,
                                               &free_matching_requests,
@@ -214,10 +217,13 @@ free_request (void *cls,
 void
 GAS_connectivity_done ()
 {
+  GAS_plugin_solver_lock ();
   GNUNET_CONTAINER_multipeermap_iterate (connection_requests,
                                          &free_request,
                                          NULL);
+  GAS_plugin_solver_unlock ();
   GNUNET_CONTAINER_multipeermap_destroy (connection_requests);
+  connection_requests = NULL;
 }