-fix double free, linker issue

[oweals/gnunet.git] / src / gns / test_gns_simple_shorten.c

diff --git a/src/gns/test_gns_simple_shorten.c b/src/gns/test_gns_simple_shorten.c
index fb02d223ede8da0635e047b3158ff35978ed5914..23305c8894290e37f982b2f2c23f566a681c5bf6 100644 (file)
--- a/src/gns/test_gns_simple_shorten.c
+++ b/src/gns/test_gns_simple_shorten.c
@@ -95,6 +95,13 @@ void end_badly_now ()
   die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
 }
 
+static void shutdown_task (void *cls,
+                           const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  GNUNET_GNS_disconnect(gns_handle);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer!\n");
+  GNUNET_SCHEDULER_shutdown ();
+}
 
 /**
  * Called when gns shorten finishes
@@ -102,7 +109,6 @@ void end_badly_now ()
 static void
 process_shorten_result(void* cls, const char* sname)
 {
-  GNUNET_GNS_disconnect(gns_handle);
 
   if (GNUNET_SCHEDULER_NO_TASK != die_task)
   {
@@ -135,9 +141,8 @@ process_shorten_result(void* cls, const char* sname)
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shorten test succeeded!\n");
     ok = 0;
   }
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutting down peer!\n");
-  GNUNET_SCHEDULER_shutdown ();
+  
+  GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
 }
 
 /**