X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftransport%2Ftransport-testing.c;h=e6fcabb484bc6c283aff6943b10efe3b0d3efdd7;hb=502af2167f7c218366666ca4944bd7cc54b5b19a;hp=24e4e8797d27a4adb3e731bbf89f999e414ab9ec;hpb=202d53014183b98b27cdc88fef11b5f9f6b97f00;p=oweals%2Fgnunet.git diff --git a/src/transport/transport-testing.c b/src/transport/transport-testing.c index 24e4e8797..e6fcabb48 100644 --- a/src/transport/transport-testing.c +++ b/src/transport/transport-testing.c @@ -29,56 +29,67 @@ struct ConnectingContext { - struct PeerContext * p1; - struct PeerContext * p2; + struct PeerContext *p1; + struct PeerContext *p2; GNUNET_SCHEDULER_TaskIdentifier tct; GNUNET_TRANSPORT_TESTING_connect_cb cb; - void * cb_cls; + void *cb_cls; struct GNUNET_TRANSPORT_Handle *th_p1; struct GNUNET_TRANSPORT_Handle *th_p2; - int c; + int p1_c; + int p2_c; }; static void -exchange_hello_last (void *cls, - const struct GNUNET_MessageHeader *message); +exchange_hello_last (void *cb_cls, const struct GNUNET_MessageHeader *message); static void -exchange_hello (void *cls, - const struct GNUNET_MessageHeader *message); +exchange_hello (void *cb_cls, const struct GNUNET_MessageHeader *message); static void notify_connect_internal (void *cls, - const struct GNUNET_PeerIdentity *peer, - const struct GNUNET_TRANSPORT_ATS_Information *ats, - uint32_t ats_count) + const struct GNUNET_PeerIdentity *peer, + const struct GNUNET_TRANSPORT_ATS_Information *ats, + uint32_t ats_count) { - struct ConnectingContext * cc = cls; -// /void * cb_cls = cc->cb_cls; + struct ConnectingContext *cc = cls; + + GNUNET_assert (cc != NULL); - GNUNET_assert(cc != NULL); - cc->c++; + if (0 == + memcmp (&(*peer).hashPubKey, &cc->p1->id.hashPubKey, + sizeof (GNUNET_HashCode))) + { + if (cc->p1_c == GNUNET_NO) + cc->p1_c = GNUNET_YES; + } + if (0 == + memcmp (&(*peer).hashPubKey, &cc->p2->id.hashPubKey, + sizeof (GNUNET_HashCode))) + { + if (cc->p2_c == GNUNET_NO) + cc->p2_c = GNUNET_YES; + } - if (cc->c == 2) + if ((cc->p2_c == GNUNET_YES) && (cc->p2_c == GNUNET_YES)) { - /* clean up */ + /* clean up */ GNUNET_TRANSPORT_get_hello_cancel (cc->th_p2, &exchange_hello_last, cc); GNUNET_TRANSPORT_get_hello_cancel (cc->th_p1, &exchange_hello, cc); if (cc->tct != GNUNET_SCHEDULER_NO_TASK) - GNUNET_SCHEDULER_cancel(cc->tct); + GNUNET_SCHEDULER_cancel (cc->tct); cc->tct = GNUNET_SCHEDULER_NO_TASK; - GNUNET_TRANSPORT_disconnect( cc->th_p1); - GNUNET_TRANSPORT_disconnect( cc->th_p2); + GNUNET_TRANSPORT_disconnect (cc->th_p1); + GNUNET_TRANSPORT_disconnect (cc->th_p2); if (cc->cb != NULL) cc->cb (cc->p1, cc->p2, cc->cb_cls); - GNUNET_free(cc); + GNUNET_free (cc); } - } static void @@ -87,7 +98,8 @@ notify_connect (void *cls, const struct GNUNET_TRANSPORT_ATS_Information *ats, uint32_t ats_count) { - struct PeerContext * p = cls; + struct PeerContext *p = cls; + if (p == NULL) return; if (p->nc != NULL) @@ -97,7 +109,8 @@ notify_connect (void *cls, static void notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer) { - struct PeerContext * p = cls; + struct PeerContext *p = cls; + if (p == NULL) return; if (p->nd != NULL) @@ -111,7 +124,8 @@ notify_receive (void *cls, const struct GNUNET_TRANSPORT_ATS_Information *ats, uint32_t ats_count) { - struct PeerContext * p = cls; + struct PeerContext *p = cls; + if (p == NULL) return; if (p->rec != NULL) @@ -120,18 +134,18 @@ notify_receive (void *cls, static void -exchange_hello_last (void *cls, - const struct GNUNET_MessageHeader *message) +exchange_hello_last (void *cb_cls, const struct GNUNET_MessageHeader *message) { - struct ConnectingContext * cc = cls; + struct ConnectingContext *cc = cb_cls; struct PeerContext *me = cc->p2; + //struct PeerContext *p1 = cc->p1; GNUNET_assert (message != NULL); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Exchanging HELLO of size %d with peer (%s)!\n", - (int) GNUNET_HELLO_size((const struct GNUNET_HELLO_Message *)message), - GNUNET_i2s (&me->id)); + (int) GNUNET_HELLO_size ((const struct GNUNET_HELLO_Message *) + message), GNUNET_i2s (&me->id)); GNUNET_assert (GNUNET_OK == GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *) message, &me->id)); @@ -140,11 +154,11 @@ exchange_hello_last (void *cls, static void -exchange_hello (void *cls, - const struct GNUNET_MessageHeader *message) +exchange_hello (void *cb_cls, const struct GNUNET_MessageHeader *message) { - struct ConnectingContext * cc = cls; + struct ConnectingContext *cc = cb_cls; struct PeerContext *me = cc->p1; + //struct PeerContext *p2 = cc->p2; GNUNET_assert (message != NULL); @@ -153,105 +167,125 @@ exchange_hello (void *cls, message, &me->id)); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Exchanging HELLO of size %d from peer %s!\n", - (int) GNUNET_HELLO_size((const struct GNUNET_HELLO_Message *)message), - GNUNET_i2s (&me->id)); + (int) GNUNET_HELLO_size ((const struct GNUNET_HELLO_Message *) + message), GNUNET_i2s (&me->id)); GNUNET_TRANSPORT_offer_hello (cc->th_p2, message, NULL, NULL); } static void -try_connect (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +try_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - struct ConnectingContext * cc = cls; + struct ConnectingContext *cc = cls; struct PeerContext *p1 = cc->p1; struct PeerContext *p2 = cc->p2; cc->tct = GNUNET_SCHEDULER_NO_TASK; - if ( (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0) + if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0) return; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Asking peers to connect...\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Asking peers to connect...\n"); /* FIXME: 'pX.id' may still be all-zeros here... */ - GNUNET_TRANSPORT_try_connect (cc->th_p1, - &p2->id); - GNUNET_TRANSPORT_try_connect (cc->th_p2, - &p1->id); + GNUNET_TRANSPORT_try_connect (cc->th_p1, &p2->id); + GNUNET_TRANSPORT_try_connect (cc->th_p2, &p1->id); cc->tct = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, - &try_connect, - cc); + &try_connect, cc); } + +/** + * Start a peer with the given configuration + * @param rec receive callback + * @param nc connect callback + * @param nd disconnect callback + * @param cb_cls closure for callback + * @return the peer context + */ struct PeerContext * -GNUNET_TRANSPORT_TESTING_start_peer (const char * cfgname, - GNUNET_TRANSPORT_ReceiveCallback rec, - GNUNET_TRANSPORT_NotifyConnect nc, - GNUNET_TRANSPORT_NotifyDisconnect nd, - void * cb_cls) +GNUNET_TRANSPORT_TESTING_start_peer (const char *cfgname, + GNUNET_TRANSPORT_ReceiveCallback rec, + GNUNET_TRANSPORT_NotifyConnect nc, + GNUNET_TRANSPORT_NotifyDisconnect nd, + void *cb_cls) { - struct PeerContext * p = GNUNET_malloc (sizeof (struct PeerContext)); + struct PeerContext *p = GNUNET_malloc (sizeof (struct PeerContext)); p->cfg = GNUNET_CONFIGURATION_create (); GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); - if (GNUNET_CONFIGURATION_have_value (p->cfg,"PATHS", "SERVICEHOME")) - GNUNET_CONFIGURATION_get_value_string (p->cfg, "PATHS", "SERVICEHOME", &p->servicehome); + if (GNUNET_CONFIGURATION_have_value (p->cfg, "PATHS", "SERVICEHOME")) + GNUNET_CONFIGURATION_get_value_string (p->cfg, "PATHS", "SERVICEHOME", + &p->servicehome); if (NULL != p->servicehome) GNUNET_DISK_directory_remove (p->servicehome); p->arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", - "gnunet-service-arm", - "-c", cfgname, + "gnunet-service-arm", "-c", cfgname, #if VERBOSE_PEERS - "-L", "DEBUG", + "-L", "DEBUG", #else - "-L", "ERROR", + "-L", "ERROR", #endif - NULL); + NULL); p->nc = nc; p->nd = nd; p->rec = rec; - p->cb_cls = cb_cls; - - p->th = GNUNET_TRANSPORT_connect(p->cfg, NULL, - p, - ¬ify_receive, - ¬ify_connect, - ¬ify_disconnect); + if (cb_cls != NULL) + p->cb_cls = cb_cls; + else + p->cb_cls = p; + + p->th = GNUNET_TRANSPORT_connect (p->cfg, NULL, + p, + ¬ify_receive, + ¬ify_connect, ¬ify_disconnect); GNUNET_assert (p->th != NULL); return p; } +/** + * shutdown the given peer + * @param p the peer + */ void -GNUNET_TRANSPORT_TESTING_stop_peer (struct PeerContext * p) +GNUNET_TRANSPORT_TESTING_stop_peer (struct PeerContext *p) { if (p->th != NULL) - GNUNET_TRANSPORT_disconnect(p->th); + GNUNET_TRANSPORT_disconnect (p->th); if (NULL != p->arm_proc) - { - if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) - GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); - GNUNET_OS_process_wait (p->arm_proc); - GNUNET_OS_process_close (p->arm_proc); - p->arm_proc = NULL; - } + { + if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) + GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); + GNUNET_OS_process_wait (p->arm_proc); + GNUNET_OS_process_close (p->arm_proc); + p->arm_proc = NULL; + } GNUNET_CONFIGURATION_destroy (p->cfg); if (p->servicehome != NULL) - { + { GNUNET_DISK_directory_remove (p->servicehome); - GNUNET_free(p->servicehome); - } + GNUNET_free (p->servicehome); + } GNUNET_free (p); } +/** + * Connect the two given peers and call the callback when both peers report the + * inbound connect. Remarks: start_peer's notify_connect callback can be called + * before. + * @param p1 peer 1 + * @param p2 peer 2 + * @param cb the callback to call + * @param cb_cls callback cls + */ void -GNUNET_TRANSPORT_TESTING_connect_peers (struct PeerContext * p1, - struct PeerContext * p2, +GNUNET_TRANSPORT_TESTING_connect_peers (struct PeerContext *p1, + struct PeerContext *p2, GNUNET_TRANSPORT_TESTING_connect_cb cb, - void * cls) + void *cb_cls) { - struct ConnectingContext * cc = GNUNET_malloc (sizeof (struct ConnectingContext)); + struct ConnectingContext *cc = + GNUNET_malloc (sizeof (struct ConnectingContext)); GNUNET_assert (p1 != NULL); GNUNET_assert (p2 != NULL); @@ -260,19 +294,15 @@ GNUNET_TRANSPORT_TESTING_connect_peers (struct PeerContext * p1, cc->p2 = p2; cc->cb = cb; - cc->cb_cls = cls; - - cc->th_p1 = GNUNET_TRANSPORT_connect(cc->p1->cfg, NULL, - cc, - NULL, - ¬ify_connect_internal, - NULL); - - cc->th_p2 = GNUNET_TRANSPORT_connect(cc->p2->cfg, NULL, - cc, - NULL, - ¬ify_connect_internal, - NULL); + cc->cb_cls = cb_cls; + + cc->th_p1 = GNUNET_TRANSPORT_connect (cc->p1->cfg, NULL, + cc, + NULL, ¬ify_connect_internal, NULL); + + cc->th_p2 = GNUNET_TRANSPORT_connect (cc->p2->cfg, NULL, + cc, + NULL, ¬ify_connect_internal, NULL); GNUNET_assert (cc->th_p1 != NULL); GNUNET_assert (cc->th_p2 != NULL);