diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2013-09-06 14:38:24 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2013-09-06 14:38:24 +0000 |
commit | 2ca4b8a208f6f910c819bbaa6785a25ae2955501 (patch) | |
tree | 7328fb7cfc62189197dfa34035502a80b0acdcd3 /src/testbed/test_testbed_api_topology.c | |
parent | 8d46a214ce11653b5160d32e330786fa487e3ae6 (diff) | |
download | gnunet-2ca4b8a208f6f910c819bbaa6785a25ae2955501.tar.gz gnunet-2ca4b8a208f6f910c819bbaa6785a25ae2955501.zip |
- give out run handle through which master controller's handle can be retrieved
Diffstat (limited to 'src/testbed/test_testbed_api_topology.c')
-rw-r--r-- | src/testbed/test_testbed_api_topology.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/testbed/test_testbed_api_topology.c b/src/testbed/test_testbed_api_topology.c index e8f1c55be..a435ce0f7 100644 --- a/src/testbed/test_testbed_api_topology.c +++ b/src/testbed/test_testbed_api_topology.c | |||
@@ -119,6 +119,7 @@ controller_event_cb (void *cls, | |||
119 | * Signature of a main function for a testcase. | 119 | * Signature of a main function for a testcase. |
120 | * | 120 | * |
121 | * @param cls closure | 121 | * @param cls closure |
122 | * @param h the run handle | ||
122 | * @param num_peers number of peers in 'peers' | 123 | * @param num_peers number of peers in 'peers' |
123 | * @param peers_ handle to peers run in the testbed | 124 | * @param peers_ handle to peers run in the testbed |
124 | * @param links_succeeded the number of overlay link connection attempts that | 125 | * @param links_succeeded the number of overlay link connection attempts that |
@@ -127,7 +128,9 @@ controller_event_cb (void *cls, | |||
127 | * failed | 128 | * failed |
128 | */ | 129 | */ |
129 | static void | 130 | static void |
130 | test_master (void *cls, unsigned int num_peers, | 131 | test_master (void *cls, |
132 | struct GNUNET_TESTBED_RunHandle *h, | ||
133 | unsigned int num_peers, | ||
131 | struct GNUNET_TESTBED_Peer **peers_, | 134 | struct GNUNET_TESTBED_Peer **peers_, |
132 | unsigned int links_succeeded, | 135 | unsigned int links_succeeded, |
133 | unsigned int links_failed) | 136 | unsigned int links_failed) |
@@ -135,8 +138,12 @@ test_master (void *cls, unsigned int num_peers, | |||
135 | unsigned int peer; | 138 | unsigned int peer; |
136 | 139 | ||
137 | GNUNET_assert (NULL == cls); | 140 | GNUNET_assert (NULL == cls); |
141 | if (NULL == peers_) | ||
142 | { | ||
143 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failing test due to timeout\n"); | ||
144 | return; | ||
145 | } | ||
138 | GNUNET_assert (NUM_PEERS == num_peers); | 146 | GNUNET_assert (NUM_PEERS == num_peers); |
139 | GNUNET_assert (NULL != peers_); | ||
140 | for (peer = 0; peer < num_peers; peer++) | 147 | for (peer = 0; peer < num_peers; peer++) |
141 | GNUNET_assert (NULL != peers_[peer]); | 148 | GNUNET_assert (NULL != peers_[peer]); |
142 | peers = peers_; | 149 | peers = peers_; |