From: Nathan S. Evans <evans@in.tum.de>
Date: Wed, 23 Jun 2010 09:12:26 +0000 (+0000)
Subject: don't stop churned peers, clean up files
X-Git-Tag: initial-import-from-subversion-38251~21267
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7c16cd31adbefb4a11cf94b051568500a13ca355;p=oweals%2Fgnunet.git

don't stop churned peers, clean up files
---

diff --git a/src/testing/testing.c b/src/testing/testing.c
index c21650300..92eefa76e 100644
--- a/src/testing/testing.c
+++ b/src/testing/testing.c
@@ -951,6 +951,23 @@ GNUNET_TESTING_daemon_stop (struct GNUNET_TESTING_Daemon *d,
       return;
     }
 
+  if ((d->running == GNUNET_NO) && (d->churn == GNUNET_YES)) /* Peer has already been stopped in churn context! */
+    {
+      /* Free what was left from churning! */
+      GNUNET_assert(d->cfg != NULL);
+      GNUNET_CONFIGURATION_destroy (d->cfg);
+      if (delete_files == GNUNET_YES)
+        {
+          UNLINK(d->cfgfile);
+        }
+      GNUNET_free (d->cfgfile);
+      GNUNET_free_non_null (d->hostname);
+      GNUNET_free_non_null (d->username);
+      if (NULL != d->dead_cb)
+        d->dead_cb (d->dead_cb_cls, NULL);
+      return;
+    }
+
   del_arg = NULL;
   if (delete_files == GNUNET_YES)
     {