From: Sree Harsha Totakura <totakura@in.tum.de>
Date: Mon, 22 Oct 2012 21:30:14 +0000 (+0000)
Subject: fixes
X-Git-Tag: initial-import-from-subversion-38251~11267
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3b783e10af83330955ea73f4d50831a59bacf3b2;p=oweals%2Fgnunet.git

fixes
---

diff --git a/src/testbed/gnunet-testbed-profiler.c b/src/testbed/gnunet-testbed-profiler.c
index 8e02a55f8..5a674c89d 100644
--- a/src/testbed/gnunet-testbed-profiler.c
+++ b/src/testbed/gnunet-testbed-profiler.c
@@ -333,7 +333,7 @@ peer_churn_cb (void *cls, const char *emsg)
             num_peers, ((double) prof_time.rel_value) / 1000.00);
     fflush (stdout);
     result = GNUNET_OK;
-    if (0 == num_links)
+    if ((0 == num_links) && (topology == GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI))
     {      
       shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
       return;
@@ -802,7 +802,7 @@ main (int argc, char *const *argv)
       gettext_noop ("Try to acheive TOPOLOGY. This options takes either CLIQUE "
                     "or RANDOM. For CLIQUE the parameter -n is ignored. The "
                     "default is to acheive a random graph topology."),
-      GNUNET_YES, &GNUNET_GETOPT_set_string, &topology },
+      GNUNET_YES, &set_topology, &topology },
     GNUNET_GETOPT_OPTION_END
   };
   int ret;