[GNUnet-SVN] r10002 - gnunet/src/hostlist

[gnunet]

Author: grothoff
Date: 2010-01-14 23:21:26 +0100 (Thu, 14 Jan 2010)
New Revision: 10002

Modified:
   gnunet/src/hostlist/test_gnunet_daemon_hostlist.c
Log:
fix

Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist.c
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist.c   2010-01-14 18:24:18 UTC 
(rev 10001)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist.c   2010-01-14 22:21:26 UTC 
(rev 10002)
@@ -59,6 +59,15 @@
 static struct PeerContext p2;
 
 
+static void
+clean_up (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  GNUNET_TRANSPORT_disconnect (p1.th);
+  p1.th = NULL;
+  GNUNET_TRANSPORT_disconnect (p2.th);
+  p2.th = NULL;
+  GNUNET_SCHEDULER_shutdown (sched);
+}
 
 /**
  * Timeout, give up.
@@ -69,11 +78,7 @@
   timeout_task = GNUNET_SCHEDULER_NO_TASK;
   GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
              "Timeout trying to connect peers, test failed.\n");
-  GNUNET_TRANSPORT_disconnect (p1.th);
-  p1.th = NULL;
-  GNUNET_TRANSPORT_disconnect (p2.th);
-  p2.th = NULL;
-  GNUNET_SCHEDULER_shutdown (sched);
+  clean_up (NULL, tc);
 }
 
 
@@ -96,13 +101,8 @@
              "Peers connected, shutting down.\n");
   GNUNET_assert (ok == 4);
   ok = 0;
-
-  GNUNET_SCHEDULER_cancel (sched,
-                          timeout_task);
-  GNUNET_TRANSPORT_disconnect (p1.th);
-  p1.th = NULL;
-  GNUNET_TRANSPORT_disconnect (p2.th);
-  p2.th = NULL;
+  GNUNET_SCHEDULER_add_now (sched,
+                           &clean_up, NULL);
 }