update tests to use new MQ API

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

diff --git a/src/ats/ats_api_scheduling.c b/src/ats/ats_api_scheduling.c
index bc730b248655ababbde0c3648c6d4ac042793be9..bcca89456f2f9fd89c88dd9ec6ebb6d82f4c20f2 100644 (file)
--- a/src/ats/ats_api_scheduling.c
+++ b/src/ats/ats_api_scheduling.c
@@ -117,11 +117,6 @@ struct GNUNET_ATS_SchedulingHandle
    */
   void *suggest_cb_cls;
 
-  /**
-   * Connection to ATS service.
-   */
-  struct GNUNET_CLIENT_Connection *client;
-
   /**
    * Message queue for sending requests to the ATS service.
    */
@@ -190,11 +185,6 @@ force_reconnect (struct GNUNET_ATS_SchedulingHandle *sh)
     GNUNET_MQ_destroy (sh->mq);
     sh->mq = NULL;
   }
-  if (NULL != sh->client)
-  {
-    GNUNET_CLIENT_disconnect (sh->client);
-    sh->client = NULL;
-  }
   sh->suggest_cb (sh->suggest_cb_cls,
                   NULL, NULL, NULL,
                   GNUNET_BANDWIDTH_ZERO,
@@ -540,19 +530,18 @@ reconnect (struct GNUNET_ATS_SchedulingHandle *sh)
   unsigned int i;
   struct GNUNET_ATS_AddressRecord *ar;
 
-  GNUNET_assert (NULL == sh->client);
-  sh->client = GNUNET_CLIENT_connect ("ats",
-                                      sh->cfg);
-  if (NULL == sh->client)
+  GNUNET_assert (NULL == sh->mq);
+  sh->mq = GNUNET_CLIENT_connecT (sh->cfg,
+                                  "ats",
+                                  handlers,
+                                  &error_handler,
+                                  sh);
+  if (NULL == sh->mq)
   {
     GNUNET_break (0);
     force_reconnect (sh);
     return;
   }
-  sh->mq = GNUNET_MQ_queue_for_connection_client (sh->client,
-                                                  handlers,
-                                                  &error_handler,
-                                                  sh);
   ev = GNUNET_MQ_msg (init,
                       GNUNET_MESSAGE_TYPE_ATS_START);
   init->start_flag = htonl (START_FLAG_SCHEDULING);
@@ -614,11 +603,6 @@ GNUNET_ATS_scheduling_done (struct GNUNET_ATS_SchedulingHandle *sh)
     GNUNET_MQ_destroy (sh->mq);
     sh->mq = NULL;
   }
-  if (NULL != sh->client)
-  {
-    GNUNET_CLIENT_disconnect (sh->client);
-    sh->client = NULL;
-  }
   if (NULL != sh->task)
   {
     GNUNET_SCHEDULER_cancel (sh->task);