diff options
author | Nathan S. Evans <evans@in.tum.de> | 2011-03-16 15:11:42 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2011-03-16 15:11:42 +0000 |
commit | 61680474f3b08cb9444e7ddff156b44e65cb4444 (patch) | |
tree | 2cb88f4db925b40d8af2531571d4d9355d66729c /src/dht | |
parent | 188eadf9c6555fa9649af96fcea25bdc5e06ab4d (diff) | |
download | gnunet-61680474f3b08cb9444e7ddff156b44e65cb4444.tar.gz gnunet-61680474f3b08cb9444e7ddff156b44e65cb4444.zip |
formatting
Diffstat (limited to 'src/dht')
-rw-r--r-- | src/dht/gnunet-dht-driver.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/dht/gnunet-dht-driver.c b/src/dht/gnunet-dht-driver.c index d12cc91df..21dc9c9d0 100644 --- a/src/dht/gnunet-dht-driver.c +++ b/src/dht/gnunet-dht-driver.c | |||
@@ -2927,11 +2927,11 @@ repeat_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc) | |||
2927 | */ | 2927 | */ |
2928 | static void | 2928 | static void |
2929 | topology_callback(void *cls, const struct GNUNET_PeerIdentity *first, | 2929 | topology_callback(void *cls, const struct GNUNET_PeerIdentity *first, |
2930 | const struct GNUNET_PeerIdentity *second, uint32_t distance, | 2930 | const struct GNUNET_PeerIdentity *second, uint32_t distance, |
2931 | const struct GNUNET_CONFIGURATION_Handle *first_cfg, | 2931 | const struct GNUNET_CONFIGURATION_Handle *first_cfg, |
2932 | const struct GNUNET_CONFIGURATION_Handle *second_cfg, | 2932 | const struct GNUNET_CONFIGURATION_Handle *second_cfg, |
2933 | struct GNUNET_TESTING_Daemon *first_daemon, | 2933 | struct GNUNET_TESTING_Daemon *first_daemon, |
2934 | struct GNUNET_TESTING_Daemon *second_daemon, const char *emsg) | 2934 | struct GNUNET_TESTING_Daemon *second_daemon, const char *emsg) |
2935 | { | 2935 | { |
2936 | struct TopologyIteratorContext *topo_ctx; | 2936 | struct TopologyIteratorContext *topo_ctx; |
2937 | unsigned long long duration; | 2937 | unsigned long long duration; |
@@ -3214,12 +3214,14 @@ peers_started_callback(void *cls, const struct GNUNET_PeerIdentity *id, | |||
3214 | static void | 3214 | static void |
3215 | create_topology() | 3215 | create_topology() |
3216 | { | 3216 | { |
3217 | unsigned int create_expected_connections; | ||
3217 | peers_left = num_peers; /* Reset counter */ | 3218 | peers_left = num_peers; /* Reset counter */ |
3218 | if (GNUNET_TESTING_create_topology (pg, topology, blacklist_topology, | 3219 | create_expected_connections = GNUNET_TESTING_create_topology (pg, topology, blacklist_topology, |
3219 | blacklist_transports) != GNUNET_SYSERR) | 3220 | blacklist_transports); |
3221 | if (create_expected_connections > 0) | ||
3220 | { | 3222 | { |
3221 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 3223 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
3222 | "Topology set up, now starting peers!\n"); | 3224 | "Topology set up, have %u expected connections, now starting peers!\n", create_expected_connections); |
3223 | GNUNET_TESTING_daemons_continue_startup (pg); | 3225 | GNUNET_TESTING_daemons_continue_startup (pg); |
3224 | } | 3226 | } |
3225 | else | 3227 | else |