diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-02-17 14:33:04 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-02-17 14:33:04 +0100 |
commit | df55d08fd1316908c1e5ec65ca8b8947ca46d007 (patch) | |
tree | 8106bb93dfbf96fac4d574fdcc69c3b7385961cf /src/set | |
parent | 181c039d12aa2aa99920d14070e7b64c018e8be7 (diff) | |
download | gnunet-df55d08fd1316908c1e5ec65ca8b8947ca46d007.tar.gz gnunet-df55d08fd1316908c1e5ec65ca8b8947ca46d007.zip |
move SET to use new MQ API properly
Diffstat (limited to 'src/set')
-rw-r--r-- | src/set/Makefile.am | 2 | ||||
-rw-r--r-- | src/set/gnunet-service-set.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/set/Makefile.am b/src/set/Makefile.am index 9d6b0d3c2..10f7ddc5d 100644 --- a/src/set/Makefile.am +++ b/src/set/Makefile.am | |||
@@ -58,7 +58,7 @@ gnunet_service_set_LDADD = \ | |||
58 | $(top_builddir)/src/util/libgnunetutil.la \ | 58 | $(top_builddir)/src/util/libgnunetutil.la \ |
59 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 59 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
60 | $(top_builddir)/src/core/libgnunetcore.la \ | 60 | $(top_builddir)/src/core/libgnunetcore.la \ |
61 | $(top_builddir)/src/cadet/libgnunetcadet.la \ | 61 | $(top_builddir)/src/cadet/libgnunetcadetnew.la \ |
62 | $(top_builddir)/src/block/libgnunetblock.la \ | 62 | $(top_builddir)/src/block/libgnunetblock.la \ |
63 | libgnunetset.la \ | 63 | libgnunetset.la \ |
64 | $(GN_LIBINTL) | 64 | $(GN_LIBINTL) |
diff --git a/src/set/gnunet-service-set.c b/src/set/gnunet-service-set.c index 3f1086891..7ebb30b01 100644 --- a/src/set/gnunet-service-set.c +++ b/src/set/gnunet-service-set.c | |||
@@ -1197,7 +1197,7 @@ channel_new_cb (void *cls, | |||
1197 | incoming->is_incoming = GNUNET_YES; | 1197 | incoming->is_incoming = GNUNET_YES; |
1198 | incoming->peer = *source; | 1198 | incoming->peer = *source; |
1199 | incoming->channel = channel; | 1199 | incoming->channel = channel; |
1200 | incoming->mq = GNUNET_CADET_mq_create (incoming->channel); | 1200 | incoming->mq = GNUNET_CADET_get_mq (incoming->channel); |
1201 | incoming->vt = &incoming_vt; | 1201 | incoming->vt = &incoming_vt; |
1202 | incoming->timeout_task | 1202 | incoming->timeout_task |
1203 | = GNUNET_SCHEDULER_add_delayed (INCOMING_CHANNEL_TIMEOUT, | 1203 | = GNUNET_SCHEDULER_add_delayed (INCOMING_CHANNEL_TIMEOUT, |
@@ -1694,7 +1694,7 @@ handle_client_evaluate (void *cls, | |||
1694 | &channel_window_cb, | 1694 | &channel_window_cb, |
1695 | &channel_end_cb, | 1695 | &channel_end_cb, |
1696 | cadet_handlers); | 1696 | cadet_handlers); |
1697 | op->mq = GNUNET_CADET_mq_create (op->channel); | 1697 | op->mq = GNUNET_CADET_get_mq (op->channel); |
1698 | set->vt->evaluate (op, | 1698 | set->vt->evaluate (op, |
1699 | context); | 1699 | context); |
1700 | GNUNET_SERVICE_client_continue (client); | 1700 | GNUNET_SERVICE_client_continue (client); |