aboutsummaryrefslogtreecommitdiff
path: root/src/gns
diff options
context:
space:
mode:
Diffstat (limited to 'src/gns')
-rw-r--r--src/gns/gns_api.c6
-rw-r--r--src/gns/gns_tld_api.c6
2 files changed, 10 insertions, 2 deletions
diff --git a/src/gns/gns_api.c b/src/gns/gns_api.c
index 8264bf715..0ec9209da 100644
--- a/src/gns/gns_api.c
+++ b/src/gns/gns_api.c
@@ -300,17 +300,21 @@ GNUNET_GNS_disconnect (struct GNUNET_GNS_Handle *handle)
300 * Cancel pending lookup request 300 * Cancel pending lookup request
301 * 301 *
302 * @param lr the lookup request to cancel 302 * @param lr the lookup request to cancel
303 * @return closure from the lookup result processor
303 */ 304 */
304void 305void *
305GNUNET_GNS_lookup_cancel (struct GNUNET_GNS_LookupRequest *lr) 306GNUNET_GNS_lookup_cancel (struct GNUNET_GNS_LookupRequest *lr)
306{ 307{
307 struct GNUNET_GNS_Handle *handle = lr->gns_handle; 308 struct GNUNET_GNS_Handle *handle = lr->gns_handle;
309 void *ret;
308 310
309 GNUNET_CONTAINER_DLL_remove (handle->lookup_head, 311 GNUNET_CONTAINER_DLL_remove (handle->lookup_head,
310 handle->lookup_tail, 312 handle->lookup_tail,
311 lr); 313 lr);
312 GNUNET_MQ_discard (lr->env); 314 GNUNET_MQ_discard (lr->env);
315 ret = lr->proc_cls;
313 GNUNET_free (lr); 316 GNUNET_free (lr);
317 return ret;
314} 318}
315 319
316 320
diff --git a/src/gns/gns_tld_api.c b/src/gns/gns_tld_api.c
index b053aa0c1..825b51d06 100644
--- a/src/gns/gns_tld_api.c
+++ b/src/gns/gns_tld_api.c
@@ -317,10 +317,13 @@ GNUNET_GNS_lookup_with_tld (struct GNUNET_GNS_Handle *handle,
317 * Cancel pending lookup request 317 * Cancel pending lookup request
318 * 318 *
319 * @param ltr the lookup request to cancel 319 * @param ltr the lookup request to cancel
320 * @return closure from the lookup result processor
320 */ 321 */
321void 322void *
322GNUNET_GNS_lookup_with_tld_cancel (struct GNUNET_GNS_LookupWithTldRequest *ltr) 323GNUNET_GNS_lookup_with_tld_cancel (struct GNUNET_GNS_LookupWithTldRequest *ltr)
323{ 324{
325 void *ret = ltr->lookup_proc_cls;
326
324 if (NULL != ltr->id_op) 327 if (NULL != ltr->id_op)
325 { 328 {
326 GNUNET_IDENTITY_ego_lookup_cancel (ltr->id_op); 329 GNUNET_IDENTITY_ego_lookup_cancel (ltr->id_op);
@@ -333,6 +336,7 @@ GNUNET_GNS_lookup_with_tld_cancel (struct GNUNET_GNS_LookupWithTldRequest *ltr)
333 } 336 }
334 GNUNET_free (ltr->name); 337 GNUNET_free (ltr->name);
335 GNUNET_free (ltr); 338 GNUNET_free (ltr);
339 return ret;
336} 340}
337 341
338/* end of gns_tld_api.c */ 342/* end of gns_tld_api.c */