diff options
author | Nathan S. Evans <evans@in.tum.de> | 2010-11-23 12:16:34 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2010-11-23 12:16:34 +0000 |
commit | 863b75bc36dcc84c31ea5b1c194fcc1dd9bd4094 (patch) | |
tree | d64ca996d7a9eab5a84d948de04582bac0e68f7d | |
parent | b37e8c1c0eda90b626076167387e2bd7cbe2d559 (diff) | |
download | gnunet-863b75bc36dcc84c31ea5b1c194fcc1dd9bd4094.tar.gz gnunet-863b75bc36dcc84c31ea5b1c194fcc1dd9bd4094.zip |
bad ordering for config values
-rw-r--r-- | src/dht/gnunet-dht-driver.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/dht/gnunet-dht-driver.c b/src/dht/gnunet-dht-driver.c index 0d7c5b092..061d93a86 100644 --- a/src/dht/gnunet-dht-driver.c +++ b/src/dht/gnunet-dht-driver.c | |||
@@ -2576,6 +2576,16 @@ run (void *cls, | |||
2576 | return; | 2576 | return; |
2577 | } | 2577 | } |
2578 | 2578 | ||
2579 | /* Get number of peers to start from configuration */ | ||
2580 | if (GNUNET_SYSERR == | ||
2581 | GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "num_peers", | ||
2582 | &num_peers)) | ||
2583 | { | ||
2584 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | ||
2585 | "Number of peers must be specified in section %s option %s\n", "TESTING", "NUM_PEERS"); | ||
2586 | } | ||
2587 | GNUNET_assert(num_peers > 0 && num_peers < ULONG_MAX); | ||
2588 | |||
2579 | /** | 2589 | /** |
2580 | * Get DHT specific testing options. | 2590 | * Get DHT specific testing options. |
2581 | */ | 2591 | */ |
@@ -3053,15 +3063,6 @@ run (void *cls, | |||
3053 | GNUNET_free_non_null(topology_str); | 3063 | GNUNET_free_non_null(topology_str); |
3054 | GNUNET_free_non_null(blacklist_topology_str); | 3064 | GNUNET_free_non_null(blacklist_topology_str); |
3055 | 3065 | ||
3056 | /* Get number of peers to start from configuration */ | ||
3057 | if (GNUNET_SYSERR == | ||
3058 | GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "num_peers", | ||
3059 | &num_peers)) | ||
3060 | { | ||
3061 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | ||
3062 | "Number of peers must be specified in section %s option %s\n", "TESTING", "NUM_PEERS"); | ||
3063 | } | ||
3064 | GNUNET_assert(num_peers > 0 && num_peers < ULONG_MAX); | ||
3065 | /* Set peers_left so we know when all peers started */ | 3066 | /* Set peers_left so we know when all peers started */ |
3066 | peers_left = num_peers; | 3067 | peers_left = num_peers; |
3067 | 3068 | ||