redefine GNUNET_MQ_queue_for_connection_client to capture client handle

[oweals/gnunet.git] / src / ats / ats_api_connectivity.c

diff --git a/src/ats/ats_api_connectivity.c b/src/ats/ats_api_connectivity.c
index 432f1ca359ed7d8acef13a29d66629516f6cd1cc..139f50a814933889e4b149f51bca670fb69ea81b 100644 (file)
--- a/src/ats/ats_api_connectivity.c
+++ b/src/ats/ats_api_connectivity.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     Copyright (C) 2010-2015 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2010-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.
 */
 /**
  * @file ats/ats_api_connectivity.c
@@ -28,6 +28,9 @@
 #include "ats.h"
 
 
+#define LOG(kind,...) GNUNET_log_from(kind, "ats-connectivity-api", __VA_ARGS__)
+
+
 /**
  * Handle for ATS address suggestion requests.
  */
@@ -42,6 +45,11 @@ struct GNUNET_ATS_ConnectivitySuggestHandle
    * Connecitivity handle this suggestion handle belongs to.
    */
   struct GNUNET_ATS_ConnectivityHandle *ch;
+
+  /**
+   * How urgent is the request.
+   */
+  uint32_t strength;
 };
 
 
@@ -63,11 +71,6 @@ struct GNUNET_ATS_ConnectivityHandle
    */
   struct GNUNET_CONTAINER_MultiPeerMap *sug_requests;
 
-  /**
-   * Connection to ATS service.
-   */
-  struct GNUNET_CLIENT_Connection *client;
-
   /**
    * Message queue for sending requests to the ATS service.
    */
@@ -98,11 +101,9 @@ reconnect (struct GNUNET_ATS_ConnectivityHandle *ch);
  * Re-establish the connection to the ATS service.
  *
  * @param cls handle to use to re-connect.
- * @param tc scheduler context
  */
 static void
-reconnect_task (void *cls,
-                const struct GNUNET_SCHEDULER_TaskContext *tc)
+reconnect_task (void *cls)
 {
   struct GNUNET_ATS_ConnectivityHandle *ch = cls;
 
@@ -124,11 +125,6 @@ force_reconnect (struct GNUNET_ATS_ConnectivityHandle *ch)
     GNUNET_MQ_destroy (ch->mq);
     ch->mq = NULL;
   }
-  if (NULL != ch->client)
-  {
-    GNUNET_CLIENT_disconnect (ch->client);
-    ch->client = NULL;
-  }
   ch->backoff = GNUNET_TIME_STD_BACKOFF (ch->backoff);
   ch->task = GNUNET_SCHEDULER_add_delayed (ch->backoff,
                                            &reconnect_task,
@@ -149,9 +145,9 @@ error_handler (void *cls,
 {
   struct GNUNET_ATS_ConnectivityHandle *ch = cls;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-              "ATS connection died (code %d), reconnecting\n",
-              (int) error);
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "ATS connection died (code %d), reconnecting\n",
+       (int) error);
   force_reconnect (ch);
 }
 
@@ -171,13 +167,14 @@ transmit_suggestion (void *cls,
                      void *value)
 {
   struct GNUNET_ATS_ConnectivityHandle *ch = cls;
+  struct GNUNET_ATS_ConnectivitySuggestHandle *sh = value;
   struct GNUNET_MQ_Envelope *ev;
   struct RequestAddressMessage *m;
 
   if (NULL == ch->mq)
     return GNUNET_SYSERR;
   ev = GNUNET_MQ_msg (m, GNUNET_MESSAGE_TYPE_ATS_REQUEST_ADDRESS);
-  m->reserved = htonl (0);
+  m->strength = htonl (sh->strength);
   m->peer = *peer;
   GNUNET_MQ_send (ch->mq, ev);
   return GNUNET_OK;
@@ -196,15 +193,16 @@ reconnect (struct GNUNET_ATS_ConnectivityHandle *ch)
     { { NULL, 0, 0 } };
   struct GNUNET_MQ_Envelope *ev;
   struct ClientStartMessage *init;
+  struct GNUNET_CLIENT_Connection *client;
 
-  GNUNET_assert (NULL == ch->client);
-  ch->client = GNUNET_CLIENT_connect ("ats", ch->cfg);
-  if (NULL == ch->client)
+  GNUNET_assert (NULL == ch->mq);
+  client = GNUNET_CLIENT_connect ("ats", ch->cfg);
+  if (NULL == client)
   {
     force_reconnect (ch);
     return;
   }
-  ch->mq = GNUNET_MQ_queue_for_connection_client (ch->client,
+  ch->mq = GNUNET_MQ_queue_for_connection_client (client,
                                                   handlers,
                                                   &error_handler,
                                                   ch);
@@ -241,7 +239,7 @@ GNUNET_ATS_connectivity_init (const struct GNUNET_CONFIGURATION_Handle *cfg)
 
 
 /**
- * Function called to free all `struct GNUNET_ATS_SuggestHandles`
+ * Function called to free all `struct GNUNET_ATS_ConnectivitySuggestHandle`s
  * in the map.
  *
  * @param cls NULL
@@ -274,11 +272,6 @@ GNUNET_ATS_connectivity_done (struct GNUNET_ATS_ConnectivityHandle *ch)
     GNUNET_MQ_destroy (ch->mq);
     ch->mq = NULL;
   }
-  if (NULL != ch->client)
-  {
-    GNUNET_CLIENT_disconnect (ch->client);
-    ch->client = NULL;
-  }
   if (NULL != ch->task)
   {
     GNUNET_SCHEDULER_cancel (ch->task);
@@ -300,20 +293,23 @@ GNUNET_ATS_connectivity_done (struct GNUNET_ATS_ConnectivityHandle *ch)
  *
  * @param ch handle
  * @param peer identity of the peer we need an address for
+ * @param strength how urgent is the need for such a suggestion
  * @return suggest handle, NULL if a request is already pending
  */
 struct GNUNET_ATS_ConnectivitySuggestHandle *
 GNUNET_ATS_connectivity_suggest (struct GNUNET_ATS_ConnectivityHandle *ch,
-                                 const struct GNUNET_PeerIdentity *peer)
+                                 const struct GNUNET_PeerIdentity *peer,
+                                 uint32_t strength)
 {
   struct GNUNET_ATS_ConnectivitySuggestHandle *s;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Requesting ATS to suggest address for `%s'\n",
-              GNUNET_i2s (peer));
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Requesting ATS to suggest address for `%s'\n",
+       GNUNET_i2s (peer));
   s = GNUNET_new (struct GNUNET_ATS_ConnectivitySuggestHandle);
   s->ch = ch;
   s->id = *peer;
+  s->strength = strength;
   if (GNUNET_OK !=
       GNUNET_CONTAINER_multipeermap_put (ch->sug_requests,
                                          &s->id,
@@ -344,9 +340,9 @@ GNUNET_ATS_connectivity_suggest_cancel (struct GNUNET_ATS_ConnectivitySuggestHan
   struct GNUNET_MQ_Envelope *ev;
   struct RequestAddressMessage *m;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Telling ATS we no longer care for an address for `%s'\n",
-              GNUNET_i2s (&sh->id));
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Telling ATS we no longer care for an address for `%s'\n",
+       GNUNET_i2s (&sh->id));
   GNUNET_assert (GNUNET_OK ==
                  GNUNET_CONTAINER_multipeermap_remove (ch->sug_requests,
                                                        &sh->id,
@@ -357,7 +353,7 @@ GNUNET_ATS_connectivity_suggest_cancel (struct GNUNET_ATS_ConnectivitySuggestHan
     return;
   }
   ev = GNUNET_MQ_msg (m, GNUNET_MESSAGE_TYPE_ATS_REQUEST_ADDRESS_CANCEL);
-  m->reserved = htonl (0);
+  m->strength = htonl (0);
   m->peer = sh->id;
   GNUNET_MQ_send (ch->mq, ev);
   GNUNET_free (sh);