/*
This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011, 2012 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
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
* @file dht/test_dht_monitor.c
/**
* Task called to disconnect peers.
*/
-static GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+static struct GNUNET_SCHEDULER_Task * timeout_task;
/**
* Task to do DHT_puts
*/
-static GNUNET_SCHEDULER_TaskIdentifier put_task;
+static struct GNUNET_SCHEDULER_Task * put_task;
static struct GNUNET_DHT_MonitorHandle **monitors;
* the testbed.
*
* @param cls the 'struct GNUNET_DHT_TestContext'
- * @param tc scheduler context
*/
static void
-shutdown_task (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls)
{
struct GNUNET_DHT_TEST_Context *ctx = cls;
unsigned int i;
* Task to put the id of each peer into the DHT.
*
* @param cls array with NUM_PEERS DHT handles
- * @param tc Task context
*/
static void
-do_puts (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_puts (void *cls)
{
struct GNUNET_DHT_Handle **hs = cls;
struct GNUNET_HashCode key;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"%u got a PUT message for key %s with %u bytes\n",
i,
- GNUNET_h2s (key), size);
+ GNUNET_h2s (key),
+ (unsigned int) size);
monitor_counter++;
}
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"%u got a REPLY message for key %s with %u bytes\n",
i,
- GNUNET_h2s (key), size);
+ GNUNET_h2s (key),
+ (unsigned int) size);
monitor_counter++;
}
GNUNET_CRYPTO_hash (&i, sizeof (i), &key);
for (j=0;j<num_peers;j++)
{
- get_op = GNUNET_malloc (sizeof (struct GetOperation));
+ get_op = GNUNET_new (struct GetOperation);
GNUNET_CONTAINER_DLL_insert (get_head,
get_tail,
get_op);