From: Christian Grothoff Date: Sun, 27 May 2012 20:14:21 +0000 (+0000) Subject: -fixing #2340 X-Git-Tag: initial-import-from-subversion-38251~13386 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b55ae0b50e36537b83a02941caf32a05e3403412;p=oweals%2Fgnunet.git -fixing #2340 --- diff --git a/src/dht/dht_api.c b/src/dht/dht_api.c index 131070302..420eacbff 100644 --- a/src/dht/dht_api.c +++ b/src/dht/dht_api.c @@ -1135,7 +1135,6 @@ GNUNET_DHT_put_cancel (struct GNUNET_DHT_PutHandle *ph) * also "GNUNET_BLOCK_evaluate". * * @param handle handle to the DHT service - * @param timeout how long to wait for transmission of this request to the service * @param type expected type of the response object * @param key the key to look up * @param desired_replication_level estimate of how many @@ -1149,7 +1148,6 @@ GNUNET_DHT_put_cancel (struct GNUNET_DHT_PutHandle *ph) */ struct GNUNET_DHT_GetHandle * GNUNET_DHT_get_start (struct GNUNET_DHT_Handle *handle, - struct GNUNET_TIME_Relative timeout, enum GNUNET_BLOCK_Type type, const GNUNET_HashCode * key, uint32_t desired_replication_level, enum GNUNET_DHT_RouteOption options, const void *xquery, diff --git a/src/dht/gnunet-dht-get.c b/src/dht/gnunet-dht-get.c index 6ad4b30f8..fb185c489 100644 --- a/src/dht/gnunet-dht-get.c +++ b/src/dht/gnunet-dht-get.c @@ -186,7 +186,7 @@ run (void *cls, char *const *args, const char *cfgfile, GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining (absolute_timeout), &cleanup_task, NULL); get_handle = - GNUNET_DHT_get_start (dht_handle, timeout, query_type, &key, replication, + GNUNET_DHT_get_start (dht_handle, query_type, &key, replication, GNUNET_DHT_RO_NONE, NULL, 0, &get_result_iterator, NULL); diff --git a/src/dht/test_dht_api.c b/src/dht/test_dht_api.c index 9c6231561..000ad3344 100644 --- a/src/dht/test_dht_api.c +++ b/src/dht/test_dht_api.c @@ -212,7 +212,7 @@ test_get (void *cls, int success) 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); diff --git a/src/dht/test_dht_monitor.c b/src/dht/test_dht_monitor.c index 62210e85c..ca6704a09 100644 --- a/src/dht/test_dht_monitor.c +++ b/src/dht/test_dht_monitor.c @@ -250,7 +250,7 @@ do_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_h2s_full (&d_far->id.hashPubKey)); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: from %s\n", GNUNET_h2s_full (&o->id.hashPubKey)); - get_h_far = GNUNET_DHT_get_start (hs[0], GNUNET_TIME_UNIT_FOREVER_REL, /* timeout */ + get_h_far = GNUNET_DHT_get_start (hs[0], GNUNET_BLOCK_TYPE_TEST, /* type */ &d_far->id.hashPubKey, /*key to search */ 4U, /* replication level */ diff --git a/src/dht/test_dht_multipeer.c b/src/dht/test_dht_multipeer.c index 2be938c96..ab7d90e24 100644 --- a/src/dht/test_dht_multipeer.c +++ b/src/dht/test_dht_multipeer.c @@ -621,7 +621,7 @@ do_get (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_assert (test_get->dht_handle != NULL); outstanding_gets++; test_get->get_handle = - GNUNET_DHT_get_start (test_get->dht_handle, GNUNET_TIME_UNIT_FOREVER_REL, + GNUNET_DHT_get_start (test_get->dht_handle, GNUNET_BLOCK_TYPE_TEST, &key, 1, route_option, NULL, 0, &get_result_iterator, test_get); test_get->task = diff --git a/src/dht/test_dht_topo.c b/src/dht/test_dht_topo.c index ed746a583..f69f5dca9 100644 --- a/src/dht/test_dht_topo.c +++ b/src/dht/test_dht_topo.c @@ -308,7 +308,7 @@ do_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_h2s_full (&o->id.hashPubKey)); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " looking for %s\n", GNUNET_h2s_full (&d->id.hashPubKey)); - get_h = GNUNET_DHT_get_start (hs[0], GNUNET_TIME_UNIT_FOREVER_REL, /* timeout */ + get_h = GNUNET_DHT_get_start (hs[0], GNUNET_BLOCK_TYPE_TEST, /* type */ &d->id.hashPubKey, /*key to search */ 4U, /* replication level */ @@ -319,7 +319,7 @@ do_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " looking for %s\n", GNUNET_h2s_full (&d2->id.hashPubKey)); - get_h_2 = GNUNET_DHT_get_start (hs[0], GNUNET_TIME_UNIT_FOREVER_REL, /* timeout */ + get_h_2 = GNUNET_DHT_get_start (hs[0], GNUNET_BLOCK_TYPE_TEST, /* type */ &d2->id.hashPubKey, /*key to search */ 4U, /* replication level */ @@ -328,7 +328,7 @@ do_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) &dht_get_id_handler, (void *)2); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " looking for %s\n", GNUNET_h2s_full (&d_far->id.hashPubKey)); - get_h_far = GNUNET_DHT_get_start (hs[0], GNUNET_TIME_UNIT_FOREVER_REL, /* timeout */ + get_h_far = GNUNET_DHT_get_start (hs[0], GNUNET_BLOCK_TYPE_TEST, /* type */ &d_far->id.hashPubKey, /*key to search */ 4U, /* replication level */ diff --git a/src/dht/test_dht_twopeer.c b/src/dht/test_dht_twopeer.c index 6f2b0de18..a5e2ece4e 100644 --- a/src/dht/test_dht_twopeer.c +++ b/src/dht/test_dht_twopeer.c @@ -250,8 +250,6 @@ get_stop_finished (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) &stop_retry_get, get_context); get_context->get_handle = GNUNET_DHT_get_start (get_context->dht_handle, - GNUNET_TIME_relative_multiply - (GNUNET_TIME_UNIT_SECONDS, 5), GNUNET_BLOCK_TYPE_DHT_HELLO, &get_context->peer->hashPubKey, 1, GNUNET_DHT_RO_NONE, NULL, 0, &get_result_iterator, @@ -285,8 +283,6 @@ do_get (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) &stop_retry_get, get_context); get_context->get_handle = GNUNET_DHT_get_start (get_context->dht_handle, - GNUNET_TIME_relative_multiply - (GNUNET_TIME_UNIT_SECONDS, 5), GNUNET_BLOCK_TYPE_DHT_HELLO, &get_context->peer->hashPubKey, 1, GNUNET_DHT_RO_FIND_PEER, NULL, 0, diff --git a/src/dht/test_dht_twopeer_get_put.c b/src/dht/test_dht_twopeer_get_put.c index b32428bb4..3271d046d 100644 --- a/src/dht/test_dht_twopeer_get_put.c +++ b/src/dht/test_dht_twopeer_get_put.c @@ -272,7 +272,7 @@ do_get (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) memset (&key, 42, sizeof (GNUNET_HashCode)); /* Set the key to the same thing as when data was inserted */ #endif global_get_handle = - GNUNET_DHT_get_start (peer2dht, GNUNET_TIME_relative_get_forever (), + GNUNET_DHT_get_start (peer2dht, #if DNS GNUNET_BLOCK_TYPE_DNS, #else diff --git a/src/dht/test_dht_twopeer_path_tracking.c b/src/dht/test_dht_twopeer_path_tracking.c index 31d4f92ae..6ecf6a381 100644 --- a/src/dht/test_dht_twopeer_path_tracking.c +++ b/src/dht/test_dht_twopeer_path_tracking.c @@ -259,7 +259,7 @@ put_finished (void *cls, int success) "waiting for get response (data not found)"); memset (&key, 42, sizeof (GNUNET_HashCode)); /* Set the key to the same thing as when data was inserted */ global_get_handle = - GNUNET_DHT_get_start (peer2dht, GNUNET_TIME_relative_get_forever (), + GNUNET_DHT_get_start (peer2dht, GNUNET_BLOCK_TYPE_TEST, &key, 1, GNUNET_DHT_RO_RECORD_ROUTE, NULL, 0, &get_result_iterator, NULL); diff --git a/src/dht/test_dht_twopeer_put_get.c b/src/dht/test_dht_twopeer_put_get.c index e40848291..44150e3e0 100644 --- a/src/dht/test_dht_twopeer_put_get.c +++ b/src/dht/test_dht_twopeer_put_get.c @@ -266,7 +266,7 @@ put_finished (void *cls, int success) memset (&key, 42, sizeof (GNUNET_HashCode)); /* Set the key to the same thing as when data was inserted */ global_get_handle = - GNUNET_DHT_get_start (peer2dht, GNUNET_TIME_UNIT_FOREVER_REL, + GNUNET_DHT_get_start (peer2dht, GNUNET_BLOCK_TYPE_TEST, &key, 1, GNUNET_DHT_RO_NONE, NULL, 0, &get_result_iterator, NULL); } diff --git a/src/fs/gnunet-service-fs_pr.c b/src/fs/gnunet-service-fs_pr.c index 5ae011c46..8ca4121a5 100644 --- a/src/fs/gnunet-service-fs_pr.c +++ b/src/fs/gnunet-service-fs_pr.c @@ -1082,7 +1082,7 @@ GSF_dht_lookup_ (struct GSF_PendingRequest *pr) xquery_size += sizeof (struct GNUNET_PeerIdentity); } pr->gh = - GNUNET_DHT_get_start (GSF_dht, GNUNET_TIME_UNIT_FOREVER_REL, + GNUNET_DHT_get_start (GSF_dht, pr->public_data.type, &pr->public_data.query, 5 /* DEFAULT_GET_REPLICATION */ , GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE, diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c index 56456ef99..0f65390ee 100644 --- a/src/gns/gnunet-service-gns_resolver.c +++ b/src/gns/gnunet-service-gns_resolver.c @@ -332,7 +332,6 @@ process_auth_discovery_ns_result(void* cls, GNUNET_assert(gph->get_handle == NULL); gph->get_handle = GNUNET_DHT_get_start(dht_handle, - GNUNET_TIME_UNIT_FOREVER_REL, GNUNET_BLOCK_TYPE_GNS_NAMERECORD, &lookup_key, DHT_GNS_REPLICATION_LEVEL, @@ -863,7 +862,6 @@ resolve_record_dht(struct ResolverHandle *rh) GNUNET_assert(rh->get_handle == NULL); rh->get_handle = GNUNET_DHT_get_start(dht_handle, - GNUNET_TIME_UNIT_FOREVER_REL, GNUNET_BLOCK_TYPE_GNS_NAMERECORD, &lookup_key, DHT_GNS_REPLICATION_LEVEL, @@ -1739,7 +1737,6 @@ resolve_delegation_dht(struct ResolverHandle *rh) GNUNET_assert(rh->get_handle == NULL); rh->get_handle = GNUNET_DHT_get_start(dht_handle, - GNUNET_TIME_UNIT_FOREVER_REL, GNUNET_BLOCK_TYPE_GNS_NAMERECORD, &lookup_key, DHT_GNS_REPLICATION_LEVEL, diff --git a/src/include/gnunet_dht_service.h b/src/include/gnunet_dht_service.h index 8bfa9c59a..6606acb7d 100644 --- a/src/include/gnunet_dht_service.h +++ b/src/include/gnunet_dht_service.h @@ -220,8 +220,6 @@ typedef void (*GNUNET_DHT_GetIterator) (void *cls, * also "GNUNET_BLOCK_evaluate". * * @param handle handle to the DHT service - * @param timeout how long to wait for transmission of this request to the service - * FIXME: this argument should probably be removed in the medium term... * @param type expected type of the response object * @param key the key to look up * @param desired_replication_level estimate of how many @@ -236,7 +234,6 @@ typedef void (*GNUNET_DHT_GetIterator) (void *cls, */ struct GNUNET_DHT_GetHandle * GNUNET_DHT_get_start (struct GNUNET_DHT_Handle *handle, - struct GNUNET_TIME_Relative timeout, enum GNUNET_BLOCK_Type type, const GNUNET_HashCode * key, uint32_t desired_replication_level, enum GNUNET_DHT_RouteOption options, const void *xquery, diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c index 7b52a7d4f..d278c2039 100644 --- a/src/mesh/gnunet-service-mesh.c +++ b/src/mesh/gnunet-service-mesh.c @@ -1604,7 +1604,6 @@ peer_info_connect (struct MeshPeerInfo *peer, struct MeshTunnel *t) " Starting DHT GET for peer %s\n", GNUNET_i2s (&id)); peer->dhtgetcls = path_info; peer->dhtget = GNUNET_DHT_get_start (dht_handle, /* handle */ - GNUNET_TIME_UNIT_FOREVER_REL, /* timeout */ GNUNET_BLOCK_TYPE_TEST, /* type */ &id.hashPubKey, /* key to search */ 10, /* replication level */ @@ -4284,7 +4283,7 @@ handle_local_connect_by_type (void *cls, struct GNUNET_SERVER_Client *client, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " looking in DHT for %s\n", GNUNET_h2s (&hash)); t->dht_get_type = - GNUNET_DHT_get_start (dht_handle, GNUNET_TIME_UNIT_FOREVER_REL, + GNUNET_DHT_get_start (dht_handle, GNUNET_BLOCK_TYPE_TEST, &hash, 10, GNUNET_DHT_RO_RECORD_ROUTE | GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE, NULL, 0,