diff options
author | Bertrand Marc <beberking@gmail.com> | 2012-06-06 20:47:50 +0200 |
---|---|---|
committer | Bertrand Marc <beberking@gmail.com> | 2012-06-06 20:47:50 +0200 |
commit | 15d0a119987bc62675a17dea2c24b652a42c53e3 (patch) | |
tree | d6598fb09c24a8004da21bee1a19f3f1ea37c66c /src/dht/test_dht_api.c | |
parent | c47dd4e3165b7894669d8f7f800bac75ac8ad95c (diff) | |
parent | 740b30688bd745a527f96f9116c19acb3480971a (diff) |
Merge tag 'upstream/0.9.3'
Upstream version 0.9.3
Diffstat (limited to 'src/dht/test_dht_api.c')
-rw-r--r-- | src/dht/test_dht_api.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/dht/test_dht_api.c b/src/dht/test_dht_api.c index 182856a..000ad33 100644 --- a/src/dht/test_dht_api.c +++ b/src/dht/test_dht_api.c @@ -121,7 +121,7 @@ stop_arm (struct PeerContext *p) if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); GNUNET_OS_process_wait (p->arm_proc); - GNUNET_OS_process_close (p->arm_proc); + GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; #endif GNUNET_CONFIGURATION_destroy (p->cfg); @@ -195,10 +195,10 @@ test_get_iterator (void *cls, struct GNUNET_TIME_Absolute exp, * Signature of the main function of a task. * * @param cls closure - * @param tc context information (why was this task triggered now) + * @param success result of PUT */ static void -test_get (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +test_get (void *cls, int success) { struct PeerContext *peer = cls; GNUNET_HashCode hash; @@ -212,7 +212,7 @@ test_get (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) retry_context.next_timeout = BASE_TIMEOUT; peer->get_handle = - GNUNET_DHT_get_start (peer->dht_handle, TOTAL_TIMEOUT, + GNUNET_DHT_get_start (peer->dht_handle, GNUNET_BLOCK_TYPE_TEST, &hash, 1, GNUNET_DHT_RO_NONE, NULL, 0, &test_get_iterator, NULL); |