/*
This file is part of GNUnet.
- (C) 2006, 2009 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2006, 2009, 2015, 2016 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
+ by the Free Software Foundation; either version 3, or (at your
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
-
/**
- * @file transport_testing.c
+ * @file transport-testing.c
* @brief testing lib for transport service
- *
* @author Matthias Wachs
+ * @author Christian Grothoff
*/
-
#include "transport-testing.h"
-struct ConnectingContext
-{
- struct PeerContext *p1;
- struct PeerContext *p2;
- GNUNET_SCHEDULER_TaskIdentifier tct;
- GNUNET_TRANSPORT_TESTING_connect_cb cb;
- void *cb_cls;
-
- struct GNUNET_TRANSPORT_Handle *th_p1;
- struct GNUNET_TRANSPORT_Handle *th_p2;
- int p1_c;
- int p2_c;
-};
-static void
-exchange_hello_last (void *cb_cls, const struct GNUNET_MessageHeader *message);
-static void
-exchange_hello (void *cb_cls, const struct GNUNET_MessageHeader *message);
+#define LOG(kind,...) GNUNET_log_from(kind, "transport-testing", __VA_ARGS__)
-static void
-notify_connect_internal (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_TRANSPORT_ATS_Information *ats,
- uint32_t ats_count)
+
+static struct GNUNET_TRANSPORT_TESTING_PeerContext *
+find_peer_context (struct GNUNET_TRANSPORT_TESTING_Handle *tth,
+ const struct GNUNET_PeerIdentity *peer)
{
- struct ConnectingContext *cc = cls;
+ struct GNUNET_TRANSPORT_TESTING_PeerContext *t;
+
+ for (t = tth->p_head; NULL != t; t = t->next)
+ if (0 == memcmp (&t->id,
+ peer,
+ sizeof (struct GNUNET_PeerIdentity)))
+ return t;
+ return NULL;
+}
- GNUNET_assert (cc != NULL);
- 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;
- }
+/**
+ * Find any connecting context matching the given pair of peers.
+ *
+ * @param p1 first peer
+ * @param p2 second peer
+ * @param cb function to call
+ * @param cb_cls closure for @a cb
+ */
+void
+GNUNET_TRANSPORT_TESTING_find_connecting_context (struct GNUNET_TRANSPORT_TESTING_PeerContext *p1,
+ struct GNUNET_TRANSPORT_TESTING_PeerContext *p2,
+ GNUNET_TRANSPORT_TESTING_ConnectContextCallback cb,
+ void *cb_cls)
+{
+ struct GNUNET_TRANSPORT_TESTING_Handle *tth = p1->tth;
+ struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc;
+ struct GNUNET_TRANSPORT_TESTING_ConnectRequest *ccn;
- if ((cc->p2_c == GNUNET_YES) && (cc->p2_c == GNUNET_YES))
+ for (cc = tth->cc_head; NULL != cc; cc = ccn)
{
- /* 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);
-
- cc->tct = GNUNET_SCHEDULER_NO_TASK;
-
- 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);
+ ccn = cc->next;
+ if ( (cc->p1 == p1) &&
+ (cc->p2 == p2) )
+ cb (cb_cls,
+ cc);
}
}
+
static void
-notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_TRANSPORT_ATS_Information *ats,
- uint32_t ats_count)
+set_p1c (void *cls,
+ struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cx)
{
- struct PeerContext *p = cls;
-
- if (p == NULL)
- return;
- if (p->nc != NULL)
- p->nc (p->cb_cls, peer, ats, ats_count);
+ cx->p1_c = GNUNET_YES;
}
+
static void
-notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
+set_p2c (void *cls,
+ struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cx)
{
- struct PeerContext *p = cls;
-
- if (p == NULL)
- return;
- if (p->nd != NULL)
- p->nd (p->cb_cls, peer);
+ cx->p2_c = GNUNET_YES;
}
+
static void
-notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_TRANSPORT_ATS_Information *ats,
- uint32_t ats_count)
+clear_p1c (void *cls,
+ struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cx)
{
- struct PeerContext *p = cls;
-
- if (p == NULL)
- return;
- if (p->rec != NULL)
- p->rec (p->cb_cls, peer, message, ats, ats_count);
+ cx->p1_c = GNUNET_NO;
}
static void
-exchange_hello_last (void *cb_cls, const struct GNUNET_MessageHeader *message)
+clear_p2c (void *cls,
+ struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cx)
{
- struct ConnectingContext *cc = cb_cls;
- struct PeerContext *me = cc->p2;
+ cx->p2_c = GNUNET_NO;
+}
- //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));
- GNUNET_assert (GNUNET_OK ==
- GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *)
- message, &me->id));
- GNUNET_TRANSPORT_offer_hello (cc->th_p1, message, NULL, NULL);
+static void
+notify_connect (void *cls,
+ const struct GNUNET_PeerIdentity *peer)
+{
+ struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls;
+ struct GNUNET_TRANSPORT_TESTING_Handle *tth = p->tth;
+ char *p2_s;
+ struct GNUNET_TRANSPORT_TESTING_PeerContext *p2;
+ struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc;
+ struct GNUNET_TRANSPORT_TESTING_ConnectRequest *ccn;
+
+ p2 = find_peer_context (p->tth,
+ peer);
+ if (NULL != p->nc)
+ p->nc (p->cb_cls,
+ peer);
+
+ if (p2 != NULL)
+ GNUNET_asprintf (&p2_s,
+ "%u (`%s')",
+ p2->no,
+ GNUNET_i2s (&p2->id));
+ else
+ GNUNET_asprintf (&p2_s,
+ "`%s'",
+ GNUNET_i2s (peer));
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Peers %s connected to peer %u (`%s')\n",
+ p2_s,
+ p->no,
+ GNUNET_i2s (&p->id));
+ GNUNET_free (p2_s);
+ /* update flags in connecting contexts */
+ GNUNET_TRANSPORT_TESTING_find_connecting_context (p,
+ p2,
+ &set_p1c,
+ NULL);
+ GNUNET_TRANSPORT_TESTING_find_connecting_context (p2,
+ p,
+ &set_p2c,
+ NULL);
+ /* update set connected flag for all requests */
+ for (cc = tth->cc_head; NULL != cc; cc = cc->next)
+ {
+ if (GNUNET_YES == cc->connected)
+ continue;
+ if ( (GNUNET_YES == cc->p1_c) &&
+ (GNUNET_YES == cc->p2_c) )
+ {
+ cc->connected = GNUNET_YES;
+ /* stop trying to connect */
+ if (NULL != cc->tct)
+ {
+ GNUNET_SCHEDULER_cancel (cc->tct);
+ cc->tct = NULL;
+ }
+ if (NULL != cc->oh)
+ {
+ GNUNET_TRANSPORT_offer_hello_cancel (cc->oh);
+ cc->oh = NULL;
+ }
+ if (NULL != cc->ats_sh)
+ {
+ GNUNET_ATS_connectivity_suggest_cancel (cc->ats_sh);
+ cc->ats_sh = NULL;
+ }
+ }
+ }
+ /* then notify application */
+ for (cc = tth->cc_head; NULL != cc; cc = ccn)
+ {
+ ccn = cc->next;
+ if ( (GNUNET_YES == cc->connected) &&
+ (NULL != cc->cb) )
+ {
+ cc->cb (cc->cb_cls);
+ cc->cb = NULL; /* only notify once! */
+ }
+ }
}
+/**
+ * Offer the current HELLO of P2 to P1.
+ *
+ * @param cls our `struct GNUNET_TRANSPORT_TESTING_ConnectRequest`
+ */
static void
-exchange_hello (void *cb_cls, const struct GNUNET_MessageHeader *message)
-{
- struct ConnectingContext *cc = cb_cls;
- struct PeerContext *me = cc->p1;
+offer_hello (void *cls);
- //struct PeerContext *p2 = cc->p2;
- GNUNET_assert (message != NULL);
- GNUNET_assert (GNUNET_OK ==
- GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *)
- 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));
- GNUNET_TRANSPORT_offer_hello (cc->th_p2, message, NULL, NULL);
+static void
+notify_disconnect (void *cls,
+ const struct GNUNET_PeerIdentity *peer)
+{
+ struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls;
+ struct GNUNET_TRANSPORT_TESTING_Handle *tth = p->tth;
+ char *p2_s;
+ /* Find PeerContext */
+ int no = 0;
+ struct GNUNET_TRANSPORT_TESTING_PeerContext *p2 = NULL;
+ struct TRANSPORT_TESTING_SendJob *sj;
+ struct TRANSPORT_TESTING_SendJob *sjn;
+ struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc;
+
+ p2 = find_peer_context (p->tth,
+ peer);
+ no = p->no;
+ if (NULL != p2)
+ GNUNET_asprintf (&p2_s,
+ "%u (`%s')",
+ p2->no,
+ GNUNET_i2s (&p2->id));
+ else
+ GNUNET_asprintf (&p2_s,
+ "`%s'",
+ GNUNET_i2s (peer));
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Peers %s disconnected from peer %u (`%s')\n",
+ p2_s,
+ no,
+ GNUNET_i2s (&p->id));
+ GNUNET_free (p2_s);
+ /* notify about disconnect */
+ if (NULL != p->nd)
+ p->nd (p->cb_cls,
+ peer);
+ if (NULL == p2)
+ return;
+ /* abort all transmissions this disconnected pair is involved in */
+ for (sj = tth->sj_head; NULL != sj; sj = sjn)
+ {
+ sjn = sj->next;
+ if ( ( (sj->sender == p2) &&
+ (sj->receiver == p) ) ||
+ ( (sj->receiver == p2) &&
+ (sj->sender == p) ) )
+ {
+ GNUNET_CONTAINER_DLL_remove (tth->sj_head,
+ tth->sj_tail,
+ sj);
+ GNUNET_TRANSPORT_notify_transmit_ready_cancel (sj->th);
+ GNUNET_free (sj);
+ }
+ }
+ /* update set connected flags for all requests */
+ GNUNET_TRANSPORT_TESTING_find_connecting_context (p,
+ p2,
+ &clear_p1c,
+ NULL);
+ GNUNET_TRANSPORT_TESTING_find_connecting_context (p2,
+ p,
+ &clear_p2c,
+ NULL);
+ /* resume connectivity requests as necessary */
+ for (cc = tth->cc_head; NULL != cc; cc = cc->next)
+ {
+ if (GNUNET_NO == cc->connected)
+ continue;
+ if ( (GNUNET_YES != cc->p1_c) ||
+ (GNUNET_YES != cc->p2_c) )
+ {
+ cc->connected = GNUNET_NO;
+ /* start trying to connect */
+ if ( (NULL == cc->tct) &&
+ (NULL == cc->oh) )
+ cc->tct = GNUNET_SCHEDULER_add_now (&offer_hello,
+ cc);
+ if (NULL == cc->ats_sh)
+ cc->ats_sh = GNUNET_ATS_connectivity_suggest (cc->p1->ats,
+ &p2->id,
+ 1);
+ }
+ }
}
+
static void
-try_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+notify_receive (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_MessageHeader *message)
{
- struct ConnectingContext *cc = cls;
- struct PeerContext *p1 = cc->p1;
- struct PeerContext *p2 = cc->p2;
+ struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls;
- cc->tct = GNUNET_SCHEDULER_NO_TASK;
- if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
+ if (NULL == p)
return;
+ if (NULL != p->rec)
+ p->rec (p->cb_cls,
+ peer,
+ message);
+}
- 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);
- cc->tct =
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &try_connect, cc);
+static void
+get_hello (void *cb_cls,
+ const struct GNUNET_MessageHeader *message)
+{
+ struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cb_cls;
+ struct GNUNET_PeerIdentity hello_id;
+
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *) message,
+ &hello_id));
+ GNUNET_assert (0 == memcmp (&hello_id,
+ &p->id,
+ sizeof (hello_id)));
+ GNUNET_free_non_null (p->hello);
+ p->hello = (struct GNUNET_HELLO_Message *) GNUNET_copy_message (message);
+
+ if (NULL != p->start_cb)
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Peer %u (`%s') successfully started\n",
+ p->no,
+ GNUNET_i2s (&p->id));
+ p->start_cb (p,
+ p->start_cb_cls);
+ p->start_cb = NULL;
+ }
}
/**
* Start a peer with the given configuration
+ * @param tth the testing handle
+ * @param cfgname configuration file
+ * @param peer_id a unique number to identify the peer
* @param rec receive callback
* @param nc connect callback
* @param nd disconnect callback
* @param cb_cls closure for callback
+ * @param start_cb start callback
+ * @param start_cb_cls closure for callback
* @return the peer context
*/
-struct PeerContext *
-GNUNET_TRANSPORT_TESTING_start_peer (const char *cfgname,
+struct GNUNET_TRANSPORT_TESTING_PeerContext *
+GNUNET_TRANSPORT_TESTING_start_peer (struct GNUNET_TRANSPORT_TESTING_Handle *tth,
+ const char *cfgname,
+ int peer_id,
GNUNET_TRANSPORT_ReceiveCallback rec,
GNUNET_TRANSPORT_NotifyConnect nc,
GNUNET_TRANSPORT_NotifyDisconnect nd,
- void *cb_cls)
+ void *cb_cls,
+ GNUNET_TRANSPORT_TESTING_StartCallback start_cb,
+ void *start_cb_cls)
{
- struct PeerContext *p = GNUNET_malloc (sizeof (struct PeerContext));
+ char *emsg = NULL;
+ struct GNUNET_TRANSPORT_TESTING_PeerContext *p;
+ struct GNUNET_PeerIdentity *dummy;
- p->cfg = GNUNET_CONFIGURATION_create ();
+ if (GNUNET_NO == GNUNET_DISK_file_test (cfgname))
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "File not found: `%s'\n",
+ cfgname);
+ return NULL;
+ }
- 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 (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,
-#if VERBOSE_PEERS
- "-L", "DEBUG",
-#else
- "-L", "ERROR",
-#endif
- NULL);
+ p = GNUNET_new (struct GNUNET_TRANSPORT_TESTING_PeerContext);
+ p->tth = tth;
p->nc = nc;
p->nd = nd;
p->rec = rec;
- if (cb_cls != NULL)
+ if (NULL != cb_cls)
p->cb_cls = cb_cls;
else
p->cb_cls = p;
+ p->start_cb = start_cb;
+ p->start_cb_cls = start_cb_cls;
+ GNUNET_CONTAINER_DLL_insert (tth->p_head,
+ tth->p_tail,
+ p);
+
+ /* Create configuration and call testing lib to modify it */
+ p->cfg = GNUNET_CONFIGURATION_create ();
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONFIGURATION_load (p->cfg, cfgname));
+ if (GNUNET_SYSERR ==
+ GNUNET_TESTING_configuration_create (tth->tl_system,
+ p->cfg))
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "Testing library failed to create unique configuration based on `%s'\n",
+ cfgname);
+ GNUNET_CONFIGURATION_destroy (p->cfg);
+ GNUNET_free (p);
+ return NULL;
+ }
- p->th =
- GNUNET_TRANSPORT_connect (p->cfg, NULL, p, ¬ify_receive,
- ¬ify_connect, ¬ify_disconnect);
- GNUNET_assert (p->th != NULL);
+ p->no = peer_id;
+ /* Configure peer with configuration */
+ p->peer = GNUNET_TESTING_peer_configure (tth->tl_system,
+ p->cfg,
+ p->no,
+ NULL,
+ &emsg);
+ if (NULL == p->peer)
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "Testing library failed to create unique configuration based on `%s': `%s'\n",
+ cfgname,
+ emsg);
+ GNUNET_TRANSPORT_TESTING_stop_peer (p);
+ GNUNET_free_non_null (emsg);
+ return NULL;
+ }
+ GNUNET_free_non_null (emsg);
+ if (GNUNET_OK != GNUNET_TESTING_peer_start (p->peer))
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "Testing library failed to create unique configuration based on `%s'\n",
+ cfgname);
+ GNUNET_TRANSPORT_TESTING_stop_peer (p);
+ return NULL;
+ }
+
+ memset (&dummy,
+ '\0',
+ sizeof (dummy));
+ GNUNET_TESTING_peer_get_identity (p->peer,
+ &p->id);
+ if (0 == memcmp (&dummy,
+ &p->id,
+ sizeof (struct GNUNET_PeerIdentity)))
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "Testing library failed to obtain peer identity for peer %u\n",
+ p->no);
+ GNUNET_TRANSPORT_TESTING_stop_peer (p);
+ return NULL;
+ }
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Peer %u configured with identity `%s'\n",
+ p->no,
+ GNUNET_i2s_full (&p->id));
+
+ p->th = GNUNET_TRANSPORT_connect (p->cfg,
+ NULL,
+ p,
+ ¬ify_receive,
+ ¬ify_connect,
+ ¬ify_disconnect);
+ if (NULL == p->th)
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "Failed to connect to transport service for peer `%s': `%s'\n",
+ cfgname,
+ emsg);
+ GNUNET_TRANSPORT_TESTING_stop_peer (p);
+ return NULL;
+ }
+ p->ats = GNUNET_ATS_connectivity_init (p->cfg);
+ if (NULL == p->ats)
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "Failed to connect to ATS service for peer `%s': `%s'\n",
+ cfgname,
+ emsg);
+ GNUNET_TRANSPORT_TESTING_stop_peer (p);
+ return NULL;
+ }
+ p->ghh = GNUNET_TRANSPORT_get_hello (p->cfg,
+ &get_hello,
+ p);
+ GNUNET_assert (p->ghh != NULL);
return p;
}
+
/**
- * shutdown the given peer
+ * Stops and restarts the given peer, sleeping (!) for 5s in between.
+ *
* @param p the peer
+ * @param restart_cb callback to call when restarted
+ * @param restart_cb_cls callback closure
+ * @return #GNUNET_OK in success otherwise #GNUNET_SYSERR
*/
-void
-GNUNET_TRANSPORT_TESTING_stop_peer (struct PeerContext *p)
+int
+GNUNET_TRANSPORT_TESTING_restart_peer (struct GNUNET_TRANSPORT_TESTING_PeerContext *p,
+ GNUNET_TRANSPORT_TESTING_StartCallback restart_cb,
+ void *restart_cb_cls)
{
- GNUNET_assert (p != NULL);
- if (p->th != NULL)
+ struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc;
+ struct GNUNET_TRANSPORT_TESTING_ConnectRequest *ccn;
+
+ /* shutdown */
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Stopping peer %u (`%s')\n",
+ p->no,
+ GNUNET_i2s (&p->id));
+ if (NULL != p->ghh)
+ {
+ GNUNET_TRANSPORT_get_hello_cancel (p->ghh);
+ p->ghh = NULL;
+ }
+ if (NULL != p->th)
+ {
GNUNET_TRANSPORT_disconnect (p->th);
-
- if (NULL != p->arm_proc)
+ p->th = NULL;
+ }
+ for (cc = p->tth->cc_head; NULL != cc; cc = ccn)
+ {
+ ccn = cc->next;
+ if ( (cc->p1 == p) ||
+ (cc->p2 == p) )
+ GNUNET_TRANSPORT_TESTING_connect_peers_cancel (cc);
+ }
+ if (NULL != p->ats)
{
- 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_ATS_connectivity_done (p->ats);
+ p->ats = NULL;
}
- if (p->servicehome != NULL)
+ if (GNUNET_SYSERR ==
+ GNUNET_TESTING_peer_stop (p->peer))
{
- GNUNET_DISK_directory_remove (p->servicehome);
- GNUNET_free (p->servicehome);
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "Failed to stop peer %u (`%s')\n",
+ p->no,
+ GNUNET_i2s (&p->id));
+ return GNUNET_SYSERR;
}
- if (p->cfg != NULL)
+ sleep (5); // YUCK!
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Restarting peer %u (`%s')\n",
+ p->no,
+ GNUNET_i2s (&p->id));
+ /* restart */
+ if (GNUNET_SYSERR == GNUNET_TESTING_peer_start (p->peer))
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "Failed to restart peer %u (`%s')\n",
+ p->no,
+ GNUNET_i2s (&p->id));
+ return GNUNET_SYSERR;
+ }
+
+ GNUNET_assert (NULL == p->start_cb);
+ p->start_cb = restart_cb;
+ p->start_cb_cls = restart_cb_cls;
+
+ p->th = GNUNET_TRANSPORT_connect (p->cfg,
+ NULL,
+ p,
+ ¬ify_receive,
+ ¬ify_connect,
+ ¬ify_disconnect);
+ GNUNET_assert (NULL != p->th);
+ p->ats = GNUNET_ATS_connectivity_init (p->cfg);
+ p->ghh = GNUNET_TRANSPORT_get_hello (p->cfg,
+ &get_hello,
+ p);
+ GNUNET_assert (NULL != p->ghh);
+ return GNUNET_OK;
+}
+
+
+/**
+ * Shutdown the given peer
+ *
+ * @param p the peer
+ */
+void
+GNUNET_TRANSPORT_TESTING_stop_peer (struct GNUNET_TRANSPORT_TESTING_PeerContext *p)
+{
+ struct GNUNET_TRANSPORT_TESTING_Handle *tth = p->tth;
+ struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc;
+ struct GNUNET_TRANSPORT_TESTING_ConnectRequest *ccn;
+
+ for (cc = tth->cc_head; NULL != cc; cc = ccn)
+ {
+ ccn = cc->next;
+ if ( (cc->p1 == p) ||
+ (cc->p2 == p) )
+ GNUNET_TRANSPORT_TESTING_connect_peers_cancel (cc);
+ }
+ if (NULL != p->ghh)
+ {
+ GNUNET_TRANSPORT_get_hello_cancel (p->ghh);
+ p->ghh = NULL;
+ }
+ if (NULL != p->th)
+ {
+ GNUNET_TRANSPORT_disconnect (p->th);
+ p->th = NULL;
+ }
+ if (NULL != p->peer)
+ {
+ if (GNUNET_OK !=
+ GNUNET_TESTING_peer_stop (p->peer))
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Testing lib failed to stop peer %u (`%s')\n",
+ p->no,
+ GNUNET_i2s (&p->id));
+ }
+ GNUNET_TESTING_peer_destroy (p->peer);
+ p->peer = NULL;
+ }
+ if (NULL != p->ats)
+ {
+ GNUNET_ATS_connectivity_done (p->ats);
+ p->ats = NULL;
+ }
+ if (NULL != p->hello)
+ {
+ GNUNET_free (p->hello);
+ p->hello = NULL;
+ }
+ if (NULL != p->cfg)
+ {
GNUNET_CONFIGURATION_destroy (p->cfg);
+ p->cfg = NULL;
+ }
+ GNUNET_CONTAINER_DLL_remove (tth->p_head,
+ tth->p_tail,
+ p);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Peer %u (`%s') stopped\n",
+ p->no,
+ GNUNET_i2s (&p->id));
GNUNET_free (p);
- p = NULL;
}
+
/**
- * 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
- * @return connect context
+ * Function called after the HELLO was passed to the
+ * transport service.
*/
-GNUNET_TRANSPORT_TESTING_ConnectRequest
-GNUNET_TRANSPORT_TESTING_connect_peers (struct PeerContext *p1,
- struct PeerContext *p2,
- GNUNET_TRANSPORT_TESTING_connect_cb cb,
- void *cb_cls)
+static void
+hello_offered (void *cls)
{
- struct ConnectingContext *cc =
- GNUNET_malloc (sizeof (struct ConnectingContext));
+ struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc = cls;
- GNUNET_assert (p1 != NULL);
- GNUNET_assert (p2 != NULL);
+ cc->oh = NULL;
+ cc->tct = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+ &offer_hello,
+ cc);
+}
- cc->p1 = p1;
- cc->p2 = p2;
- cc->cb = cb;
- cc->cb_cls = cb_cls;
+/**
+ * Offer the current HELLO of P2 to P1.
+ *
+ * @param cls our `struct GNUNET_TRANSPORT_TESTING_ConnectRequest`
+ */
+static void
+offer_hello (void *cls)
+{
+ struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc = cls;
+ struct GNUNET_TRANSPORT_TESTING_PeerContext *p1 = cc->p1;
+ struct GNUNET_TRANSPORT_TESTING_PeerContext *p2 = cc->p2;
- cc->th_p1 =
- GNUNET_TRANSPORT_connect (cc->p1->cfg, NULL, cc, NULL,
- ¬ify_connect_internal, NULL);
+ cc->tct = NULL;
+ {
+ char *p2_s = GNUNET_strdup (GNUNET_i2s (&p2->id));
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Asking peer %u (`%s') to connect peer %u (`%s'), providing HELLO with %u bytes\n",
+ p1->no,
+ GNUNET_i2s (&p1->id),
+ p2->no,
+ p2_s,
+ GNUNET_HELLO_size (cc->p2->hello));
+ GNUNET_free (p2_s);
+ }
- cc->th_p2 =
- GNUNET_TRANSPORT_connect (cc->p2->cfg, NULL, cc, NULL,
- ¬ify_connect_internal, NULL);
+ if (NULL != cc->oh)
+ GNUNET_TRANSPORT_offer_hello_cancel (cc->oh);
+ cc->oh =
+ GNUNET_TRANSPORT_offer_hello (cc->p1->cfg,
+ (const struct GNUNET_MessageHeader *) cc->p2->hello,
+ &hello_offered,
+ cc);
+}
- GNUNET_assert (cc->th_p1 != NULL);
- GNUNET_assert (cc->th_p2 != NULL);
- GNUNET_TRANSPORT_get_hello (cc->th_p1, &exchange_hello, cc);
- GNUNET_TRANSPORT_get_hello (cc->th_p2, &exchange_hello_last, cc);
+/**
+ * Initiate a connection from p1 to p2 by offering p1 p2's HELLO message
+ *
+ * Remarks: start_peer's notify_connect callback can be called before.
+ *
+ * @param tth transport testing handle
+ * @param p1 peer 1
+ * @param p2 peer 2
+ * @param cb the callback to call when both peers notified that they are connected
+ * @param cls callback cls
+ * @return a connect request handle
+ */
+struct GNUNET_TRANSPORT_TESTING_ConnectRequest *
+GNUNET_TRANSPORT_TESTING_connect_peers (struct GNUNET_TRANSPORT_TESTING_PeerContext *p1,
+ struct GNUNET_TRANSPORT_TESTING_PeerContext *p2,
+ GNUNET_SCHEDULER_TaskCallback cb,
+ void *cls)
+{
+ struct GNUNET_TRANSPORT_TESTING_Handle *tth = p1->tth;
+ struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc;
- cc->tct = GNUNET_SCHEDULER_add_now (&try_connect, cc);
+ cc = GNUNET_new (struct GNUNET_TRANSPORT_TESTING_ConnectRequest);
+ cc->p1 = p1;
+ cc->p2 = p2;
+ cc->cb = cb;
+ if (NULL != cls)
+ cc->cb_cls = cls;
+ else
+ cc->cb_cls = cc;
+ GNUNET_CONTAINER_DLL_insert (tth->cc_head,
+ tth->cc_tail,
+ cc);
+ cc->tct = GNUNET_SCHEDULER_add_now (&offer_hello,
+ cc);
+ cc->ats_sh = GNUNET_ATS_connectivity_suggest (cc->p1->ats,
+ &p2->id,
+ 1);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "New connect request %p\n",
+ cc);
return cc;
}
+
/**
* Cancel the request to connect two peers
* Tou MUST cancel the request if you stop the peers before the peers connected succesfully
+ *
+ * @param tth transport testing handle
* @param cc a connect request handle
*/
-void GNUNET_TRANSPORT_TESTING_connect_peers_cancel
- (GNUNET_TRANSPORT_TESTING_ConnectRequest ccr)
+void
+GNUNET_TRANSPORT_TESTING_connect_peers_cancel (struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc)
{
- struct ConnectingContext *cc = ccr;
-
- /* 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);
+ struct GNUNET_TRANSPORT_TESTING_Handle *tth = cc->p1->tth;
- if (cc->tct != GNUNET_SCHEDULER_NO_TASK)
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Canceling connect request!\n");
+ if (NULL != 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);
-
+ cc->tct = NULL;
+ }
+ if (NULL != cc->oh)
+ {
+ GNUNET_TRANSPORT_offer_hello_cancel (cc->oh);
+ cc->oh = NULL;
+ }
+ if (NULL != cc->ats_sh)
+ {
+ GNUNET_ATS_connectivity_suggest_cancel (cc->ats_sh);
+ cc->ats_sh = NULL;
+ }
+ GNUNET_CONTAINER_DLL_remove (tth->cc_head,
+ tth->cc_tail,
+ cc);
GNUNET_free (cc);
}
-/*
- * Some utility functions
- */
/**
- * this function takes the filename (e.g. argv[0), removes a "lt-"-prefix and
- * if existing ".exe"-prefix and adds the peer-number
- * @param file filename of the test, e.g. argv[0]
- * @param cfgname where to write the result
- * @param count peer number
+ * Clean up the transport testing
+ *
+ * @param tth transport testing handle
*/
void
-GNUNET_TRANSPORT_TESTING_get_config_name (const char *file, char **cfgname,
- int count)
+GNUNET_TRANSPORT_TESTING_done (struct GNUNET_TRANSPORT_TESTING_Handle *tth)
{
- char *pch = strdup (file);
- char *backup = pch;
- char *filename = NULL;
- char *dotexe;
+ struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc;
+ struct GNUNET_TRANSPORT_TESTING_ConnectRequest *ct;
+ struct GNUNET_TRANSPORT_TESTING_PeerContext *p;
+ struct GNUNET_TRANSPORT_TESTING_PeerContext *t;
-
- /* get executable filename */
- pch = strtok (pch, "/");
- while (pch != NULL)
+ if (NULL == tth)
+ return;
+ cc = tth->cc_head;
+ while (NULL != cc)
{
- pch = strtok (NULL, "/");
- if (pch != NULL)
- filename = pch;
+ ct = cc->next;
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "Developer forgot to cancel connect request!\n");
+ GNUNET_TRANSPORT_TESTING_connect_peers_cancel (cc);
+ cc = ct;
}
- /* remove "lt-" */
- filename = strstr (filename, "tes");
- if (NULL != (dotexe = strstr (filename, ".exe")))
- dotexe[0] = '\0';
-
- /* create cfg filename */
- GNUNET_asprintf (cfgname, "%s_peer%u.conf", filename, count);
+ p = tth->p_head;
+ while (NULL != p)
+ {
+ t = p->next;
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "Developer forgot to stop peer!\n");
+ GNUNET_TRANSPORT_TESTING_stop_peer (p);
+ p = t;
+ }
+ GNUNET_TESTING_system_destroy (tth->tl_system,
+ GNUNET_YES);
- GNUNET_free (backup);
+ GNUNET_free (tth);
}
-/* end of transport_testing.h */
+/**
+ * Initialize the transport testing
+ *
+ * @return transport testing handle
+ */
+struct GNUNET_TRANSPORT_TESTING_Handle *
+GNUNET_TRANSPORT_TESTING_init ()
+{
+ struct GNUNET_TRANSPORT_TESTING_Handle *tth;
+
+ tth = GNUNET_new (struct GNUNET_TRANSPORT_TESTING_Handle);
+ tth->tl_system = GNUNET_TESTING_system_create ("transport-testing",
+ NULL,
+ NULL,
+ NULL);
+ if (NULL == tth->tl_system)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Failed to initialize testing library!\n");
+ GNUNET_free (tth);
+ return NULL;
+ }
+ return tth;
+}
+
+/* end of transport-testing.c */
projects / oweals / gnunet.git / blobdiff