projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-fix channel data range to make -1 legal value
[oweals/gnunet.git]
/
src
/
testbed
/
test_testbed_api_topology_clique.c
diff --git
a/src/testbed/test_testbed_api_topology_clique.c
b/src/testbed/test_testbed_api_topology_clique.c
index 30cce6c0d036fc94cc78eeab92253ddbc0cd6ee8..658e33ab9e42fdd35f651469162bebac05daac00 100644
(file)
--- a/
src/testbed/test_testbed_api_topology_clique.c
+++ b/
src/testbed/test_testbed_api_topology_clique.c
@@
-25,7
+25,7
@@
*/
#include "platform.h"
*/
#include "platform.h"
-#include "gnunet_
common
.h"
+#include "gnunet_
util_lib
.h"
#include "gnunet_testbed_service.h"
/**
#include "gnunet_testbed_service.h"
/**
@@
-114,6
+114,7
@@
controller_event_cb (void *cls,
* Signature of a main function for a testcase.
*
* @param cls closure
* Signature of a main function for a testcase.
*
* @param cls closure
+ * @param h the run handle
* @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
* @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
@@
-122,7
+123,9
@@
controller_event_cb (void *cls,
* failed
*/
static void
* failed
*/
static void
-test_master (void *cls, unsigned int num_peers,
+test_master (void *cls,
+ struct GNUNET_TESTBED_RunHandle *h,
+ unsigned int num_peers,
struct GNUNET_TESTBED_Peer **peers_,
unsigned int links_succeeded,
unsigned int links_failed)
struct GNUNET_TESTBED_Peer **peers_,
unsigned int links_succeeded,
unsigned int links_failed)
@@
-130,8
+133,12
@@
test_master (void *cls, unsigned int num_peers,
unsigned int peer;
GNUNET_assert (NULL == cls);
unsigned int peer;
GNUNET_assert (NULL == cls);
+ if (NULL == peers_)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failing test due to timeout\n");
+ return;
+ }
GNUNET_assert (NUM_PEERS == num_peers);
GNUNET_assert (NUM_PEERS == num_peers);
- GNUNET_assert (NULL != peers_);
for (peer = 0; peer < num_peers; peer++)
GNUNET_assert (NULL != peers_[peer]);
peers = peers_;
for (peer = 0; peer < num_peers; peer++)
GNUNET_assert (NULL != peers_[peer]);
peers = peers_;