diff options
Diffstat (limited to 'src/testing')
-rw-r--r-- | src/testing/testing.c | 18 | ||||
-rw-r--r-- | src/testing/testing_api_loop.c | 9 |
2 files changed, 7 insertions, 20 deletions
diff --git a/src/testing/testing.c b/src/testing/testing.c index 6480d32f9..a00d7217f 100644 --- a/src/testing/testing.c +++ b/src/testing/testing.c | |||
@@ -1319,7 +1319,7 @@ GNUNET_TESTING_peer_configure (struct GNUNET_TESTING_System *system, | |||
1319 | peer->nports = nports; | 1319 | peer->nports = nports; |
1320 | return peer; | 1320 | return peer; |
1321 | 1321 | ||
1322 | err_ret: | 1322 | err_ret: |
1323 | GNUNET_free (ss_instances); | 1323 | GNUNET_free (ss_instances); |
1324 | GNUNET_free (ports); | 1324 | GNUNET_free (ports); |
1325 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s", emsg_); | 1325 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s", emsg_); |
@@ -2258,17 +2258,11 @@ GNUNET_TESTING_free_topology (struct GNUNET_TESTING_NetjailTopology *topology) | |||
2258 | GNUNET_free (topology); | 2258 | GNUNET_free (topology); |
2259 | } | 2259 | } |
2260 | 2260 | ||
2261 | /** | 2261 | |
2262 | * Calculate the unique id identifying a node from a given connction. | ||
2263 | * | ||
2264 | * @param node_connection The connection we calculate the id from. | ||
2265 | * @param topology The topology we get all needed information from. | ||
2266 | * @return The unique id of the node from the connection. | ||
2267 | */ | ||
2268 | unsigned int | 2262 | unsigned int |
2269 | GNUNET_TESTING_calculate_num (struct | 2263 | GNUNET_TESTING_calculate_num ( |
2270 | GNUNET_TESTING_NodeConnection *node_connection, | 2264 | struct GNUNET_TESTING_NodeConnection *node_connection, |
2271 | struct GNUNET_TESTING_NetjailTopology *topology) | 2265 | struct GNUNET_TESTING_NetjailTopology *topology) |
2272 | { | 2266 | { |
2273 | unsigned int n, m, num; | 2267 | unsigned int n, m, num; |
2274 | 2268 | ||
@@ -2677,7 +2671,7 @@ GNUNET_TESTING_get_topo_from_file (const char *filename) | |||
2677 | } | 2671 | } |
2678 | 2672 | ||
2679 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 2673 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
2680 | "file lenght %lu\n", | 2674 | "file length %lu\n", |
2681 | fs); | 2675 | fs); |
2682 | data[fs] = '\0'; | 2676 | data[fs] = '\0'; |
2683 | 2677 | ||
diff --git a/src/testing/testing_api_loop.c b/src/testing/testing_api_loop.c index 95d6b88e6..283284f26 100644 --- a/src/testing/testing_api_loop.c +++ b/src/testing/testing_api_loop.c | |||
@@ -189,14 +189,6 @@ GNUNET_TESTING_interpreter_lookup_command ( | |||
189 | } | 189 | } |
190 | 190 | ||
191 | 191 | ||
192 | /** | ||
193 | * Lookup command by label. | ||
194 | * All commands, first into the past, then into the furture are looked up. | ||
195 | * | ||
196 | * @param is interpreter to lookup command in | ||
197 | * @param label label of the command to lookup. | ||
198 | * @return the command, if it is found, or NULL. | ||
199 | */ | ||
200 | const struct GNUNET_TESTING_Command * | 192 | const struct GNUNET_TESTING_Command * |
201 | GNUNET_TESTING_interpreter_lookup_command_all ( | 193 | GNUNET_TESTING_interpreter_lookup_command_all ( |
202 | struct GNUNET_TESTING_Interpreter *is, | 194 | struct GNUNET_TESTING_Interpreter *is, |
@@ -351,6 +343,7 @@ GNUNET_TESTING_interpreter_get_current_command ( | |||
351 | return &is->commands[is->ip]; | 343 | return &is->commands[is->ip]; |
352 | } | 344 | } |
353 | 345 | ||
346 | |||
354 | const char * | 347 | const char * |
355 | GNUNET_TESTING_interpreter_get_current_label ( | 348 | GNUNET_TESTING_interpreter_get_current_label ( |
356 | struct GNUNET_TESTING_Interpreter *is) | 349 | struct GNUNET_TESTING_Interpreter *is) |