[GNUnet-SVN] r31803 - gnunet/src/testbed

[gnunet]

Author: harsha
Date: 2014-01-06 23:44:10 +0100 (Mon, 06 Jan 2014)
New Revision: 31803

Modified:
   gnunet/src/testbed/generate-underlay-topology.c
   gnunet/src/testbed/testbed_api_topology.c
Log:
-fixes

Modified: gnunet/src/testbed/generate-underlay-topology.c
===================================================================
--- gnunet/src/testbed/generate-underlay-topology.c     2014-01-06 16:37:21 UTC 
(rev 31802)
+++ gnunet/src/testbed/generate-underlay-topology.c     2014-01-06 22:44:10 UTC 
(rev 31803)
@@ -72,7 +72,7 @@
                 unsigned int latency,
                 unsigned int loss)
 {
-  GNUNET_break (0);
+  FPRINTF (stdout, "%u -> %u\n", A, B);
   return GNUNET_OK;
 }
 
@@ -166,7 +166,7 @@
     }
     break;
   default:
-    GNUNET_assert (0);
+    break;
   }
   /* contruct topologies */
   switch (topology)
@@ -209,6 +209,9 @@
 main (int argc, char *const argv[])
 {
   struct GNUNET_GETOPT_CommandLineOption option[] = {
+    {'p', "num-peers", "COUNT",
+     gettext_noop ("create COUNT number of peers"),
+     GNUNET_YES, &GNUNET_GETOPT_set_uint, &num_peers},
     GNUNET_GETOPT_OPTION_END
   };
   int ret;

Modified: gnunet/src/testbed/testbed_api_topology.c
===================================================================
--- gnunet/src/testbed/testbed_api_topology.c   2014-01-06 16:37:21 UTC (rev 
31802)
+++ gnunet/src/testbed/testbed_api_topology.c   2014-01-06 22:44:10 UTC (rev 
31803)
@@ -725,6 +725,8 @@
   uint32_t A_rand;
   uint32_t B_rand;
 
+  if (1 == tc->num_peers)
+    return;
   if (GNUNET_YES == append)
   {
     index = tc->link_array_size;
@@ -1468,6 +1470,7 @@
   GNUNET_assert (NULL != proc);
   ret = GNUNET_OK;
   memset (&tc, 0, sizeof (tc));
+  tc.num_peers = num_peers;
   tc.type = TOPOLOGYCONTEXT_TYPE_UNDERLAY;
   underlay = &tc.u.underlay;
   va_start (vargs, cls);