/*
This file is part of GNUnet.
- Copyright (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
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)
+notify_connect (void *cls,
+ const struct GNUNET_PeerIdentity *peer)
{
struct PeerContext *p = cls;
char *p2_s;
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;
static void
-notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
+notify_receive (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_MessageHeader *message)
{
struct PeerContext *p = cls;
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;
if (NULL != p->start_cb)
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Peer %u (`%s') successfully started\n", p->no,
+ "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
+offer_hello (void *cls);
+
+
+/**
+ * Function called after the HELLO was passed to the
+ * transport service.
+ */
static void
-try_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+hello_offered (void *cls)
{
- struct ConnectingContext *cc = cls;
- struct PeerContext *p1 = cc->p1;
- struct PeerContext *p2 = cc->p2;
+ struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc = cls;
- cc->tct = NULL;
- if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
- return;
+ cc->oh = NULL;
+ cc->tct =
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+ &offer_hello,
+ cc);
+}
- GNUNET_assert (cc != NULL);
- GNUNET_assert (cc->p1 != NULL);
- GNUNET_assert (cc->p2 != NULL);
- char *p2_s = GNUNET_strdup (GNUNET_i2s (&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;
- 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->tct = NULL;
+ {
+ char *p2_s = GNUNET_strdup (GNUNET_i2s (&p2->id));
- 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, NULL, NULL); /*FIXME TRY_CONNECT change */
+ 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->tct =
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &try_connect, cc);
+ 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);
}
*/
struct PeerContext *
GNUNET_TRANSPORT_TESTING_start_peer (struct GNUNET_TRANSPORT_TESTING_handle *tth,
- const char *cfgname, int peer_id,
+ const char *cfgname,
+ int peer_id,
GNUNET_TRANSPORT_ReceiveCallback rec,
GNUNET_TRANSPORT_NotifyConnect nc,
GNUNET_TRANSPORT_NotifyDisconnect nd,
p->no = peer_id;
/* Configure peer with configuration */
- p->peer = GNUNET_TESTING_peer_configure (tth->tl_system, p->cfg, p->no, NULL, &emsg);
+ p->peer = GNUNET_TESTING_peer_configure (tth->tl_system,
+ p->cfg, p->no, NULL, &emsg);
if (NULL == p->peer)
{
LOG (GNUNET_ERROR_TYPE_ERROR,
p->th = GNUNET_TRANSPORT_connect (p->cfg, NULL, p,
¬ify_receive,
- ¬ify_connect, ¬ify_disconnect);
+ ¬ify_connect,
+ ¬ify_disconnect);
if (NULL == p->th)
{
LOG (GNUNET_ERROR_TYPE_ERROR,
- "Failed to connect to transport service for peer `%s': `%s'\n",
+ "Failed to connect to transport 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);
+ 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);
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)
{
- GNUNET_assert (tth != NULL);
- GNUNET_assert (p != NULL);
GNUNET_assert (NULL != p->peer);
LOG (GNUNET_ERROR_TYPE_DEBUG,
p->no,
GNUNET_i2s (&p->id));
if (NULL != p->ghh)
+ {
GNUNET_TRANSPORT_get_hello_cancel (p->ghh);
- p->ghh = NULL;
-
+ p->ghh = NULL;
+ }
if (NULL != p->th)
+ {
GNUNET_TRANSPORT_disconnect (p->th);
+ p->th = NULL;
+ }
+ if (NULL != p->ats)
+ {
+ GNUNET_ATS_connectivity_done (p->ats);
+ p->ats = NULL;
+ }
- if (GNUNET_SYSERR == GNUNET_TESTING_peer_stop(p->peer))
+ if (GNUNET_SYSERR == GNUNET_TESTING_peer_stop (p->peer))
{
LOG (GNUNET_ERROR_TYPE_ERROR,
"Failed to stop peer %u (`%s')\n",
sleep (5); // YUCK!
/* restart */
- if (GNUNET_SYSERR == GNUNET_TESTING_peer_start(p->peer))
+ 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));
+ p->no,
+ GNUNET_i2s (&p->id));
return GNUNET_SYSERR;
}
- GNUNET_assert (p->th != NULL);
- GNUNET_assert (p->start_cb == NULL);
+ GNUNET_assert (NULL == p->start_cb);
p->start_cb = restart_cb;
p->cb_cls = cb_cls;
- p->th = GNUNET_TRANSPORT_connect (p->cfg, NULL, p,
+ p->th = GNUNET_TRANSPORT_connect (p->cfg,
+ NULL,
+ p,
¬ify_receive,
¬ify_connect,
¬ify_disconnect);
GNUNET_assert (NULL != p->th);
-
- p->ghh = GNUNET_TRANSPORT_get_hello (p->th, &get_hello, p);
- GNUNET_assert (p->ghh != NULL);
+ 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;
}
/**
- * 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)
+ if (NULL != p->th)
{
GNUNET_TRANSPORT_disconnect (p->th);
p->th = NULL;
}
-
- if (p->peer != NULL)
+ if (NULL != p->peer)
{
if (GNUNET_OK != GNUNET_TESTING_peer_stop (p->peer))
{
GNUNET_TESTING_peer_destroy (p->peer);
p->peer = NULL;
}
-
- if (p->hello != 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 (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_CONTAINER_DLL_remove (tth->p_head,
+ tth->p_tail,
+ p);
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Peer %u (`%s') stopped \n", p->no,
+ "Peer %u (`%s') stopped \n",
+ p->no,
GNUNET_i2s (&p->id));
GNUNET_free (p);
}
* @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 ConnectingContext *cc =
- GNUNET_new (struct ConnectingContext);
+ struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc;
- 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_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);
* 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);
-
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Canceling connect request %p!\n",
cc);
-
- if (cc->tct != NULL)
+ if (NULL != cc->tct)
+ {
GNUNET_SCHEDULER_cancel (cc->tct);
- cc->tct = NULL;
+ 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;
LOG (GNUNET_ERROR_TYPE_ERROR,
"Developer forgot to cancel connect request %p!\n",
cc);
- GNUNET_TRANSPORT_TESTING_connect_peers_cancel (tth, cc);
+ GNUNET_TRANSPORT_TESTING_connect_peers_cancel (tth,
+ cc);
cc = ct;
}
- while (p != NULL)
+ while (NULL != p)
{
t = p->next;
LOG (GNUNET_ERROR_TYPE_ERROR,
p = t;
}
- GNUNET_TESTING_system_destroy (tth->tl_system, GNUNET_YES);
+ GNUNET_TESTING_system_destroy (tth->tl_system,
+ GNUNET_YES);
GNUNET_free (tth);
tth = NULL;
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);
+ 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_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Failed to initialize testing library!\n"));
GNUNET_free (tth);
return NULL;
}
/**
* 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
*/
/**
- * 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);
projects / oweals / gnunet.git / blobdiff