aboutsummaryrefslogtreecommitdiff
path: root/src/service/transport/transport-testing2.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/service/transport/transport-testing2.c')
-rw-r--r--src/service/transport/transport-testing2.c53
1 files changed, 0 insertions, 53 deletions
diff --git a/src/service/transport/transport-testing2.c b/src/service/transport/transport-testing2.c
index afa0b0ad4..b88a2b7e9 100644
--- a/src/service/transport/transport-testing2.c
+++ b/src/service/transport/transport-testing2.c
@@ -247,15 +247,6 @@ notify_connect (void *cls,
247} 247}
248 248
249 249
250/**
251 * Offer the current HELLO of P2 to P1.
252 *
253 * @param cls our `struct GNUNET_TRANSPORT_TESTING_ConnectRequest`
254 */
255static void
256offer_hello (void *cls);
257
258
259static void 250static void
260notify_disconnect (void *cls, 251notify_disconnect (void *cls,
261 const struct GNUNET_PeerIdentity *peer, 252 const struct GNUNET_PeerIdentity *peer,
@@ -318,9 +309,6 @@ notify_disconnect (void *cls,
318 { 309 {
319 cc->connected = GNUNET_NO; 310 cc->connected = GNUNET_NO;
320 /* start trying to connect */ 311 /* start trying to connect */
321 if (NULL == cc->tct)
322 cc->tct = GNUNET_SCHEDULER_add_now (&offer_hello,
323 cc);
324 if (NULL == cc->ah_sh) 312 if (NULL == cc->ah_sh)
325 cc->ah_sh = GNUNET_TRANSPORT_application_suggest (cc->p1->ah, 313 cc->ah_sh = GNUNET_TRANSPORT_application_suggest (cc->p1->ah,
326 &p2->id, 314 &p2->id,
@@ -725,45 +713,6 @@ GNUNET_TRANSPORT_TESTING_stop_peer (struct
725 }*/ 713 }*/
726 714
727 715
728static void
729offer_hello (void *cls)
730{
731 struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc = cls;
732 struct GNUNET_TRANSPORT_TESTING_PeerContext *p1 = cc->p1;
733 struct GNUNET_TRANSPORT_TESTING_PeerContext *p2 = cc->p2;
734 struct GNUNET_TIME_Absolute t;
735 enum GNUNET_NetworkType nt = 0;
736 char *addr;
737
738 cc->tct = NULL;
739 {
740 char *p2_s = GNUNET_strdup (GNUNET_i2s (&p2->id));
741
742 LOG (GNUNET_ERROR_TYPE_DEBUG,
743 "Asking peer %u (`%s') to connect peer %u (`%s'), providing HELLO with %s\n",
744 p1->no,
745 GNUNET_i2s (&p1->id),
746 p2->no,
747 p2_s,
748 p2->hello);
749 GNUNET_free (p2_s);
750 }
751
752 addr = GNUNET_HELLO_extract_address (p2->hello,
753 p2->hello_size,
754 &p2->id,
755 &nt,
756 &t);
757 GNUNET_assert (NULL != addr);
758 GNUNET_assert (NULL != p1->hello);
759 GNUNET_TRANSPORT_application_validate (p1->ah,
760 &p2->id,
761 nt,
762 addr);
763 GNUNET_free (addr);
764}
765
766
767/** 716/**
768 * Initiate a connection from p1 to p2 by offering p1 p2's HELLO message 717 * Initiate a connection from p1 to p2 by offering p1 p2's HELLO message
769 * 718 *
@@ -816,8 +765,6 @@ GNUNET_TRANSPORT_TESTING_connect_peers (struct
816 GNUNET_CONTAINER_DLL_insert (tth->cc_head, 765 GNUNET_CONTAINER_DLL_insert (tth->cc_head,
817 tth->cc_tail, 766 tth->cc_tail,
818 cc); 767 cc);
819 cc->tct = GNUNET_SCHEDULER_add_now (&offer_hello,
820 cc);
821 cc->ah_sh = GNUNET_TRANSPORT_application_suggest (cc->p1->ah, 768 cc->ah_sh = GNUNET_TRANSPORT_application_suggest (cc->p1->ah,
822 &p2->id, 769 &p2->id,
823 GNUNET_MQ_PRIO_BEST_EFFORT, 770 GNUNET_MQ_PRIO_BEST_EFFORT,