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
process_hello (void *cls, const struct GNUNET_MessageHeader *message)
{
struct GNUNET_TESTING_Daemon *daemon = cls;
+ int msize;
if (daemon == NULL)
return;
}
GNUNET_assert (message != NULL);
+ msize = ntohs(message->size);
+ if (msize < 1)
+ {
+ return;
+ }
if (daemon->th != NULL)
{
GNUNET_TRANSPORT_get_hello_cancel(daemon->th, &process_hello, daemon);
"HELLO", GNUNET_i2s (&daemon->id));
#endif
- GNUNET_free_non_null(daemon->hello);
- daemon->hello = GNUNET_malloc(ntohs(message->size));
- memcpy(daemon->hello, message, ntohs(message->size));
- if (daemon->th != NULL)
+
{
- GNUNET_TRANSPORT_disconnect(daemon->th);
- daemon->th = NULL;
+ GNUNET_free_non_null(daemon->hello);
+ daemon->hello = GNUNET_malloc(msize);
+ memcpy(daemon->hello, message, msize);
+
+ if (daemon->th != NULL)
+ {
+ GNUNET_TRANSPORT_disconnect(daemon->th);
+ daemon->th = NULL;
+ }
}
}
d->th = GNUNET_TRANSPORT_connect (d->sched,
- d->cfg, d, NULL, NULL, NULL);
+ d->cfg,
+ &d->id,
+ d, NULL, NULL, NULL);
if (d->th == NULL)
{
if (GNUNET_YES == d->dead)
ARM_START_WAIT,
d,
&testing_init,
- NULL, NULL,
+ NULL, NULL, NULL,
NULL, GNUNET_NO,
NULL, GNUNET_NO, no_handlers);
break;
{
if (GNUNET_TIME_absolute_get_remaining(d->max_timeout).value == 0)
{
- d->dead_cb (d->dead_cb_cls,
- _("either `gnunet-arm' or `ssh' does not seem to terminate.\n"));
+ if (NULL != d->dead_cb)
+ d->dead_cb (d->dead_cb_cls,
+ _("either `gnunet-arm' or `ssh' does not seem to terminate.\n"));
if (d->th != NULL)
{
GNUNET_TRANSPORT_get_hello_cancel(d->th, &process_hello, d);
* generated for this peer, but it hasn't yet been started
* (NULL to start immediately, otherwise waits on GNUNET_TESTING_daemon_continue_start)
* @param hostkey_cls closure for hostkey callback
- * @param cb function to call with the result
+ * @param cb function to call once peer is up, or failed to start
* @param cb_cls closure for cb
* @return handle to the daemon (actual start will be completed asynchronously)
*/
return;
}
+ if ((d->running == GNUNET_NO) && (d->churn == GNUNET_YES)) /* Peer has already been stopped in churn context! */
+ {
+ /* Free what was left from churning! */
+ GNUNET_assert(d->cfg != NULL);
+ GNUNET_CONFIGURATION_destroy (d->cfg);
+ if (delete_files == GNUNET_YES)
+ {
+ if (0 != UNLINK(d->cfgfile))
+ {
+ GNUNET_log_strerror(GNUNET_ERROR_TYPE_WARNING, "unlink");
+ }
+ }
+ GNUNET_free (d->cfgfile);
+ GNUNET_free_non_null (d->hostname);
+ GNUNET_free_non_null (d->username);
+ if (NULL != d->dead_cb)
+ d->dead_cb (d->dead_cb_cls, NULL);
+ return;
+ }
+
del_arg = NULL;
if (delete_files == GNUNET_YES)
{
*/
struct GNUNET_TIME_Relative timeout_hello;
-
/**
* Was the connection attempt successful?
*/
int connected;
+
+ /**
+ * The distance between the two connected peers
+ */
+ uint32_t distance;
};
{
if (ctx->cb != NULL)
{
- ctx->cb (ctx->cb_cls, &ctx->d1->id, &ctx->d2->id, ctx->d1->cfg,
+ ctx->cb (ctx->cb_cls, &ctx->d1->id, &ctx->d2->id, ctx->distance, ctx->d1->cfg,
ctx->d2->cfg, ctx->d1, ctx->d2, NULL);
}
}
{
if (ctx->cb != NULL)
{
- ctx->cb (ctx->cb_cls, &ctx->d1->id, &ctx->d2->id, ctx->d1->cfg,
+ ctx->cb (ctx->cb_cls, &ctx->d1->id, &ctx->d2->id, 0, ctx->d1->cfg,
ctx->d2->cfg, ctx->d1, ctx->d2,
_("Peers failed to connect"));
}
if (memcmp(&ctx->d2->id, peer, sizeof(struct GNUNET_PeerIdentity)) == 0)
{
ctx->connected = GNUNET_YES;
+ ctx->distance = distance;
GNUNET_SCHEDULER_cancel(ctx->d1->sched, ctx->timeout_task);
ctx->timeout_task = GNUNET_SCHEDULER_add_now (ctx->d1->sched,
¬ify_connect_result,
if ((d1->running == GNUNET_NO) || (d2->running == GNUNET_NO))
{
if (NULL != cb)
- cb (cb_cls, &d1->id, &d2->id, d1->cfg, d2->cfg, d1, d2,
+ cb (cb_cls, &d1->id, &d2->id, 0, d1->cfg, d2->cfg, d1, d2,
_("Peers are not fully running yet, can not connect!\n"));
return;
}
timeout,
ctx,
NULL,
- &connect_notify, NULL,
+ &connect_notify, NULL, NULL,
NULL, GNUNET_NO,
NULL, GNUNET_NO, no_handlers);
if (ctx->d1core == NULL)
{
GNUNET_free (ctx);
if (NULL != cb)
- cb (cb_cls, &d1->id, &d2->id, d1->cfg, d2->cfg, d1, d2,
+ cb (cb_cls, &d1->id, &d2->id, 0, d1->cfg, d2->cfg, d1, d2,
_("Failed to connect to core service of first peer!\n"));
return;
}
#endif
ctx->d2th = GNUNET_TRANSPORT_connect (d2->sched,
- d2->cfg, d2, NULL, NULL, NULL);
+ d2->cfg,
+ &d2->id,
+ d2, NULL, NULL, NULL);
if (ctx->d2th == NULL)
{
GNUNET_CORE_disconnect(ctx->d1core);
GNUNET_free (ctx);
if (NULL != cb)
- cb (cb_cls, &d1->id, &d2->id, d1->cfg, d2->cfg, d1, d2,
+ cb (cb_cls, &d1->id, &d2->id, 0, d1->cfg, d2->cfg, d1, d2,
_("Failed to connect to transport service!\n"));
return;
}
GNUNET_TIME_absolute_get_remaining(ctx->timeout),
ctx,
NULL,
- &connect_notify, NULL,
+ &connect_notify, NULL, NULL,
NULL, GNUNET_NO,
NULL, GNUNET_NO, no_handlers);
if (ctx->d1core == NULL)
{
if (NULL != ctx->cb)
- ctx->cb (ctx->cb_cls, &ctx->d1->id, &ctx->d2->id, ctx->d1->cfg, ctx->d2->cfg, ctx->d1, ctx->d2,
+ ctx->cb (ctx->cb_cls, &ctx->d1->id, &ctx->d2->id, 0, ctx->d1->cfg, ctx->d2->cfg, ctx->d1, ctx->d2,
_("Failed to connect to core service of first peer!\n"));
GNUNET_free (ctx);
return;
}
ctx->d2th = GNUNET_TRANSPORT_connect (ctx->d2->sched,
- ctx->d2->cfg, ctx->d2, NULL, NULL, NULL);
+ ctx->d2->cfg,
+ &ctx->d2->id,
+ ctx->d2, NULL, NULL, NULL);
if (ctx->d2th == NULL)
{
GNUNET_CORE_disconnect(ctx->d1core);
GNUNET_free (ctx);
if (NULL != ctx->cb)
- ctx->cb (ctx->cb_cls, &ctx->d1->id, &ctx->d2->id, ctx->d1->cfg, ctx->d2->cfg, ctx->d1, ctx->d2,
+ ctx->cb (ctx->cb_cls, &ctx->d1->id, &ctx->d2->id, 0, ctx->d1->cfg, ctx->d2->cfg, ctx->d1, ctx->d2,
_("Failed to connect to transport service!\n"));
return;
}