/*
This file is part of GNUnet.
- (C) 2006, 2009 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2006, 2009, 2015 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.
*/
/**
*
* @author Matthias Wachs
*/
-
#include "transport-testing.h"
-#define HOSTKEYFILESIZE 914
-static const char *
-get_host_key (struct GNUNET_TRANSPORT_TESTING_handle *tth)
-{
- if (tth->hostkey_data == NULL)
- {
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
- "No precomputed hostkeys available\n");
- return NULL;
- }
- if (tth->hostkeys_total > tth->hostkeys_last)
- {
- tth->hostkeys_last++;
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
- "Used hostkey %u of %u available hostkeys\n",
- tth->hostkeys_last, tth->hostkeys_total);
- return &tth->hostkey_data[(tth->hostkeys_last - 1) * HOSTKEYFILESIZE];
- }
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
- "No hostkey available (%u of %u already used)\n",
- tth->hostkeys_last, tth->hostkeys_total);
- return NULL;
-}
+#define LOG(kind,...) GNUNET_log_from(kind, "transport-testing", __VA_ARGS__)
static struct PeerContext *
find_peer_context (struct GNUNET_TRANSPORT_TESTING_handle *tth,
const struct GNUNET_PeerIdentity *peer)
{
- GNUNET_assert (tth != NULL);
struct PeerContext *t = tth->p_head;
while (t != NULL)
}
-static struct ConnectingContext *
+static struct GNUNET_TRANSPORT_TESTING_ConnectRequest *
find_connecting_context (struct GNUNET_TRANSPORT_TESTING_handle *tth,
- struct PeerContext *p1, struct PeerContext *p2)
+ struct PeerContext *p1,
+ struct PeerContext *p2)
{
GNUNET_assert (tth != NULL);
- struct ConnectingContext *cc = tth->cc_head;
+ struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc = tth->cc_head;
while (cc != NULL)
{
static void
-notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
+notify_connect (void *cls,
+ const struct GNUNET_PeerIdentity *peer)
{
struct PeerContext *p = cls;
+ char *p2_s;
+ struct PeerContext *p2;
- /* Find PeerContext */
- GNUNET_assert (p != 0);
- GNUNET_assert (p->tth != NULL);
- struct PeerContext *p2 = find_peer_context (p->tth, peer);
-
- if (p == NULL)
- return;
+ GNUNET_assert (NULL != p);
+ GNUNET_assert (NULL != p->tth);
+ p2 = find_peer_context (p->tth, peer);
if (p->nc != NULL)
- p->nc (p->cb_cls, peer, ats, ats_count);
-
- char *p2_s;
+ 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));
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
- "Peers %s connected to peer %u (`%s')\n", p2_s, p->no,
- GNUNET_i2s (&p->id));
+ 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);
/* Find ConnectingContext */
- struct ConnectingContext *cc = find_connecting_context (p->tth, p, p2);
+ struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc = find_connecting_context (p->tth, p, p2);
if (cc == NULL)
return;
static void
-notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
+notify_disconnect (void *cls,
+ const struct GNUNET_PeerIdentity *peer)
{
struct PeerContext *p = cls;
GNUNET_asprintf (&p2_s, "%u (`%s')", p2->no, GNUNET_i2s (&p2->id));
else
GNUNET_asprintf (&p2_s, "`%s'", GNUNET_i2s (peer));
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
- "Peers %s disconnected from peer %u (`%s')\n", p2_s, no,
- GNUNET_i2s (&p->id));
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Peers %s disconnected from peer %u (`%s')\n",
+ p2_s,
+ no,
+ GNUNET_i2s (&p->id));
GNUNET_free (p2_s);
if (p == NULL)
static void
-notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
+notify_receive (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_MessageHeader *message)
{
struct PeerContext *p = cls;
if (p == NULL)
return;
if (p->rec != NULL)
- p->rec (p->cb_cls, peer, message, ats, ats_count);
+ p->rec (p->cb_cls, peer, message);
}
static void
-get_hello (void *cb_cls, const struct GNUNET_MessageHeader *message)
+get_hello (void *cb_cls,
+ const struct GNUNET_MessageHeader *message)
{
struct PeerContext *p = cb_cls;
+ struct GNUNET_PeerIdentity hello_id;
GNUNET_assert (message != NULL);
GNUNET_assert (GNUNET_OK ==
GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *)
- message, &p->id));
+ 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 (p->start_cb != NULL)
+ if (NULL != p->start_cb)
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
- "Peer %u (`%s') successfully started\n", p->no,
- GNUNET_i2s (&p->id));
-
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Peer %u (`%s') successfully started\n",
+ p->no,
+ GNUNET_i2s (&p->id));
p->start_cb (p, p->cb_cls);
p->start_cb = NULL;
}
}
+/**
+ * Offer the current HELLO of P2 to P1.
+ *
+ * @param cls our `struct GNUNET_TRANSPORT_TESTING_ConnectRequest `
+ */
static void
-try_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct ConnectingContext *cc = cls;
- struct PeerContext *p1 = cc->p1;
- struct PeerContext *p2 = cc->p2;
+offer_hello (void *cls);
- cc->tct = GNUNET_SCHEDULER_NO_TASK;
- if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
- return;
- GNUNET_assert (cc != NULL);
- GNUNET_assert (cc->p1 != NULL);
- GNUNET_assert (cc->p2 != NULL);
+/**
+ * Function called after the HELLO was passed to the
+ * transport service.
+ */
+static void
+hello_offered (void *cls)
+{
+ struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc = cls;
- char *p2_s = GNUNET_strdup (GNUNET_i2s (&p2->id));
+ cc->oh = NULL;
+ cc->tct =
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+ &offer_hello,
+ cc);
+}
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
- "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);
- GNUNET_TRANSPORT_offer_hello (cc->th_p1,
- (const struct GNUNET_MessageHeader *) cc->
- p2->hello, NULL, NULL);
- GNUNET_TRANSPORT_try_connect (cc->th_p1, &p2->id);
+/**
+ * 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 PeerContext *p1 = cc->p1;
+ struct PeerContext *p2 = cc->p2;
- cc->tct =
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &try_connect, cc);
+ 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);
+ }
+
+ if (NULL != cc->oh)
+ GNUNET_TRANSPORT_offer_hello_cancel (cc->oh);
+ cc->oh =
+ GNUNET_TRANSPORT_offer_hello (cc->p1->th,
+ (const struct GNUNET_MessageHeader *) cc->p2->hello,
+ &hello_offered,
+ cc);
}
* Start a peer with the given configuration
* @param tth the testing handle
* @param cfgname configuration file
- * @param peer_id the peer_id
+ * @param peer_id a unique number to identify the peer
* @param rec receive callback
* @param nc connect callback
* @param nd disconnect callback
* @return the peer context
*/
struct PeerContext *
-GNUNET_TRANSPORT_TESTING_start_peer (struct GNUNET_TRANSPORT_TESTING_handle
- *tth, const char *cfgname, int peer_id,
+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,
GNUNET_TRANSPORT_TESTING_start_cb start_cb,
void *cb_cls)
{
- const char *hostkey = NULL;
- struct GNUNET_DISK_FileHandle *fn;
+ char *emsg = NULL;
+ struct GNUNET_PeerIdentity *dummy;
+
+ GNUNET_assert (NULL != tth);
+ GNUNET_assert (NULL != tth->tl_system);
- GNUNET_assert (tth != NULL);
if (GNUNET_DISK_file_test (cfgname) == GNUNET_NO)
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "transport-testing",
- "File not found: `%s' \n", cfgname);
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "File not found: `%s'\n",
+ cfgname);
return NULL;
}
- struct PeerContext *p = GNUNET_malloc (sizeof (struct PeerContext));
+ struct PeerContext *p = GNUNET_new (struct PeerContext);
+ 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_CONFIGURATION_have_value (p->cfg, "PATHS", "SERVICEHOME"))
- GNUNET_assert (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_string (p->cfg, "PATHS",
- "SERVICEHOME",
- &p->servicehome));
-
- if (NULL != p->servicehome)
- GNUNET_DISK_directory_remove (p->servicehome);
-
- hostkey = get_host_key (tth);
- if (hostkey != NULL)
- {
-
- GNUNET_asprintf (&p->hostkeyfile, "%s/.hostkey", p->servicehome);
- GNUNET_assert (GNUNET_OK ==
- GNUNET_DISK_directory_create_for_file (p->hostkeyfile));
- fn = GNUNET_DISK_file_open (p->hostkeyfile,
- GNUNET_DISK_OPEN_READWRITE |
- GNUNET_DISK_OPEN_CREATE,
- GNUNET_DISK_PERM_USER_READ |
- GNUNET_DISK_PERM_USER_WRITE);
- GNUNET_assert (fn != NULL);
- GNUNET_assert (HOSTKEYFILESIZE ==
- GNUNET_DISK_file_write (fn, hostkey, HOSTKEYFILESIZE));
- GNUNET_assert (GNUNET_OK == GNUNET_DISK_file_close (fn));
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
- "Wrote hostkey to file: `%s' \n", p->hostkeyfile);
- }
-
- p->arm_proc =
- GNUNET_OS_start_process (GNUNET_YES,
- NULL, NULL, "gnunet-service-arm",
- "gnunet-service-arm", "-c", cfgname,
- "-L", "ERROR",
- NULL);
+ 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_free (p);
+ return 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 (tth, 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 (tth, 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 (tth, p);
+ return NULL;
+ }
+ else
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Peer %u configured with identity `%s'\n",
+ p->no,
+ GNUNET_i2s_full (&p->id));
+ }
+
p->tth = tth;
p->nc = nc;
p->nd = nd;
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);
-
- p->ghh = GNUNET_TRANSPORT_get_hello (p->th, &get_hello, p);
+ 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 (tth, 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 (tth, p);
+ return NULL;
+ }
+ p->ghh = GNUNET_TRANSPORT_get_hello (p->th,
+ &get_hello,
+ p);
GNUNET_assert (p->ghh != NULL);
- GNUNET_CONTAINER_DLL_insert (tth->p_head, tth->p_tail, p);
return p;
}
+
/**
-* Restart the given peer
-* @param tth testing handle
-* @param p the peer
-* @param cfgname the cfg file used to restart
-* @param restart_cb callback to call when restarted
-* @param cb_cls callback closure
-* @return GNUNET_OK in success otherwise GNUNET_SYSERR
-*/
+ * Restart the given peer
+ *
+ * @param p the peer
+ * @param cfgname the cfg file used to restart
+ * @param restart_cb callback to call when restarted
+ * @param cb_cls callback closure
+ * @return #GNUNET_OK in success otherwise #GNUNET_SYSERR
+ */
int
-GNUNET_TRANSPORT_TESTING_restart_peer (struct GNUNET_TRANSPORT_TESTING_handle
- *tth, struct PeerContext *p,
+GNUNET_TRANSPORT_TESTING_restart_peer (struct PeerContext *p,
const char *cfgname,
- GNUNET_TRANSPORT_TESTING_start_cb
- restart_cb, void *cb_cls)
+ GNUNET_TRANSPORT_TESTING_start_cb restart_cb,
+ void *cb_cls)
{
- struct GNUNET_DISK_FileHandle *fn;
+ GNUNET_assert (NULL != p->peer);
- GNUNET_assert (tth != NULL);
- GNUNET_assert (p != NULL);
- GNUNET_assert (p->hostkeyfile != NULL);
- GNUNET_assert (p->servicehome != NULL);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Restarting peer %u (`%s')\n",
+ p->no,
+ GNUNET_i2s (&p->id));
/* shutdown */
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
- "Stopping peer %u (`%s')\n", p->no, GNUNET_i2s (&p->id));
- if (p->ghh != NULL)
+ 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 (p->th != NULL)
+ p->ghh = NULL;
+ }
+ if (NULL != p->th)
+ {
GNUNET_TRANSPORT_disconnect (p->th);
-
- if (NULL != p->arm_proc)
+ p->th = NULL;
+ }
+ 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_destroy (p->arm_proc);
- p->arm_proc = NULL;
+ GNUNET_ATS_connectivity_done (p->ats);
+ p->ats = NULL;
}
- if (p->hello != NULL)
- GNUNET_free (p->hello);
- p->hello = NULL;
-
- if (p->cfg != NULL)
- GNUNET_CONFIGURATION_destroy (p->cfg);
- p->cfg = NULL;
-
-
- /* start */
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
- "Restarting peer %u (`%s')\n", p->no, GNUNET_i2s (&p->id));
- sleep (5); // YUCK!
- if (GNUNET_DISK_file_test (cfgname) == GNUNET_NO)
+ if (GNUNET_SYSERR == GNUNET_TESTING_peer_stop (p->peer))
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "transport-testing",
- "File not found: `%s' \n", cfgname);
- goto fail;
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "Failed to stop peer %u (`%s')\n",
+ p->no,
+ GNUNET_i2s (&p->id));
+ return GNUNET_SYSERR;
}
- p->cfg = GNUNET_CONFIGURATION_create ();
- GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
-
- if (!GNUNET_CONFIGURATION_have_value (p->cfg, "PATHS", "SERVICEHOME"))
- goto fail;
-
- fn = GNUNET_DISK_file_open (p->hostkeyfile,
- GNUNET_DISK_OPEN_READWRITE |
- GNUNET_DISK_OPEN_CREATE,
- GNUNET_DISK_PERM_USER_READ |
- GNUNET_DISK_PERM_USER_WRITE);
- if (fn == NULL)
- goto fail;
- if (GNUNET_OK != GNUNET_DISK_file_close (fn))
- goto fail;
-
- p->arm_proc =
- GNUNET_OS_start_process (GNUNET_YES,
- NULL, NULL, "gnunet-service-arm",
- "gnunet-service-arm", "-c", cfgname,
- "-L", "ERROR",
- NULL);
+ sleep (5); // YUCK!
- p->th =
- GNUNET_TRANSPORT_connect (p->cfg, NULL, p, ¬ify_receive,
- ¬ify_connect, ¬ify_disconnect);
- GNUNET_assert (p->th != NULL);
+ /* 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->cb_cls = cb_cls;
- p->ghh = GNUNET_TRANSPORT_get_hello (p->th, &get_hello, p);
- GNUNET_assert (p->ghh != NULL);
+ 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->th,
+ &get_hello,
+ p);
+ GNUNET_assert (NULL != p->ghh);
return GNUNET_OK;
-
-fail:
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
- "Restarting peer %u (`%s') failed, removing peer\n", p->no,
- GNUNET_i2s (&p->id));
- GNUNET_TRANSPORT_TESTING_stop_peer (tth, p);
- return GNUNET_SYSERR;
}
/**
- * shutdown the given peer
+ * Shutdown the given peer
+ *
* @param tth testing handle
* @param p the peer
*/
GNUNET_TRANSPORT_TESTING_stop_peer (struct GNUNET_TRANSPORT_TESTING_handle *tth,
struct PeerContext *p)
{
- GNUNET_assert (p != NULL);
- if (p->ghh != NULL)
+ if (NULL != p->ghh)
{
GNUNET_TRANSPORT_get_hello_cancel (p->ghh);
p->ghh = NULL;
}
- if (p->th != NULL)
- GNUNET_TRANSPORT_disconnect (p->th);
- if (NULL != p->arm_proc)
+ if (NULL != p->th)
{
- 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_destroy (p->arm_proc);
- p->arm_proc = NULL;
+ GNUNET_TRANSPORT_disconnect (p->th);
+ p->th = NULL;
}
- if (p->hostkeyfile != NULL)
+ if (NULL != p->peer)
{
- GNUNET_DISK_directory_remove (p->hostkeyfile);
- GNUNET_free (p->hostkeyfile);
+ 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 (p->servicehome != NULL)
+ if (NULL != p->ats)
{
- GNUNET_DISK_directory_remove (p->servicehome);
- GNUNET_free (p->servicehome);
+ GNUNET_ATS_connectivity_done (p->ats);
+ p->ats = NULL;
}
- if (p->hello != NULL)
+ if (NULL != p->hello)
{
GNUNET_free (p->hello);
p->hello = NULL;
}
- if (p->cfg != NULL)
+ if (NULL != p->cfg)
{
GNUNET_CONFIGURATION_destroy (p->cfg);
p->cfg = NULL;
}
- GNUNET_CONTAINER_DLL_remove (tth->p_head, tth->p_tail, p);
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
- "Peer %u (`%s') stopped \n", p->no,
- GNUNET_i2s (&p->id));
+ 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);
}
/**
- * Connect the given peers and call the callback when both peers report the
- * inbound connection. Remarks: start_peer's notify_connect callback can be called
- * before.
+ * 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 cls callback cls
* @return a connect request handle
*/
-GNUNET_TRANSPORT_TESTING_ConnectRequest
+struct GNUNET_TRANSPORT_TESTING_ConnectRequest *
GNUNET_TRANSPORT_TESTING_connect_peers (struct GNUNET_TRANSPORT_TESTING_handle *tth,
struct PeerContext *p1,
struct PeerContext *p2,
GNUNET_TRANSPORT_TESTING_connect_cb cb,
void *cls)
{
- GNUNET_assert (tth != NULL);
+ struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc;
- struct ConnectingContext *cc =
- GNUNET_malloc (sizeof (struct ConnectingContext));
-
- GNUNET_assert (p1 != NULL);
- GNUNET_assert (p2 != NULL);
+ cc = GNUNET_new (struct GNUNET_TRANSPORT_TESTING_ConnectRequest);
cc->p1 = p1;
cc->p2 = p2;
cc->cb = cb;
- if (cls != NULL)
+ if (NULL != cls)
cc->cb_cls = cls;
else
cc->cb_cls = cc;
- cc->th_p1 = p1->th;
- cc->th_p2 = p2->th;
- GNUNET_assert (cc->th_p1 != NULL);
- GNUNET_assert (cc->th_p2 != NULL);
- GNUNET_CONTAINER_DLL_insert (tth->cc_head, tth->cc_tail, cc);
- cc->tct = GNUNET_SCHEDULER_add_now (&try_connect, cc);
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
- "New connect request %X\n", 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;
}
* Tou MUST cancel the request if you stop the peers before the peers connected succesfully
*
* @param tth transport testing handle
- * @param ccr a connect request handle
+ * @param cc a connect request handle
*/
void
-GNUNET_TRANSPORT_TESTING_connect_peers_cancel (struct
- GNUNET_TRANSPORT_TESTING_handle
- *tth,
- GNUNET_TRANSPORT_TESTING_ConnectRequest
- ccr)
+GNUNET_TRANSPORT_TESTING_connect_peers_cancel (struct GNUNET_TRANSPORT_TESTING_handle *tth,
+ struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc)
{
- struct ConnectingContext *cc = ccr;
-
- GNUNET_assert (tth != NULL);
-
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
- "Canceling connect request %X!\n", cc);
-
- if (cc->tct != GNUNET_SCHEDULER_NO_TASK)
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Canceling connect request %p!\n",
+ cc);
+ if (NULL != cc->tct)
+ {
GNUNET_SCHEDULER_cancel (cc->tct);
- cc->tct = GNUNET_SCHEDULER_NO_TASK;
+ 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_CONTAINER_DLL_remove (tth->cc_head,
+ tth->cc_tail,
+ cc);
GNUNET_free (cc);
}
void
GNUNET_TRANSPORT_TESTING_done (struct GNUNET_TRANSPORT_TESTING_handle *tth)
{
- struct ConnectingContext *cc = tth->cc_head;
- struct ConnectingContext *ct = NULL;
+ struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc = tth->cc_head;
+ struct GNUNET_TRANSPORT_TESTING_ConnectRequest *ct = NULL;
struct PeerContext *p = tth->p_head;
struct PeerContext *t = NULL;
- GNUNET_assert (tth != NULL);
-
while (cc != tth->cc_tail)
{
ct = cc->next;
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "transport-testing",
- "Developer forgot to cancel connect request %X!\n", cc);
- GNUNET_TRANSPORT_TESTING_connect_peers_cancel (tth, cc);
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "Developer forgot to cancel connect request %p!\n",
+ cc);
+ GNUNET_TRANSPORT_TESTING_connect_peers_cancel (tth,
+ cc);
cc = ct;
}
- while (p != NULL)
+ while (NULL != p)
{
t = p->next;
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "transport-testing",
- "Developer forgot to stop peer!\n");
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "Developer forgot to stop peer!\n");
GNUNET_TRANSPORT_TESTING_stop_peer (tth, p);
p = t;
}
- GNUNET_free_non_null (tth->hostkey_data);
+ GNUNET_TESTING_system_destroy (tth->tl_system,
+ GNUNET_YES);
GNUNET_free (tth);
tth = NULL;
GNUNET_TRANSPORT_TESTING_init ()
{
struct GNUNET_TRANSPORT_TESTING_handle *tth;
- struct GNUNET_DISK_FileHandle *fd;
- uint64_t fs;
- uint64_t total_hostkeys;
-
/* prepare hostkeys */
- tth = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_TESTING_handle));
- tth->hostkey_data = NULL;
- const char *hostkeys_file = "../../contrib/testing_hostkeys.dat";
-
- if (GNUNET_YES != GNUNET_DISK_file_test (hostkeys_file))
+ tth = GNUNET_new (struct GNUNET_TRANSPORT_TESTING_handle);
+
+ /* Init testing the testing lib */
+ tth->tl_system = GNUNET_TESTING_system_create ("transport-testing",
+ NULL,
+ NULL,
+ NULL);
+ if (NULL == tth->tl_system)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Could not read hostkeys file!\n"));
- }
- else
- {
- /* Check hostkey file size, read entire thing into memory */
- fd = GNUNET_DISK_file_open (hostkeys_file, GNUNET_DISK_OPEN_READ,
- GNUNET_DISK_PERM_NONE);
- if (NULL == fd)
- {
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "open", hostkeys_file);
- GNUNET_free (tth);
- return NULL;
- }
-
- if (GNUNET_OK != GNUNET_DISK_file_size (hostkeys_file, &fs, GNUNET_YES, GNUNET_YES))
- fs = 0;
-
- if (0 != (fs % HOSTKEYFILESIZE))
- {
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "transport-testing",
- "File size %llu seems incorrect for hostkeys...\n", fs);
- }
- else
- {
- total_hostkeys = fs / HOSTKEYFILESIZE;
- tth->hostkey_data = GNUNET_malloc_large (fs);
- GNUNET_assert (fs == GNUNET_DISK_file_read (fd, tth->hostkey_data, fs));
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
- "Read %llu hostkeys from file\n", total_hostkeys);
- tth->hostkeys_total = total_hostkeys;
- }
- GNUNET_assert (GNUNET_OK == GNUNET_DISK_file_close (fd));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Failed to initialize testing library!\n"));
+ GNUNET_free (tth);
+ return NULL;
}
return tth;
/**
* Removes all directory separators from absolute filename
+ *
* @param file the absolute file name, e.g. as found in argv[0]
* @return extracted file name, has to be freed by caller
*/
char *backup = pch;
char *filename = NULL;
char *res;
-
+#if WINDOWS
+ if ((strlen (pch) >= 3) && pch[1] == ':')
+ {
+ if (NULL != strstr (pch, "\\"))
+ {
+ pch = strtok (pch, "\\");
+ while (pch != NULL)
+ {
+ pch = strtok (NULL, "\\");
+ if (pch != NULL)
+ filename = pch;
+ }
+ }
+ }
+ if (filename != NULL)
+ pch = filename; /* If we miss the next condition, filename = pch will
+ * not harm us.
+ */
+#endif
if (NULL != strstr (pch, "/"))
{
pch = strtok (pch, "/");
/**
- * Extracts the test filename from an absolute file name and removes the extension
+ * Extracts the test filename from an absolute file name and removes
+ * the extension
+ *
* @param file absolute file name
* @param dest where to store result
*/
void
-GNUNET_TRANSPORT_TESTING_get_test_name (const char *file, char **dest)
+GNUNET_TRANSPORT_TESTING_get_test_name (const char *file,
+ char **dest)
{
char *filename = extract_filename (file);
char *backup = filename;
/**
* Extracts the filename from an absolute file name and removes the extension
+ *
* @param file absolute file name
* @param dest where to store result
*/
void
-GNUNET_TRANSPORT_TESTING_get_test_source_name (const char *file, char **dest)
+GNUNET_TRANSPORT_TESTING_get_test_source_name (const char *file,
+ char **dest)
{
char *src = extract_filename (file);
char *split;
*/
void
GNUNET_TRANSPORT_TESTING_get_test_plugin_name (const char *file,
- const char *test, char **dest)
+ const char *test,
+ char **dest)
{
char *filename;
char *dotexe;
* @param count peer number
*/
void
-GNUNET_TRANSPORT_TESTING_get_config_name (const char *file, char **dest,
+GNUNET_TRANSPORT_TESTING_get_config_name (const char *file,
+ char **dest,
int count)
{
char *filename = extract_filename (file);
}
-
/* end of transport-testing.c */
projects / oweals / gnunet.git / blobdiff