[GNUnet-SVN] r20013 - gnunet/src/dht

[gnunet]

Author: bartpolot
Date: 2012-02-24 16:57:13 +0100 (Fri, 24 Feb 2012)
New Revision: 20013

Modified:
   gnunet/src/dht/test_dht_multipeer.c
   gnunet/src/dht/test_dht_topo.c
Log:
- Fixed crashes when ctrl-c testcases

Modified: gnunet/src/dht/test_dht_multipeer.c
===================================================================
--- gnunet/src/dht/test_dht_multipeer.c 2012-02-24 15:36:28 UTC (rev 20012)
+++ gnunet/src/dht/test_dht_multipeer.c 2012-02-24 15:57:13 UTC (rev 20013)
@@ -664,7 +664,10 @@
 
   outstanding_puts--;
   puts_completed++;
-  GNUNET_SCHEDULER_cancel (test_put->task);
+  if (GNUNET_SCHEDULER_NO_TASK != test_put->task)
+  {
+    GNUNET_SCHEDULER_cancel (test_put->task);
+  }
   test_put->task = GNUNET_SCHEDULER_add_now (&put_disconnect_task, test_put);
   if (puts_completed != num_peers * num_peers)
     return;
@@ -716,6 +719,11 @@
   unsigned long long i;
   struct TestPutContext *test_put;
 
+  if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
+  {
+    ok = 1;
+    return;
+  }
 #if PATH_TRACKING
   route_option =
       GNUNET_DHT_RO_RECORD_ROUTE | GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE;

Modified: gnunet/src/dht/test_dht_topo.c
===================================================================
--- gnunet/src/dht/test_dht_topo.c      2012-02-24 15:36:28 UTC (rev 20012)
+++ gnunet/src/dht/test_dht_topo.c      2012-02-24 15:57:13 UTC (rev 20013)
@@ -155,6 +155,7 @@
                 "test: All peers successfully shut down!\n");
 #endif
   }
+  GNUNET_CONFIGURATION_destroy (testing_cfg);
 }
 
 
@@ -174,7 +175,6 @@
   if (data_file != NULL)
     GNUNET_DISK_file_close (data_file);
   GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
-  GNUNET_CONFIGURATION_destroy (testing_cfg);
 }