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_clique.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_clique.c')
-rw-r--r-- | src/testbed/test_testbed_api_topology_clique.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/testbed/test_testbed_api_topology_clique.c b/src/testbed/test_testbed_api_topology_clique.c index 30cce6c0d..9270f8f78 100644 --- a/src/testbed/test_testbed_api_topology_clique.c +++ b/src/testbed/test_testbed_api_topology_clique.c | |||
@@ -114,6 +114,7 @@ controller_event_cb (void *cls, | |||
114 | * Signature of a main function for a testcase. | 114 | * Signature of a main function for a testcase. |
115 | * | 115 | * |
116 | * @param cls closure | 116 | * @param cls closure |
117 | * @param h the run handle | ||
117 | * @param num_peers number of peers in 'peers' | 118 | * @param num_peers number of peers in 'peers' |
118 | * @param peers_ handle to peers run in the testbed | 119 | * @param peers_ handle to peers run in the testbed |
119 | * @param links_succeeded the number of overlay link connection attempts that | 120 | * @param links_succeeded the number of overlay link connection attempts that |
@@ -122,7 +123,9 @@ controller_event_cb (void *cls, | |||
122 | * failed | 123 | * failed |
123 | */ | 124 | */ |
124 | static void | 125 | static void |
125 | test_master (void *cls, unsigned int num_peers, | 126 | test_master (void *cls, |
127 | struct GNUNET_TESTBED_RunHandle *h, | ||
128 | unsigned int num_peers, | ||
126 | struct GNUNET_TESTBED_Peer **peers_, | 129 | struct GNUNET_TESTBED_Peer **peers_, |
127 | unsigned int links_succeeded, | 130 | unsigned int links_succeeded, |
128 | unsigned int links_failed) | 131 | unsigned int links_failed) |
@@ -130,8 +133,12 @@ test_master (void *cls, unsigned int num_peers, | |||
130 | unsigned int peer; | 133 | unsigned int peer; |
131 | 134 | ||
132 | GNUNET_assert (NULL == cls); | 135 | GNUNET_assert (NULL == cls); |
136 | if (NULL == peers_) | ||
137 | { | ||
138 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failing test due to timeout\n"); | ||
139 | return; | ||
140 | } | ||
133 | GNUNET_assert (NUM_PEERS == num_peers); | 141 | GNUNET_assert (NUM_PEERS == num_peers); |
134 | GNUNET_assert (NULL != peers_); | ||
135 | for (peer = 0; peer < num_peers; peer++) | 142 | for (peer = 0; peer < num_peers; peer++) |
136 | GNUNET_assert (NULL != peers_[peer]); | 143 | GNUNET_assert (NULL != peers_[peer]); |
137 | peers = peers_; | 144 | peers = peers_; |