provide how many links succeeded and how many failed in test master callback

from GNUNET_TESTBED_run() and GNUNET_TESTBED_test_run() functions

diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index c7aea82e91990335b5459dac524d97d102ab26e2..863b7cc40a4176f2a1d20b452eff3e566fe05769 100644 (file)
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -803,9 +803,9 @@ GAS_addresses_update (struct GAS_Addresses_Handle *handle,
                        session_id, atsi, atsi_count);
   if (aa == NULL)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Tried to update unknown address for peer `%s' `%s' session id %u\n",
-                GNUNET_i2s (peer), plugin_name, session_id);
-    GNUNET_break (0);
+    /* GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Tried to update unknown address for peer `%s' `%s' session id %u\n", */
+    /*             GNUNET_i2s (peer), plugin_name, session_id); */
+    /* GNUNET_break (0); */
     return;
   }
 

diff --git a/src/consensus/gnunet-consensus-start-peers.c b/src/consensus/gnunet-consensus-start-peers.c
index fb7f047ae2be3bfff36a00559b21e71efe3157bf..ad88b0f083ec1e420192be506b9e0e45eabf2ab2 100644 (file)
--- a/src/consensus/gnunet-consensus-start-peers.c
+++ b/src/consensus/gnunet-consensus-start-peers.c
@@ -105,10 +105,24 @@ controller_cb(void *cls,
 
 
 
+/**
+ * Signature of a main function for a testcase.
+ *
+ * @param cls closure
+ * @param num_peers number of peers in 'peers'
+ * @param peers handle to peers run in the testbed.  NULL upon timeout (see
+ *          GNUNET_TESTBED_test_run()).
+ * @param links_succeeded the number of overlay link connection attempts that
+ *          succeeded
+ * @param links_failed the number of overlay link connection attempts that
+ *          failed
+ */
 static void
 test_master (void *cls,
              unsigned int num_peers,
-             struct GNUNET_TESTBED_Peer **started_peers)
+             struct GNUNET_TESTBED_Peer **started_peers,
+             unsigned int links_succeeded,
+             unsigned int links_failed)
 {
   int i;
 

diff --git a/src/consensus/gnunet-consensus.c b/src/consensus/gnunet-consensus.c
index 4525fc719117543c60889d59381e978f0dd5e3e5..2524a20caab7226597f1c29a06936a6d37014f49 100644 (file)
--- a/src/consensus/gnunet-consensus.c
+++ b/src/consensus/gnunet-consensus.c
@@ -276,10 +276,24 @@ peer_info_cb (void *cb_cls,
 }
 
 
+/**
+ * Signature of a main function for a testcase.
+ *
+ * @param cls closure
+ * @param num_peers number of peers in 'peers'
+ * @param peers handle to peers run in the testbed.  NULL upon timeout (see
+ *          GNUNET_TESTBED_test_run()).
+ * @param links_succeeded the number of overlay link connection attempts that
+ *          succeeded
+ * @param links_failed the number of overlay link connection attempts that
+ *          failed
+ */
 static void
 test_master (void *cls,
              unsigned int num_peers,
-             struct GNUNET_TESTBED_Peer **started_peers)
+             struct GNUNET_TESTBED_Peer **started_peers,
+             unsigned int links_succeeded,
+             unsigned int links_failed)
 {
   int i;
 

diff --git a/src/dht/dht_test_lib.c b/src/dht/dht_test_lib.c
index 365804b7190ee7df18d38186ff4c913b36a923aa..dbd3006a5cf0f7d6a1d12c9a1dbbc8b904a7988e 100644 (file)
--- a/src/dht/dht_test_lib.c
+++ b/src/dht/dht_test_lib.c
@@ -160,7 +160,9 @@ GNUNET_DHT_TEST_cleanup (struct GNUNET_DHT_TEST_Context *ctx)
 static void
 dht_test_run (void *cls,
              unsigned int num_peers,
-             struct GNUNET_TESTBED_Peer **peers)
+             struct GNUNET_TESTBED_Peer **peers,
+              unsigned int links_succeeded,
+              unsigned int links_failed)
 {
   struct GNUNET_DHT_TEST_Context *ctx = cls;
   unsigned int i;

diff --git a/src/dv/test_transport_blacklist.c b/src/dv/test_transport_blacklist.c
index 2adf45d4a163a78e69ba38c318d9c5518c1b9d24..e8cd5102b52cf3c72bb6d4ecf089ec708f514981 100644 (file)
--- a/src/dv/test_transport_blacklist.c
+++ b/src/dv/test_transport_blacklist.c
@@ -34,7 +34,9 @@ static int ok;
 static void
 test_connection (void *cls,
                 unsigned int num_peers,
-                struct GNUNET_TESTBED_Peer **peers)
+                struct GNUNET_TESTBED_Peer **peers,
+                 unsigned int links_succeeded,
+                 unsigned int links_failed)
 {
   if (4 == num_peers)
   {

diff --git a/src/dv/test_transport_dv.c b/src/dv/test_transport_dv.c
index c527827e87a7b504c50eecddbd403b69527dda86..13e9afa62384025d44910621b3cdbb33f6cbc123 100644 (file)
--- a/src/dv/test_transport_dv.c
+++ b/src/dv/test_transport_dv.c
@@ -34,7 +34,9 @@ static int ok;
 static void
 test_connection (void *cls,
                 unsigned int num_peers,
-                struct GNUNET_TESTBED_Peer **peers)
+                struct GNUNET_TESTBED_Peer **peers,
+                 unsigned int links_succeeded,
+                 unsigned int links_failed)
 {
   if (4 != num_peers)
   {

diff --git a/src/fs/gnunet-fs-profiler.c b/src/fs/gnunet-fs-profiler.c
index aeb84315a40a8ca707cfdf6345cb4c429c63247f..9bc3ff25345b2efdc47179ca04f3c8a364716912 100644 (file)
--- a/src/fs/gnunet-fs-profiler.c
+++ b/src/fs/gnunet-fs-profiler.c
@@ -130,9 +130,16 @@ terminate_task (void *cls,
  * @param cls closure
  * @param num_peers number of peers in 'peers'
  * @param peers handle to peers run in the testbed
+ * @param links_succeeded the number of overlay link connection attempts that
+ *          succeeded
+ * @param links_failed the number of overlay link connection attempts that
+ *          failed
  */
 static void
-test_master (void *cls, unsigned int num_peers, struct GNUNET_TESTBED_Peer **peers)
+test_master (void *cls, unsigned int num_peers, 
+             struct GNUNET_TESTBED_Peer **peers,
+             unsigned int links_succeeded,
+             unsigned int links_failed)
 {
   // const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
   // FIXME: enable clients to signal 'completion' before timeout;

diff --git a/src/fs/perf_gnunet_service_fs_p2p.c b/src/fs/perf_gnunet_service_fs_p2p.c
index 89db80c0b9eaa7d2c2762cddf7ccf60bc3cbddec..3a6b9fd030b504d1a5d5bc5835dc801e57ea7afb 100644 (file)
--- a/src/fs/perf_gnunet_service_fs_p2p.c
+++ b/src/fs/perf_gnunet_service_fs_p2p.c
@@ -306,7 +306,9 @@ do_download (void *cls,
 static void
 do_publish (void *cls, 
            unsigned int num_peers,
-           struct GNUNET_TESTBED_Peer **peers)
+           struct GNUNET_TESTBED_Peer **peers,
+            unsigned int links_succeeded,
+            unsigned int links_failed)
 {
   unsigned int i;
   int do_index;

diff --git a/src/fs/perf_gnunet_service_fs_p2p_respect.c b/src/fs/perf_gnunet_service_fs_p2p_respect.c
index 0a5dc057832e73fd10cad586979d4399a4bd96e1..35425a253426eaab146bb4f01a95e5daa7c888ea 100644 (file)
--- a/src/fs/perf_gnunet_service_fs_p2p_respect.c
+++ b/src/fs/perf_gnunet_service_fs_p2p_respect.c
@@ -435,7 +435,9 @@ do_publish1 (void *cls,
 static void
 do_connect (void *cls, 
            unsigned int num_peers,
-           struct GNUNET_TESTBED_Peer **peers)
+           struct GNUNET_TESTBED_Peer **peers,
+            unsigned int links_succeeded,
+            unsigned int links_failed)
 {
   static unsigned int coco;
   unsigned int i;

diff --git a/src/fs/test_fs_test_lib.c b/src/fs/test_fs_test_lib.c
index 2fe5a81405ec84785b1c8d4ec1c8ef4787ad3d5d..81625030dc197ca4c6751b1b45bcbb040353cfcb 100644 (file)
--- a/src/fs/test_fs_test_lib.c
+++ b/src/fs/test_fs_test_lib.c
@@ -117,11 +117,17 @@ do_publish (void *cls,
  * @param cls closure
  * @param num_peers number of peers in 'peers'
  * @param peers handle to peers run in the testbed
+ * @param links_succeeded the number of overlay link connection attempts that
+ *          succeeded
+ * @param links_failed the number of overlay link connection attempts that
+ *          failed
  */
 static void
 run (void *cls, 
      unsigned int num_peers,
-     struct GNUNET_TESTBED_Peer **peers)
+     struct GNUNET_TESTBED_Peer **peers,
+     unsigned int links_succeeded,
+     unsigned int links_failed)
 {
   unsigned int i;
  

diff --git a/src/fs/test_gnunet_service_fs_migration.c b/src/fs/test_gnunet_service_fs_migration.c
index 29129a580674a47bd3e83607f41468fb8b107036..138e35c47efbbbf9c656c9d2128b74c172cf4da5 100644 (file)
--- a/src/fs/test_gnunet_service_fs_migration.c
+++ b/src/fs/test_gnunet_service_fs_migration.c
@@ -162,7 +162,9 @@ do_wait (void *cls, const struct GNUNET_FS_Uri *uri,
 static void
 do_publish (void *cls, 
            unsigned int num_peers,
-           struct GNUNET_TESTBED_Peer **peers)
+           struct GNUNET_TESTBED_Peer **peers,
+            unsigned int links_succeeded,
+            unsigned int links_failed)
 {
   unsigned int i;
 

diff --git a/src/fs/test_gnunet_service_fs_p2p.c b/src/fs/test_gnunet_service_fs_p2p.c
index d293bd66d07ba81a1119b468306c3d94df24521f..108b4e6c9ec0b119463f90b6ec7f5018be00fb0c 100644 (file)
--- a/src/fs/test_gnunet_service_fs_p2p.c
+++ b/src/fs/test_gnunet_service_fs_p2p.c
@@ -115,7 +115,9 @@ do_download (void *cls, const struct GNUNET_FS_Uri *uri,
 static void
 do_publish (void *cls,
            unsigned int num_peers,
-           struct GNUNET_TESTBED_Peer **peers)
+           struct GNUNET_TESTBED_Peer **peers,
+            unsigned int links_succeeded,
+            unsigned int links_failed)
 {
   unsigned int i;
  

diff --git a/src/gns/test_gns_dht_three_peers.c b/src/gns/test_gns_dht_three_peers.c
index 49c94571f009bc76a35f9ea1a12eccb5bab468f4..ee2c36e3b4fe7619a765ab3d1ddca804fc5fc3e7 100644 (file)
--- a/src/gns/test_gns_dht_three_peers.c
+++ b/src/gns/test_gns_dht_three_peers.c
@@ -585,7 +585,9 @@ peerinfo_cb (void *cb_cls, struct GNUNET_TESTBED_Operation *op,
 
 void testbed_master (void *cls,
                      unsigned int num_peers,
-                     struct GNUNET_TESTBED_Peer **peers)
+                     struct GNUNET_TESTBED_Peer **peers,
+                     unsigned int links_succeeded,
+                     unsigned int links_failed)
 {
   GNUNET_assert (NULL != peers);
   cpeers = peers;

diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h
index 438227538b1b2d4dab4044910762775d90ef2d9e..5aa4bd7274e8856163edb0876a3f047f8e9171b1 100644 (file)
--- a/src/include/gnunet_testbed_service.h
+++ b/src/include/gnunet_testbed_service.h
@@ -1364,10 +1364,16 @@ GNUNET_TESTBED_get_statistics (unsigned int num_peers,
  * @param num_peers number of peers in 'peers'
  * @param peers handle to peers run in the testbed.  NULL upon timeout (see
  *          GNUNET_TESTBED_test_run()).
+ * @param links_succeeded the number of overlay link connection attempts that
+ *          succeeded
+ * @param links_failed the number of overlay link connection attempts that
+ *          failed
  */
 typedef void (*GNUNET_TESTBED_TestMaster)(void *cls,
                                           unsigned int num_peers,
-                                          struct GNUNET_TESTBED_Peer **peers);
+                                          struct GNUNET_TESTBED_Peer **peers,
+                                          unsigned int links_succeeded,
+                                          unsigned int links_failed);
 
 
 /**

diff --git a/src/mesh/mesh_test_lib.c b/src/mesh/mesh_test_lib.c
index cec74f2b51697e384ef552aa9a47c2ada65c831f..a40281a9f7c136425d6c4c86b27941d3a093b8ea 100644 (file)
--- a/src/mesh/mesh_test_lib.c
+++ b/src/mesh/mesh_test_lib.c
@@ -224,7 +224,9 @@ GNUNET_MESH_TEST_cleanup (struct GNUNET_MESH_TEST_Context *ctx)
 static void
 mesh_test_run (void *cls,
                unsigned int num_peers,
-               struct GNUNET_TESTBED_Peer **peers)
+               struct GNUNET_TESTBED_Peer **peers,
+               unsigned int links_succeeded,
+               unsigned int links_failed)
 {
   struct GNUNET_MESH_TEST_Context *ctx = cls;
   unsigned int i;

diff --git a/src/nse/gnunet-nse-profiler.c b/src/nse/gnunet-nse-profiler.c
index 9ed998c84df637a8fea5988ccee8113df677a3c6..0ba36749cee60c29b52f81fc7a8fa9e3bcd27561 100644 (file)
--- a/src/nse/gnunet-nse-profiler.c
+++ b/src/nse/gnunet-nse-profiler.c
@@ -768,11 +768,17 @@ master_controller_cb (void *cls,
  * @param num_peers_ number of peers in 'peers'
  * @param peers handle to peers run in the testbed.  NULL upon timeout (see
  *          GNUNET_TESTBED_test_run()).
+ * @param links_succeeded the number of overlay link connection attempts that
+ *          succeeded
+ * @param links_failed the number of overlay link connection attempts that
+ *          failed
  */
 static void 
 test_master (void *cls,
              unsigned int num_peers_,
-             struct GNUNET_TESTBED_Peer **peers)
+             struct GNUNET_TESTBED_Peer **peers,
+             unsigned int links_succeeded,
+             unsigned int links_failed)
 {
   if (NULL == peers)
   {

diff --git a/src/nse/test_nse_multipeer.c b/src/nse/test_nse_multipeer.c
index 2b8c367ce04f53e86eaeeab339274157364896d8..9ae3a7aac03d7088a1c1005f8ee70ffceb156744 100644 (file)
--- a/src/nse/test_nse_multipeer.c
+++ b/src/nse/test_nse_multipeer.c
@@ -181,11 +181,17 @@ nse_disconnect_adapter (void *cls,
  * @param cls closure
  * @param num_peers number of peers in 'peers'
  * @param peers handle to peers run in the testbed
+ * @param links_succeeded the number of overlay link connection attempts that
+ *          succeeded
+ * @param links_failed the number of overlay link connection attempts that
+ *          failed
  */
 static void
 run (void *cls,
      unsigned int num_peers,
-     struct GNUNET_TESTBED_Peer **peers)
+     struct GNUNET_TESTBED_Peer **peers,
+     unsigned int links_succeeded,
+     unsigned int links_failed)
 {
   unsigned int i;
 

diff --git a/src/stream/perf_stream_api.c b/src/stream/perf_stream_api.c
index aa534ce098ecc9d8e899f3690df7111fe0136ee6..aa54b6bfa71a3119b4d255247c11ea298f6c42d9 100644 (file)
--- a/src/stream/perf_stream_api.c
+++ b/src/stream/perf_stream_api.c
@@ -950,10 +950,16 @@ controller_event_cb (void *cls,
  * @param cls closure
  * @param num_peers number of peers in 'peers'
  * @param peers handle to peers run in the testbed
+ * @param links_succeeded the number of overlay link connection attempts that
+ *          succeeded
+ * @param links_failed the number of overlay link connection attempts that
+ *          failed
  */
 static void
 test_master (void *cls, unsigned int num_peers_,
-             struct GNUNET_TESTBED_Peer **peers)
+             struct GNUNET_TESTBED_Peer **peers,
+             unsigned int links_succeeded,
+             unsigned int links_failed)
 {
   GNUNET_assert (NULL != peers);
   GNUNET_assert (NULL != peers[0]);

diff --git a/src/stream/test_stream_2peers.c b/src/stream/test_stream_2peers.c
index 01264398028e1068c36d5a07c87966230e553b80..b920d4071e83c67f1cf5199c3fea02ccfa878787 100644 (file)
--- a/src/stream/test_stream_2peers.c
+++ b/src/stream/test_stream_2peers.c
@@ -618,10 +618,16 @@ controller_event_cb (void *cls,
  * @param cls closure
  * @param num_peers number of peers in 'peers'
  * @param peers handle to peers run in the testbed
+ * @param links_succeeded the number of overlay link connection attempts that
+ *          succeeded
+ * @param links_failed the number of overlay link connection attempts that
+ *          failed
  */
 static void
 test_master (void *cls, unsigned int num_peers,
-             struct GNUNET_TESTBED_Peer **peers)
+             struct GNUNET_TESTBED_Peer **peers,
+             unsigned int links_succeeded,
+             unsigned int links_failed)
 {
   GNUNET_assert (NULL != peers);
   GNUNET_assert (NULL != peers[0]);

diff --git a/src/stream/test_stream_2peers_halfclose.c b/src/stream/test_stream_2peers_halfclose.c
index 95f5aa9fafb942238d838b242dca14d3572bd94c..930a2429eea75a987d4b35278a9be6a4585f1ed4 100644 (file)
--- a/src/stream/test_stream_2peers_halfclose.c
+++ b/src/stream/test_stream_2peers_halfclose.c
@@ -842,10 +842,16 @@ controller_event_cb (void *cls,
  * @param cls closure
  * @param num_peers number of peers in 'peers'
  * @param peers handle to peers run in the testbed
+ * @param links_succeeded the number of overlay link connection attempts that
+ *          succeeded
+ * @param links_failed the number of overlay link connection attempts that
+ *          failed
  */
 static void
 test_master (void *cls, unsigned int num_peers,
-             struct GNUNET_TESTBED_Peer **peers)
+             struct GNUNET_TESTBED_Peer **peers,
+             unsigned int links_succeeded,
+             unsigned int links_failed)
 {
   GNUNET_assert (NULL != peers);
   GNUNET_assert (NULL != peers[0]);

diff --git a/src/testbed/gnunet-testbed-profiler.c b/src/testbed/gnunet-testbed-profiler.c
index 6c1c78032f6af80c8e84244d07ac9e8b41491dd6..a5a4c2350e8b25cf215f990d471138121b7584f0 100644 (file)
--- a/src/testbed/gnunet-testbed-profiler.c
+++ b/src/testbed/gnunet-testbed-profiler.c
@@ -204,9 +204,14 @@ controller_event_cb (void *cls,
  * @param cls closure
  * @param num_peers number of peers in 'peers'
  * @param peers handle to peers run in the testbed
+ * @param links_succeeded the number of overlay link connection attempts that
+ *          succeeded
+ * @param links_failed the number of overlay link
  */
 static void
-test_run (void *cls, unsigned int num_peers, struct GNUNET_TESTBED_Peer **peers)
+test_run (void *cls, unsigned int num_peers, struct GNUNET_TESTBED_Peer **peers,
+          unsigned int links_succeeded,
+          unsigned int links_failed)
 {
   result = GNUNET_OK;
   fprintf (stdout, "\n");

diff --git a/src/testbed/test_testbed_api_statistics.c b/src/testbed/test_testbed_api_statistics.c
index 619719207d9ed710535fec8718e3df55128f4ad1..82b85f700b87c7fb18b595b57b3d22ecb124cad7 100644 (file)
--- a/src/testbed/test_testbed_api_statistics.c
+++ b/src/testbed/test_testbed_api_statistics.c
@@ -151,11 +151,17 @@ op_comp_cb (void *cls,
  *
  * @param cls closure
  * @param num_peers number of peers in 'peers'
- * @param peers handle to peers run in the testbed
+ * @param peers_ handle to peers run in the testbed
+ * @param links_succeeded the number of overlay link connection attempts that
+ *          succeeded
+ * @param links_failed the number of overlay link connection attempts that
+ *          failed
  */
 static void
 test_master (void *cls, unsigned int num_peers,
-             struct GNUNET_TESTBED_Peer **peers_)
+             struct GNUNET_TESTBED_Peer **peers_,
+             unsigned int links_succeeded,
+             unsigned int links_failed)
 {
   FAIL_TEST (NUM_PEERS == num_peers, return);
   peers = peers_;

diff --git a/src/testbed/test_testbed_api_test.c b/src/testbed/test_testbed_api_test.c
index 464d07b54a9c616976011643b2a61f3af95f940c..91c6fe637a0fa8459a56f2425ccc5e97929d44e3 100644 (file)
--- a/src/testbed/test_testbed_api_test.c
+++ b/src/testbed/test_testbed_api_test.c
@@ -194,11 +194,17 @@ controller_event_cb (void *cls,
  *
  * @param cls closure
  * @param num_peers number of peers in 'peers'
- * @param peers handle to peers run in the testbed
+ * @param peers- handle to peers run in the testbed
+ * @param links_succeeded the number of overlay link connection attempts that
+ *          succeeded
+ * @param links_failed the number of overlay link connection attempts that
+ *          failed
  */
 static void
 test_master (void *cls, unsigned int num_peers,
-             struct GNUNET_TESTBED_Peer **peers_)
+             struct GNUNET_TESTBED_Peer **peers_,
+             unsigned int links_succeeded,
+             unsigned int links_failed)
 {
   unsigned int peer;
 

diff --git a/src/testbed/test_testbed_api_test_timeout.c b/src/testbed/test_testbed_api_test_timeout.c
index 537837536ff839dbcfe9fc045aa6487afe1625c0..4f077e1eee336dc2fd1d29e86961255a3d7ed1a7 100644 (file)
--- a/src/testbed/test_testbed_api_test_timeout.c
+++ b/src/testbed/test_testbed_api_test_timeout.c
@@ -79,11 +79,17 @@ controller_event_cb (void *cls,
  *
  * @param cls closure
  * @param num_peers number of peers in 'peers'
- * @param peers handle to peers run in the testbed
+ * @param peers- handle to peers run in the testbed
+ * @param links_succeeded the number of overlay link connection attempts that
+ *          succeeded
+ * @param links_failed the number of overlay link connection attempts that
+ *          failed
  */
 static void
 test_master (void *cls, unsigned int num_peers,
-             struct GNUNET_TESTBED_Peer **peers_)
+             struct GNUNET_TESTBED_Peer **peers_,
+             unsigned int links_succeeded,
+             unsigned int links_failed)
 {
   FAIL_TEST (NULL == cls);
   FAIL_TEST (0 == num_peers);

diff --git a/src/testbed/test_testbed_api_testbed_run.c b/src/testbed/test_testbed_api_testbed_run.c
index a27d8b0649dc42ac4d319f04b6ca137ac17b616a..7777988f3c9856daf7af1ddce308c2fd9d3eab22 100644 (file)
--- a/src/testbed/test_testbed_api_testbed_run.c
+++ b/src/testbed/test_testbed_api_testbed_run.c
@@ -94,11 +94,17 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  *
  * @param cls closure
  * @param num_peers number of peers in 'peers'
- * @param peers handle to peers run in the testbed
+ * @param peers_ handle to peers run in the testbed
+ * @param links_succeeded the number of overlay link connection attempts that
+ *          succeeded
+ * @param links_failed the number of overlay link connection attempts that
+ *          failed
  */
 static void
 test_master (void *cls, unsigned int num_peers,
-             struct GNUNET_TESTBED_Peer **peers_)
+             struct GNUNET_TESTBED_Peer **peers_,
+             unsigned int links_succeeded,
+             unsigned int links_failed)
 {
   result = GNUNET_OK;
   GNUNET_assert (NULL != peers[0]);

diff --git a/src/testbed/test_testbed_api_topology.c b/src/testbed/test_testbed_api_topology.c
index 0098dbea4cfde45103c44ddc5ba0c5cc79b5e513..87fe1cb5cb897adc3671092bc77928a83f935a73 100644 (file)
--- a/src/testbed/test_testbed_api_topology.c
+++ b/src/testbed/test_testbed_api_topology.c
@@ -119,11 +119,17 @@ controller_event_cb (void *cls,
  *
  * @param cls closure
  * @param num_peers number of peers in 'peers'
- * @param peers handle to peers run in the testbed
+ * @param peers_ handle to peers run in the testbed
+ * @param links_succeeded the number of overlay link connection attempts that
+ *          succeeded
+ * @param links_failed the number of overlay link connection attempts that
+ *          failed
  */
 static void
 test_master (void *cls, unsigned int num_peers,
-             struct GNUNET_TESTBED_Peer **peers_)
+             struct GNUNET_TESTBED_Peer **peers_,
+             unsigned int links_succeeded,
+             unsigned int links_failed)
 {
   unsigned int peer;
 

diff --git a/src/testbed/test_testbed_api_topology_clique.c b/src/testbed/test_testbed_api_topology_clique.c
index 3f1ed7adecfc54a429469436664a9e93c339e68a..dc3a2364c5063f8749d7a71aab0f9958935242d3 100644 (file)
--- a/src/testbed/test_testbed_api_topology_clique.c
+++ b/src/testbed/test_testbed_api_topology_clique.c
@@ -114,11 +114,17 @@ controller_event_cb (void *cls,
  *
  * @param cls closure
  * @param num_peers number of peers in 'peers'
- * @param peers handle to peers run in the testbed
+ * @param peers_ handle to peers run in the testbed
+ * @param links_succeeded the number of overlay link connection attempts that
+ *          succeeded
+ * @param links_failed the number of overlay link connection attempts that
+ *          failed
  */
 static void
 test_master (void *cls, unsigned int num_peers,
-             struct GNUNET_TESTBED_Peer **peers_)
+             struct GNUNET_TESTBED_Peer **peers_,
+             unsigned int links_succeeded,
+             unsigned int links_failed)
 {
   unsigned int peer;
 

diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c
index 948cf4d5568e0b3522b30a60d1cc9f941c11cdac..95f9d3a56f50c28b3b2dc04b38e136a2ed67feb7 100644 (file)
--- a/src/testbed/testbed_api_testbed.c
+++ b/src/testbed/testbed_api_testbed.c
@@ -295,6 +295,16 @@ struct RunContext
    */
   unsigned int random_links;
 
+  /**
+   * the number of overlay link connection attempts that succeeded
+   */
+  unsigned int links_succeeded;
+
+  /**
+   * the number of overlay link connection attempts that failed
+   */
+  unsigned int links_failed;
+
 };
 
 
@@ -540,7 +550,8 @@ call_master (struct RunContext *rc)
   GNUNET_SCHEDULER_cancel (rc->timeout_task);
   rc->timeout_task = GNUNET_SCHEDULER_NO_TASK;
   if (NULL != rc->test_master)
-    rc->test_master (rc->test_master_cls, rc->num_peers, rc->peers);
+    rc->test_master (rc->test_master_cls, rc->num_peers, rc->peers,
+                     rc->links_succeeded, rc->links_failed);
 }
 
 
@@ -562,6 +573,8 @@ topology_completion_callback (void *cls, unsigned int nsuccess,
   DEBUG ("Overlay topology generated in %s\n", prof_time (rc));
   GNUNET_TESTBED_operation_done (rc->topology_operation);
   rc->topology_operation = NULL;
+  rc->links_succeeded = nsuccess;
+  rc->links_failed = nfailures;
   rc->state = RC_READY;
   call_master (rc);
 }
@@ -1001,7 +1014,7 @@ timeout_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   LOG (GNUNET_ERROR_TYPE_ERROR, _("Shutting down testbed due to timeout while setup.\n"));
   shutdown_now (rc);
    if (NULL != rc->test_master)
-    rc->test_master (rc->test_master_cls, 0, NULL);
+     rc->test_master (rc->test_master_cls, 0, NULL, 0, 0);
    rc->test_master = NULL;
 }
 

diff --git a/src/topology/test_gnunet_daemon_topology.c b/src/topology/test_gnunet_daemon_topology.c
index 99734ca8f07b8ea9978297242e186ea0b733e700..1a6b147735f355cccc465907bac3249f05673cde 100644 (file)
--- a/src/topology/test_gnunet_daemon_topology.c
+++ b/src/topology/test_gnunet_daemon_topology.c
@@ -64,7 +64,9 @@ notify_connect_complete (void *cls,
 static void
 do_connect (void *cls, 
            unsigned int num_peers,
-           struct GNUNET_TESTBED_Peer **peers)
+           struct GNUNET_TESTBED_Peer **peers,
+            unsigned int links_succeeded,
+            unsigned int links_failed)
 {
   unsigned int i;