diff options
-rw-r--r-- | src/set/gnunet-service-set.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/set/gnunet-service-set.c b/src/set/gnunet-service-set.c index 4da718879..d2f0b48d5 100644 --- a/src/set/gnunet-service-set.c +++ b/src/set/gnunet-service-set.c | |||
@@ -23,8 +23,6 @@ | |||
23 | * @brief two-peer set operations | 23 | * @brief two-peer set operations |
24 | * @author Florian Dold | 24 | * @author Florian Dold |
25 | */ | 25 | */ |
26 | |||
27 | |||
28 | #include "gnunet-service-set.h" | 26 | #include "gnunet-service-set.h" |
29 | #include "set_protocol.h" | 27 | #include "set_protocol.h" |
30 | 28 | ||
@@ -146,12 +144,6 @@ destroy_listener (struct Listener *listener) | |||
146 | GNUNET_MQ_destroy (listener->client_mq); | 144 | GNUNET_MQ_destroy (listener->client_mq); |
147 | listener->client_mq = NULL; | 145 | listener->client_mq = NULL; |
148 | } | 146 | } |
149 | if (NULL != listener->client) | ||
150 | { | ||
151 | GNUNET_SERVER_client_drop (listener->client); | ||
152 | listener->client = NULL; | ||
153 | } | ||
154 | |||
155 | GNUNET_CONTAINER_DLL_remove (listeners_head, listeners_tail, listener); | 147 | GNUNET_CONTAINER_DLL_remove (listeners_head, listeners_tail, listener); |
156 | GNUNET_free (listener); | 148 | GNUNET_free (listener); |
157 | } | 149 | } |
@@ -189,7 +181,7 @@ destroy_set (struct Set *set) | |||
189 | * @param cls closure, unused | 181 | * @param cls closure, unused |
190 | * @param client the client to clean up after | 182 | * @param client the client to clean up after |
191 | */ | 183 | */ |
192 | void | 184 | static void |
193 | handle_client_disconnect (void *cls, struct GNUNET_SERVER_Client *client) | 185 | handle_client_disconnect (void *cls, struct GNUNET_SERVER_Client *client) |
194 | { | 186 | { |
195 | struct Set *set; | 187 | struct Set *set; |
@@ -226,6 +218,7 @@ destroy_incoming (struct Incoming *incoming) | |||
226 | GNUNET_free (incoming); | 218 | GNUNET_free (incoming); |
227 | } | 219 | } |
228 | 220 | ||
221 | |||
229 | static struct Listener * | 222 | static struct Listener * |
230 | get_listener_by_target (enum GNUNET_SET_OperationType op, | 223 | get_listener_by_target (enum GNUNET_SET_OperationType op, |
231 | const struct GNUNET_HashCode *app_id) | 224 | const struct GNUNET_HashCode *app_id) |
@@ -332,7 +325,6 @@ handle_client_create (void *cls, | |||
332 | GNUNET_assert (NULL != set); | 325 | GNUNET_assert (NULL != set); |
333 | 326 | ||
334 | set->client = client; | 327 | set->client = client; |
335 | GNUNET_SERVER_client_keep (client); | ||
336 | set->client_mq = GNUNET_MQ_queue_for_server_client (client); | 328 | set->client_mq = GNUNET_MQ_queue_for_server_client (client); |
337 | GNUNET_CONTAINER_DLL_insert (sets_head, sets_tail, set); | 329 | GNUNET_CONTAINER_DLL_insert (sets_head, sets_tail, set); |
338 | GNUNET_SERVER_receive_done (client, GNUNET_OK); | 330 | GNUNET_SERVER_receive_done (client, GNUNET_OK); |
@@ -362,7 +354,6 @@ handle_client_listen (void *cls, | |||
362 | } | 354 | } |
363 | listener = GNUNET_new (struct Listener); | 355 | listener = GNUNET_new (struct Listener); |
364 | listener->client = client; | 356 | listener->client = client; |
365 | GNUNET_SERVER_client_keep (client); | ||
366 | listener->client_mq = GNUNET_MQ_queue_for_server_client (client); | 357 | listener->client_mq = GNUNET_MQ_queue_for_server_client (client); |
367 | listener->app_id = msg->app_id; | 358 | listener->app_id = msg->app_id; |
368 | listener->operation = ntohs (msg->operation); | 359 | listener->operation = ntohs (msg->operation); |
@@ -698,7 +689,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
698 | 689 | ||
699 | configuration = cfg; | 690 | configuration = cfg; |
700 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task, NULL); | 691 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task, NULL); |
701 | GNUNET_SERVER_disconnect_notify (server, handle_client_disconnect, NULL); | 692 | GNUNET_SERVER_disconnect_notify (server, &handle_client_disconnect, NULL); |
702 | GNUNET_SERVER_add_handlers (server, server_handlers); | 693 | GNUNET_SERVER_add_handlers (server, server_handlers); |
703 | stream_listen_socket = GNUNET_STREAM_listen (cfg, GNUNET_APPLICATION_TYPE_SET, | 694 | stream_listen_socket = GNUNET_STREAM_listen (cfg, GNUNET_APPLICATION_TYPE_SET, |
704 | &stream_listen_cb, NULL, | 695 | &stream_listen_cb, NULL, |