move SET to use new MQ API properly

diff --git a/src/set/Makefile.am b/src/set/Makefile.am
index 9d6b0d3c28f3bf50e60b5e2b070d86692fc761c6..10f7ddc5d7046dee0bdc0166247943d5ba472809 100644 (file)
--- a/src/set/Makefile.am
+++ b/src/set/Makefile.am
@@ -58,7 +58,7 @@ gnunet_service_set_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/cadet/libgnunetcadet.la \
+  $(top_builddir)/src/cadet/libgnunetcadetnew.la \
   $(top_builddir)/src/block/libgnunetblock.la \
   libgnunetset.la \
   $(GN_LIBINTL)

diff --git a/src/set/gnunet-service-set.c b/src/set/gnunet-service-set.c
index 3f1086891f45f0411fd36a46b78b27a7cb7e5e0d..7ebb30b01f6cf9754fd2075da9fa667ce2147402 100644 (file)
--- a/src/set/gnunet-service-set.c
+++ b/src/set/gnunet-service-set.c
@@ -1197,7 +1197,7 @@ channel_new_cb (void *cls,
   incoming->is_incoming = GNUNET_YES;
   incoming->peer = *source;
   incoming->channel = channel;
-  incoming->mq = GNUNET_CADET_mq_create (incoming->channel);
+  incoming->mq = GNUNET_CADET_get_mq (incoming->channel);
   incoming->vt = &incoming_vt;
   incoming->timeout_task
     = GNUNET_SCHEDULER_add_delayed (INCOMING_CHANNEL_TIMEOUT,
@@ -1694,7 +1694,7 @@ handle_client_evaluate (void *cls,
                                              &channel_window_cb,
                                              &channel_end_cb,
                                              cadet_handlers);
-  op->mq = GNUNET_CADET_mq_create (op->channel);
+  op->mq = GNUNET_CADET_get_mq (op->channel);
   set->vt->evaluate (op,
                      context);
   GNUNET_SERVICE_client_continue (client);