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
#include "gnunet_arm_service.h"
#include "gnunet_transport_service.h"
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
#define START_ARM GNUNET_YES
/**
* How long until we give up on transmitting the message?
*/
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 150)
static int ok;
struct GNUNET_CONFIGURATION_Handle *cfg;
struct GNUNET_TRANSPORT_Handle *th;
struct GNUNET_MessageHeader *hello;
- struct GNUNET_ARM_Handle *arm;
#if START_ARM
pid_t arm_pid;
#endif
static void
clean_up (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GNUNET_TRANSPORT_disconnect (p1.th);
- p1.th = NULL;
- GNUNET_TRANSPORT_disconnect (p2.th);
- p2.th = NULL;
+ if (p1.th != NULL)
+ {
+ GNUNET_TRANSPORT_disconnect (p1.th);
+ p1.th = NULL;
+ }
+ if (p2.th != NULL)
+ {
+ GNUNET_TRANSPORT_disconnect (p2.th);
+ p2.th = NULL;
+ }
GNUNET_SCHEDULER_shutdown (sched);
}
* @param cls closure
* @param peer the peer that connected
* @param latency current latency of the connection
+ * @param distance in overlay hops, as given by transport plugin
*/
static void
notify_connect (void *cls,
const struct GNUNET_PeerIdentity * peer,
- struct GNUNET_TIME_Relative latency)
+ struct GNUNET_TIME_Relative latency,
+ unsigned int distance)
{
if (peer == NULL)
return;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Peers connected, shutting down.\n");
- GNUNET_assert (ok == 4);
ok = 0;
- GNUNET_SCHEDULER_cancel (sched,
- timeout_task);
- timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ if (timeout_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (sched,
+ timeout_task);
+ timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ }
GNUNET_SCHEDULER_add_now (sched,
&clean_up, NULL);
}
static void
process_hello (void *cls,
- struct GNUNET_TIME_Relative latency,
- const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_MessageHeader *message)
{
struct PeerContext *p = cls;
- if (message == NULL)
- return;
+ GNUNET_TRANSPORT_get_hello_cancel (p->th, &process_hello, p);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received HELLO, starting hostlist service.\n");
- GNUNET_assert ( (ok >= 2) && (ok <= 3) );
- ok++;
- GNUNET_ARM_start_services (p->cfg, sched, "hostlist", NULL);
}
{
p->cfg = GNUNET_CONFIGURATION_create ();
#if START_ARM
- p->arm_pid = GNUNET_OS_start_process ("gnunet-service-arm",
+ p->arm_pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
"gnunet-service-arm",
#if VERBOSE
"-L", "DEBUG",
"-c", cfgname, NULL);
#endif
GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
- GNUNET_ARM_start_services (p->cfg, sched, "core", NULL);
- p->th = GNUNET_TRANSPORT_connect (sched, p->cfg, p, NULL,
+ p->th = GNUNET_TRANSPORT_connect (sched, p->cfg, NULL, p, NULL,
¬ify_connect, NULL);
GNUNET_assert (p->th != NULL);
- GNUNET_TRANSPORT_get_hello (p->th, TIMEOUT, &process_hello, p);
+ GNUNET_TRANSPORT_get_hello (p->th, &process_hello, p);
}
static void
-stop_cb (void *cls,
- int success)
+stop_arm (struct PeerContext *p)
{
- struct PeerContext *p = cls;
-
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- success
- ? "ARM stopped core service\n"
- : "ARM failed to stop core service\n");
- GNUNET_ARM_disconnect (p->arm);
- p->arm = NULL;
- /* make sure this runs after all other tasks are done */
+ "Asking ARM to stop core service\n");
GNUNET_SCHEDULER_add_delayed (sched,
GNUNET_TIME_UNIT_SECONDS,
&waitpid_task, p);
}
-static void
-stop_arm (struct PeerContext *p)
-{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Asking ARM to stop core service\n");
- p->arm = GNUNET_ARM_connect (p->cfg, sched, NULL);
- GNUNET_ARM_stop_service (p->arm, "core", GNUNET_TIME_UNIT_SECONDS,
- &stop_cb, p);
-}
-
-
/**
* Try again to connect to transport service.
*/
ok++;
sched = s;
timeout_task = GNUNET_SCHEDULER_add_delayed (sched,
- GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
- 15),
+ TIMEOUT,
&timeout_error,
NULL);
GNUNET_SCHEDULER_add_delayed (sched,