Random graph topology

2 files changed, 27 insertions, 7 deletions

diff --git a/src/testbed/test_testbed_api_topology.c b/src/testbed/test_testbed_api_topology.c
index 27f508cd9..9679e0cdb 100644
--- a/src/testbed/test_testbed_api_topology.c
+++ b/src/testbed/test_testbed_api_topology.c
@@ -31,7 +31,7 @@
 /**
  * Number of peers we want to start
  */
-#define NUM_PEERS 5
+#define NUM_PEERS 100
 
 /**
  * Array of peers
@@ -85,7 +85,7 @@ controller_event_cb (void *cls,
   {
   case GNUNET_TESTBED_ET_CONNECT:
     overlay_connects++;
-    if ((NUM_PEERS - 1) == overlay_connects)
+    if ((NUM_PEERS) == overlay_connects)
     {
       result = GNUNET_OK;
       GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
@@ -125,7 +125,8 @@ test_master (void *cls, unsigned int num_peers,
   peers = peers_;
   overlay_connects = 0;
   op = GNUNET_TESTBED_overlay_configure_topology (NULL, NUM_PEERS, peers,
-                                                  GNUNET_TESTBED_TOPOLOGY_LINE);
+                                                  GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI,
+                                                  NUM_PEERS);
   GNUNET_assert (NULL != op);
 }
 
diff --git a/src/testbed/testbed_api_topology.c b/src/testbed/testbed_api_topology.c
index f7aa2ed5b..05537e2e1 100644
--- a/src/testbed/testbed_api_topology.c
+++ b/src/testbed/testbed_api_topology.c
@@ -225,7 +225,7 @@ GNUNET_TESTBED_overlay_configure_topology_va (void *op_cls,
   struct TopologyContext *tc;
   struct GNUNET_TESTBED_Operation *op;
   struct GNUNET_TESTBED_Controller *c;
-  unsigned int p;
+  unsigned int cnt;
 
   if (num_peers < 2)
     return NULL;
@@ -238,10 +238,29 @@ GNUNET_TESTBED_overlay_configure_topology_va (void *op_cls,
     tc->link_array_size = num_peers - 1;
     tc->link_array = GNUNET_malloc (sizeof (struct OverlayLink) *
                                     tc->link_array_size);
-    for (p=1; p < num_peers; p++)
+    for (cnt=1; cnt < num_peers; cnt++)
+    {
+      tc->link_array[cnt-1].A = cnt-1;
+      tc->link_array[cnt-1].B = cnt;
+    }
+    break;
+  case GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI:
+    tc->link_array_size = va_arg (va, unsigned int);
+    tc->link_array = GNUNET_malloc (sizeof (struct OverlayLink) *
+                                    tc->link_array_size);
+    for (cnt = 0; cnt < tc->link_array_size; cnt++)
     {
-      tc->link_array[p-1].A = p-1;
-      tc->link_array[p-1].B = p;
+      uint32_t A_rand;
+      uint32_t B_rand;
+      
+      do {
+        A_rand = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
+                                           num_peers);
+        B_rand = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
+                                           num_peers);
+      } while (A_rand == B_rand);      
+      tc->link_array[cnt].A = A_rand;
+      tc->link_array[cnt].B = B_rand;
     }
     break;
   default: