diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-07-30 17:41:15 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-07-30 17:41:15 +0000 |
commit | 40826ec2467ee0e6e4b89c0d073aebf5af99099c (patch) | |
tree | 91b16194ec06f5116b2536079a004bf2e1253103 /src/transport | |
parent | 93d4605e1b03c80e66892e49f83ce61dddd48fd0 (diff) | |
download | gnunet-40826ec2467ee0e6e4b89c0d073aebf5af99099c.tar.gz gnunet-40826ec2467ee0e6e4b89c0d073aebf5af99099c.zip |
converting transport tests to hello_get API
Diffstat (limited to 'src/transport')
-rw-r--r-- | src/transport/transport-testing.c | 14 | ||||
-rw-r--r-- | src/transport/transport-testing.h | 3 |
2 files changed, 10 insertions, 7 deletions
diff --git a/src/transport/transport-testing.c b/src/transport/transport-testing.c index defafbbc6..c0775a135 100644 --- a/src/transport/transport-testing.c +++ b/src/transport/transport-testing.c | |||
@@ -508,10 +508,11 @@ GNUNET_TRANSPORT_TESTING_start_peer (struct GNUNET_TRANSPORT_TESTING_Handle *tth | |||
508 | GNUNET_TRANSPORT_TESTING_stop_peer (p); | 508 | GNUNET_TRANSPORT_TESTING_stop_peer (p); |
509 | return NULL; | 509 | return NULL; |
510 | } | 510 | } |
511 | p->ghh = GNUNET_TRANSPORT_get_hello (p->cfg, | 511 | p->ghh = GNUNET_TRANSPORT_hello_get (p->cfg, |
512 | &get_hello, | 512 | GNUNET_TRANSPORT_AC_ANY, |
513 | &get_hello, | ||
513 | p); | 514 | p); |
514 | GNUNET_assert (p->ghh != NULL); | 515 | GNUNET_assert (NULL != p->ghh); |
515 | return p; | 516 | return p; |
516 | } | 517 | } |
517 | 518 | ||
@@ -539,7 +540,7 @@ GNUNET_TRANSPORT_TESTING_restart_peer (struct GNUNET_TRANSPORT_TESTING_PeerConte | |||
539 | GNUNET_i2s (&p->id)); | 540 | GNUNET_i2s (&p->id)); |
540 | if (NULL != p->ghh) | 541 | if (NULL != p->ghh) |
541 | { | 542 | { |
542 | GNUNET_TRANSPORT_get_hello_cancel (p->ghh); | 543 | GNUNET_TRANSPORT_hello_get_cancel (p->ghh); |
543 | p->ghh = NULL; | 544 | p->ghh = NULL; |
544 | } | 545 | } |
545 | if (NULL != p->th) | 546 | if (NULL != p->th) |
@@ -603,7 +604,8 @@ GNUNET_TRANSPORT_TESTING_restart_peer (struct GNUNET_TRANSPORT_TESTING_PeerConte | |||
603 | NULL); | 604 | NULL); |
604 | GNUNET_assert (NULL != p->th); | 605 | GNUNET_assert (NULL != p->th); |
605 | p->ats = GNUNET_ATS_connectivity_init (p->cfg); | 606 | p->ats = GNUNET_ATS_connectivity_init (p->cfg); |
606 | p->ghh = GNUNET_TRANSPORT_get_hello (p->cfg, | 607 | p->ghh = GNUNET_TRANSPORT_hello_get (p->cfg, |
608 | GNUNET_TRANSPORT_AC_ANY, | ||
607 | &get_hello, | 609 | &get_hello, |
608 | p); | 610 | p); |
609 | GNUNET_assert (NULL != p->ghh); | 611 | GNUNET_assert (NULL != p->ghh); |
@@ -632,7 +634,7 @@ GNUNET_TRANSPORT_TESTING_stop_peer (struct GNUNET_TRANSPORT_TESTING_PeerContext | |||
632 | } | 634 | } |
633 | if (NULL != p->ghh) | 635 | if (NULL != p->ghh) |
634 | { | 636 | { |
635 | GNUNET_TRANSPORT_get_hello_cancel (p->ghh); | 637 | GNUNET_TRANSPORT_hello_get_cancel (p->ghh); |
636 | p->ghh = NULL; | 638 | p->ghh = NULL; |
637 | } | 639 | } |
638 | if (NULL != p->tmh) | 640 | if (NULL != p->tmh) |
diff --git a/src/transport/transport-testing.h b/src/transport/transport-testing.h index 87e647c2f..cb5ad319c 100644 --- a/src/transport/transport-testing.h +++ b/src/transport/transport-testing.h | |||
@@ -31,6 +31,7 @@ | |||
31 | #include "gnunet_hello_lib.h" | 31 | #include "gnunet_hello_lib.h" |
32 | #include "gnunet_transport_service.h" | 32 | #include "gnunet_transport_service.h" |
33 | #include "gnunet_transport_core_service.h" | 33 | #include "gnunet_transport_core_service.h" |
34 | #include "gnunet_transport_hello_service.h" | ||
34 | #include "gnunet_transport_manipulation_service.h" | 35 | #include "gnunet_transport_manipulation_service.h" |
35 | #include "gnunet_testing_lib.h" | 36 | #include "gnunet_testing_lib.h" |
36 | 37 | ||
@@ -91,7 +92,7 @@ struct GNUNET_TRANSPORT_TESTING_PeerContext | |||
91 | /** | 92 | /** |
92 | * Peer's transport get hello handle to retrieve peer's HELLO message | 93 | * Peer's transport get hello handle to retrieve peer's HELLO message |
93 | */ | 94 | */ |
94 | struct GNUNET_TRANSPORT_GetHelloHandle *ghh; | 95 | struct GNUNET_TRANSPORT_HelloGetHandle *ghh; |
95 | 96 | ||
96 | /** | 97 | /** |
97 | * Peer's testing handle | 98 | * Peer's testing handle |