/*
This file is part of GNUnet.
- (C) 2010,2011 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2010,2011 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
#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
-static GNUNET_SCHEDULER_TaskIdentifier die_task;
+static struct GNUNET_SCHEDULER_Task * die_task;
/**
* Statistics handle
*/
-struct GNUNET_STATISTICS_Handle *stats;
+static struct GNUNET_STATISTICS_Handle *stats;
/**
* Configuration handle
*/
-struct GNUNET_CONFIGURATION_Handle *cfg;
+static struct GNUNET_CONFIGURATION_Handle *cfg;
/**
* ATS scheduling handle
*/
static struct GNUNET_ATS_PerformanceHandle *perf_ats;
-struct GNUNET_ATS_AddressListHandle* phal;
+static struct GNUNET_ATS_AddressListHandle* phal;
static int ret;
static struct Address p0_addresses[2];
static struct Address p1_addresses[2];
-struct GNUNET_HELLO_Address p0_ha[2];
-struct GNUNET_HELLO_Address p1_ha[2];
-struct GNUNET_HELLO_Address *s_ha[2];
+static struct GNUNET_HELLO_Address p0_ha[2];
+static struct GNUNET_HELLO_Address p1_ha[2];
static void
uint32_t ats_count)
{
static int counter = 0;
+
if (NULL == address)
{
- phal = 0;
+ phal = NULL;
if (2 == counter)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
}
else
{
+ fprintf (stderr,
+ "Expected 2 addresses, got %d\n",
+ counter);
GNUNET_break (0);
GNUNET_SCHEDULER_shutdown ();
}
static int
-stat_cb(void *cls, const char *subsystem,
- const char *name, uint64_t value,
- int is_persistent)
+stat_cb (void *cls, const char *subsystem,
+ const char *name, uint64_t value,
+ int is_persistent)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
if (NULL == (perf_ats = GNUNET_ATS_performance_init (cfg, NULL, NULL)))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Failed to connect to performance API\n");
+ "Failed to connect to performance API\n");
GNUNET_SCHEDULER_shutdown ();
return GNUNET_SYSERR;
}
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Shutting down\n");
- if (die_task != GNUNET_SCHEDULER_NO_TASK )
+ if (die_task != NULL )
{
GNUNET_SCHEDULER_cancel (die_task);
- die_task = GNUNET_SCHEDULER_NO_TASK;
+ die_task = NULL;
}
-
if (NULL != sched_ats)
{
GNUNET_ATS_scheduling_done (sched_ats);
sched_ats = NULL;
}
-
if (NULL != phal)
{
GNUNET_ATS_performance_list_addresses_cancel (phal);
phal = NULL;
}
-
- if (perf_ats != NULL)
+ if (NULL != perf_ats)
{
GNUNET_ATS_performance_done (perf_ats);
perf_ats = NULL;
end_badly (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- die_task = GNUNET_SCHEDULER_NO_TASK;
+ die_task = NULL;
end (NULL, NULL);
ret = GNUNET_SYSERR;
}
const struct GNUNET_HELLO_Address *address,
struct Session *session,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
- struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
- const struct GNUNET_ATS_Information *atsi,
- uint32_t ats_count)
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Did not expect suggestion callback!\n");
static void
-run (void *cls, const struct GNUNET_CONFIGURATION_Handle *mycfg,
- struct GNUNET_TESTING_Peer *peer)
+run (void *cls,
+ const struct GNUNET_CONFIGURATION_Handle *mycfg,
+ struct GNUNET_TESTING_Peer *peer)
{
ret = 1;
cfg = (struct GNUNET_CONFIGURATION_Handle *) mycfg;
p0_ha[1].peer = p[0].id;
p0_ha[1].transport_name = p0_addresses[1].plugin;
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Created peer 0: `%s'\n",
- GNUNET_i2s (&p[0].id));
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Created peer 0: `%s'\n",
+ GNUNET_i2s (&p[0].id));
memset (&p[1].id, '2', sizeof (p[1].id));
p1_addresses[0].plugin = "test";
p1_ha[1].peer = p[1].id;
p1_ha[1].transport_name = p1_addresses[1].plugin;
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Created peer 1: `%s'\n",
- GNUNET_i2s (&p[1].id));
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Created peer 1: `%s'\n",
+ GNUNET_i2s (&p[1].id));
/* Add addresses */
- sched_ats = GNUNET_ATS_scheduling_init (cfg, &address_suggest_cb, NULL );
+ sched_ats = GNUNET_ATS_scheduling_init (cfg,
+ &address_suggest_cb, NULL);
if (NULL == sched_ats)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,