projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
migrate transport_core API to MQ
[oweals/gnunet.git]
/
src
/
dht
/
test_dht_monitor.c
diff --git
a/src/dht/test_dht_monitor.c
b/src/dht/test_dht_monitor.c
index 98791d28f76b766ea64210782ff4e55fb326b989..5e6fc074a05474ddb2411c739d3a1fb096210ed1 100644
(file)
--- a/
src/dht/test_dht_monitor.c
+++ b/
src/dht/test_dht_monitor.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
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
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@
-14,8
+14,8
@@
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
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., 5
9 Temple Place - Suite 330
,
- Boston, MA 0211
1-1307
, USA.
+ Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+ Boston, MA 0211
0-1301
, USA.
*/
/**
* @file dht/test_dht_monitor.c
*/
/**
* @file dht/test_dht_monitor.c
@@
-90,12
+90,12
@@
static unsigned int NUM_PEERS = 3;
/**
* Task called to disconnect peers.
*/
/**
* Task called to disconnect peers.
*/
-static
GNUNET_SCHEDULER_TaskIdentifier
timeout_task;
+static
struct GNUNET_SCHEDULER_Task *
timeout_task;
/**
* Task to do DHT_puts
*/
/**
* Task to do DHT_puts
*/
-static
GNUNET_SCHEDULER_TaskIdentifier
put_task;
+static
struct GNUNET_SCHEDULER_Task *
put_task;
static struct GNUNET_DHT_MonitorHandle **monitors;
static struct GNUNET_DHT_MonitorHandle **monitors;
@@
-108,11
+108,9
@@
static unsigned int monitor_counter;
* the testbed.
*
* @param cls the 'struct GNUNET_DHT_TestContext'
* the testbed.
*
* @param cls the 'struct GNUNET_DHT_TestContext'
- * @param tc scheduler context
*/
static void
*/
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;
{
struct GNUNET_DHT_TEST_Context *ctx = cls;
unsigned int i;
@@
-197,11
+195,9
@@
dht_get_handler (void *cls, struct GNUNET_TIME_Absolute exp,
* Task to put the id of each peer into the DHT.
*
* @param cls array with NUM_PEERS DHT handles
* 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
*/
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;
{
struct GNUNET_DHT_Handle **hs = cls;
struct GNUNET_HashCode key;
@@
-220,7
+216,6
@@
do_puts (void *cls,
GNUNET_BLOCK_TYPE_TEST,
sizeof (value), &value,
GNUNET_TIME_UNIT_FOREVER_ABS,
GNUNET_BLOCK_TYPE_TEST,
sizeof (value), &value,
GNUNET_TIME_UNIT_FOREVER_ABS,
- GNUNET_TIME_UNIT_FOREVER_REL,
NULL, NULL);
}
put_task = GNUNET_SCHEDULER_add_delayed (PUT_FREQUENCY,
NULL, NULL);
}
put_task = GNUNET_SCHEDULER_add_delayed (PUT_FREQUENCY,
@@
-297,7
+292,8
@@
monitor_put_cb (void *cls,
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"%u got a PUT message for key %s with %u bytes\n",
i,
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++;
}
monitor_counter++;
}
@@
-335,7
+331,8
@@
monitor_res_cb (void *cls,
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"%u got a REPLY message for key %s with %u bytes\n",
i,
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++;
}
monitor_counter++;
}