aboutsummaryrefslogtreecommitdiff
path: root/src/transport/transport-testing.c
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2011-11-22 14:22:28 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2011-11-22 14:22:28 +0000
commita0e99f40994a4f620dd5c9b51f84ea5f9268fd1f (patch)
tree535003777bc0396f0a5897d9720be6a10c884887 /src/transport/transport-testing.c
parentd778dbc46a3186140b8947d8614f6e6df9de7718 (diff)
downloadgnunet-a0e99f40994a4f620dd5c9b51f84ea5f9268fd1f.tar.gz
gnunet-a0e99f40994a4f620dd5c9b51f84ea5f9268fd1f.zip
tests for mantis #1028
Diffstat (limited to 'src/transport/transport-testing.c')
-rw-r--r--src/transport/transport-testing.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/transport/transport-testing.c b/src/transport/transport-testing.c
index d11c885f8..a8f034c9c 100644
--- a/src/transport/transport-testing.c
+++ b/src/transport/transport-testing.c
@@ -27,7 +27,6 @@
27 27
28#include "transport-testing.h" 28#include "transport-testing.h"
29 29
30#define VERBOSE GNUNET_YES
31#define HOSTKEYFILESIZE 914 30#define HOSTKEYFILESIZE 914
32 31
33static const char * 32static const char *
@@ -358,11 +357,14 @@ GNUNET_TRANSPORT_TESTING_start_peer (struct GNUNET_TRANSPORT_TESTING_handle
358int 357int
359GNUNET_TRANSPORT_TESTING_restart_peer (struct GNUNET_TRANSPORT_TESTING_handle *tth, 358GNUNET_TRANSPORT_TESTING_restart_peer (struct GNUNET_TRANSPORT_TESTING_handle *tth,
360 struct PeerContext *p, 359 struct PeerContext *p,
361 const char *cfgname) 360 const char *cfgname,
361 GNUNET_TRANSPORT_TESTING_start_cb restart_cb,
362 void *cb_cls)
362{ 363{
363 struct GNUNET_DISK_FileHandle *fn; 364 struct GNUNET_DISK_FileHandle *fn;
364 int success = GNUNET_OK; 365 int success = GNUNET_OK;
365 366
367 GNUNET_assert (tth != NULL);
366 GNUNET_assert (p != NULL); 368 GNUNET_assert (p != NULL);
367 GNUNET_assert (p->hostkeyfile != NULL); 369 GNUNET_assert (p->hostkeyfile != NULL);
368 GNUNET_assert (p->servicehome != NULL); 370 GNUNET_assert (p->servicehome != NULL);
@@ -396,6 +398,7 @@ GNUNET_TRANSPORT_TESTING_restart_peer (struct GNUNET_TRANSPORT_TESTING_handle *t
396 GNUNET_CONFIGURATION_destroy (p->cfg); 398 GNUNET_CONFIGURATION_destroy (p->cfg);
397 p->cfg = NULL; 399 p->cfg = NULL;
398 400
401
399 /* start */ 402 /* start */
400#if VERBOSE 403#if VERBOSE
401 GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing", 404 GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
@@ -403,8 +406,8 @@ GNUNET_TRANSPORT_TESTING_restart_peer (struct GNUNET_TRANSPORT_TESTING_handle *t
403 GNUNET_i2s (&p->id)); 406 GNUNET_i2s (&p->id));
404#endif 407#endif
405 408
409 sleep (5);
406 410
407 GNUNET_assert (tth != NULL);
408 if (GNUNET_DISK_file_test (cfgname) == GNUNET_NO) 411 if (GNUNET_DISK_file_test (cfgname) == GNUNET_NO)
409 { 412 {
410 GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "transport-testing", 413 GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "transport-testing",
@@ -447,6 +450,9 @@ GNUNET_TRANSPORT_TESTING_restart_peer (struct GNUNET_TRANSPORT_TESTING_handle *t
447 &notify_connect, &notify_disconnect); 450 &notify_connect, &notify_disconnect);
448 GNUNET_assert (p->th != NULL); 451 GNUNET_assert (p->th != NULL);
449 452
453 p->start_cb = restart_cb;
454 p->cb_cls = cb_cls;
455
450 p->ghh = GNUNET_TRANSPORT_get_hello (p->th, &get_hello, p); 456 p->ghh = GNUNET_TRANSPORT_get_hello (p->th, &get_hello, p);
451 GNUNET_assert (p->ghh != NULL); 457 GNUNET_assert (p->ghh != NULL);
452 458