diff options
Diffstat (limited to 'src/testing/test_testing_topology.c')
-rw-r--r-- | src/testing/test_testing_topology.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/testing/test_testing_topology.c b/src/testing/test_testing_topology.c index deaeae457..ba092220a 100644 --- a/src/testing/test_testing_topology.c +++ b/src/testing/test_testing_topology.c | |||
@@ -999,7 +999,6 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
999 | char *blacklist_topology_str; | 999 | char *blacklist_topology_str; |
1000 | char *connect_topology_option_str; | 1000 | char *connect_topology_option_str; |
1001 | char *connect_topology_option_modifier_string; | 1001 | char *connect_topology_option_modifier_string; |
1002 | unsigned long long temp_settle; | ||
1003 | unsigned long long max_outstanding_connections; | 1002 | unsigned long long max_outstanding_connections; |
1004 | 1003 | ||
1005 | ok = 1; | 1004 | ok = 1; |
@@ -1101,21 +1100,21 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
1101 | GNUNET_free_non_null (topology_str); | 1100 | GNUNET_free_non_null (topology_str); |
1102 | GNUNET_free_non_null (blacklist_topology_str); | 1101 | GNUNET_free_non_null (blacklist_topology_str); |
1103 | 1102 | ||
1104 | if (GNUNET_OK == | 1103 | if (GNUNET_OK != |
1105 | GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "settle_time", | 1104 | GNUNET_CONFIGURATION_get_value_time (cfg, "testing", "SETTLE_TIME", |
1106 | &temp_settle)) | 1105 | &settle_time)) |
1107 | settle_time = | 1106 | { |
1108 | GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, temp_settle); | 1107 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Must provide option %s:%s!\n", |
1109 | 1108 | "testing", "SETTLE_TIME"); | |
1110 | if (GNUNET_OK == | 1109 | return; |
1111 | GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "connect_timeout", | 1110 | } |
1112 | &temp_settle)) | 1111 | |
1113 | connect_timeout = | 1112 | if (GNUNET_OK != |
1114 | GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, temp_settle); | 1113 | GNUNET_CONFIGURATION_get_value_time (cfg, "testing", "CONNECT_TIMEOUT", |
1115 | else | 1114 | &connect_timeout)) |
1116 | { | 1115 | { |
1117 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Must provide option %s:%s!\n", | 1116 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Must provide option %s:%s!\n", |
1118 | "testing", "connect_timeout"); | 1117 | "testing", "CONNECT_TIMEOUT"); |
1119 | return; | 1118 | return; |
1120 | } | 1119 | } |
1121 | 1120 | ||