/*
This file is part of GNUnet.
- (C) 2009 Christian Grothoff (and other contributing authors)
+ (C) 2009, 2010 Christian Grothoff (and other contributing authors)
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
#define START_ARM GNUNET_YES
-
/**
* How long until we give up on transmitting the message?
*/
struct GNUNET_PeerIdentity id;
struct GNUNET_TRANSPORT_Handle *th;
struct GNUNET_MessageHeader *hello;
+ int connect_status;
#if START_ARM
pid_t arm_pid;
#endif
GNUNET_CORE_disconnect (p2.ch);
GNUNET_TRANSPORT_disconnect (p1.th);
GNUNET_TRANSPORT_disconnect (p2.th);
- GNUNET_ARM_stop_services (p1.cfg, sched, "core", NULL);
- GNUNET_ARM_stop_services (p2.cfg, sched, "core", NULL);
ok = 0;
}
static void
terminate_task_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+#if VERBOSE
+ fprintf(stderr, "ENDING ANGRILY %u\n", ok);
+#endif
GNUNET_break (0);
GNUNET_CORE_disconnect (p1.ch);
GNUNET_CORE_disconnect (p2.ch);
GNUNET_TRANSPORT_disconnect (p1.th);
GNUNET_TRANSPORT_disconnect (p2.th);
- GNUNET_ARM_stop_services (p1.cfg, sched, "core", NULL);
- GNUNET_ARM_stop_services (p2.cfg, sched, "core", NULL);
ok = 42;
}
struct GNUNET_TIME_Relative latency,
uint32_t distance)
{
- GNUNET_assert ((ok == 5) || (ok == 6));
+ struct PeerContext *pc = cls;
+ GNUNET_assert (pc->connect_status == 0);
+ pc->connect_status = 1;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Encrypted connection established to peer `%4s'\n",
GNUNET_i2s (peer));
disconnect_notify (void *cls,
const struct GNUNET_PeerIdentity *peer)
{
+ struct PeerContext *pc = cls;
+ pc->connect_status = 0;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Encrypted connection to `%4s' cut\n", GNUNET_i2s (peer));
}
m->size = htons (sizeof (struct GNUNET_MessageHeader));
err_task =
GNUNET_SCHEDULER_add_delayed (sched,
- GNUNET_TIME_UNIT_MINUTES, &terminate_task_error, NULL);
+ GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 120), &terminate_task_error, NULL);
return sizeof (struct GNUNET_MessageHeader);
}
p2.cfg,
TIMEOUT,
&p2,
- &init_notify,
- NULL,
+ &init_notify,
&connect_notify,
&disconnect_notify,
+ NULL,
&inbound_notify,
GNUNET_YES,
&outbound_notify, GNUNET_YES, handlers);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Asking core (1) for transmission to peer `%4s'\n",
GNUNET_i2s (&p2.id));
- GNUNET_CORE_notify_transmit_ready (p1.ch,
+
+ if (NULL == GNUNET_CORE_notify_transmit_ready (p1.ch,
0,
- TIMEOUT,
+ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 45),
&p2.id,
sizeof (struct GNUNET_MessageHeader),
- &transmit_ready, &p1);
+ &transmit_ready, &p1))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "RECEIVED NULL when asking core (1) for transmission to peer `%4s'\n",
+ GNUNET_i2s (&p2.id));
+ }
}
}
{
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, NULL, NULL);
+ p->th = GNUNET_TRANSPORT_connect (sched, p->cfg, NULL, p, NULL, NULL, NULL);
GNUNET_assert (p->th != NULL);
GNUNET_TRANSPORT_get_hello (p->th, &process_hello, p);
}
TIMEOUT,
&p1,
&init_notify,
- NULL,
- &connect_notify,
+ &connect_notify,
&disconnect_notify,
+ NULL,
&inbound_notify,
GNUNET_YES, &outbound_notify, GNUNET_YES, handlers);
}