-skeletons for transport-ng

[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 1897e2783e21172d21fa06fd5194527bd9d65cb4..790d3e4cb139e6f34a6eb262e53ec1096cd7ae5e 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 GNUnet e.V.
+     Copyright (C) 2010-2016 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
@@ -71,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.
    */
@@ -130,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,
@@ -204,17 +194,17 @@ reconnect (struct GNUNET_ATS_ConnectivityHandle *ch)
   struct GNUNET_MQ_Envelope *ev;
   struct ClientStartMessage *init;
 
-  GNUNET_assert (NULL == ch->client);
-  ch->client = GNUNET_CLIENT_connect ("ats", ch->cfg);
-  if (NULL == ch->client)
+  GNUNET_assert (NULL == ch->mq);
+  ch->mq = GNUNET_CLIENT_connecT (ch->cfg,
+                                  "ats",
+                                  handlers,
+                                  &error_handler,
+                                  ch);
+  if (NULL == ch->mq)
   {
     force_reconnect (ch);
     return;
   }
-  ch->mq = GNUNET_MQ_queue_for_connection_client (ch->client,
-                                                  handlers,
-                                                  &error_handler,
-                                                  ch);
   ev = GNUNET_MQ_msg (init,
                       GNUNET_MESSAGE_TYPE_ATS_START);
   init->start_flag = htonl (START_FLAG_CONNECTION_SUGGESTION);
@@ -281,11 +271,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);