[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r21604 - in gnunet/src: dht fs gns include mesh
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r21604 - in gnunet/src: dht fs gns include mesh |
|
Date: |
Sun, 27 May 2012 22:14:21 +0200 |
Author: grothoff
Date: 2012-05-27 22:14:21 +0200 (Sun, 27 May 2012)
New Revision: 21604
Modified:
gnunet/src/dht/dht_api.c
gnunet/src/dht/gnunet-dht-get.c
gnunet/src/dht/test_dht_api.c
gnunet/src/dht/test_dht_monitor.c
gnunet/src/dht/test_dht_multipeer.c
gnunet/src/dht/test_dht_topo.c
gnunet/src/dht/test_dht_twopeer.c
gnunet/src/dht/test_dht_twopeer_get_put.c
gnunet/src/dht/test_dht_twopeer_path_tracking.c
gnunet/src/dht/test_dht_twopeer_put_get.c
gnunet/src/fs/gnunet-service-fs_pr.c
gnunet/src/gns/gnunet-service-gns_resolver.c
gnunet/src/include/gnunet_dht_service.h
gnunet/src/mesh/gnunet-service-mesh.c
Log:
-fixing #2340
Modified: gnunet/src/dht/dht_api.c
===================================================================
--- gnunet/src/dht/dht_api.c 2012-05-27 20:05:01 UTC (rev 21603)
+++ gnunet/src/dht/dht_api.c 2012-05-27 20:14:21 UTC (rev 21604)
@@ -1135,7 +1135,6 @@
* 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 @@
*/
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,
Modified: gnunet/src/dht/gnunet-dht-get.c
===================================================================
--- gnunet/src/dht/gnunet-dht-get.c 2012-05-27 20:05:01 UTC (rev 21603)
+++ gnunet/src/dht/gnunet-dht-get.c 2012-05-27 20:14:21 UTC (rev 21604)
@@ -186,7 +186,7 @@
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);
Modified: gnunet/src/dht/test_dht_api.c
===================================================================
--- gnunet/src/dht/test_dht_api.c 2012-05-27 20:05:01 UTC (rev 21603)
+++ gnunet/src/dht/test_dht_api.c 2012-05-27 20:14:21 UTC (rev 21604)
@@ -212,7 +212,7 @@
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);
Modified: gnunet/src/dht/test_dht_monitor.c
===================================================================
--- gnunet/src/dht/test_dht_monitor.c 2012-05-27 20:05:01 UTC (rev 21603)
+++ gnunet/src/dht/test_dht_monitor.c 2012-05-27 20:14:21 UTC (rev 21604)
@@ -250,7 +250,7 @@
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 */
Modified: gnunet/src/dht/test_dht_multipeer.c
===================================================================
--- gnunet/src/dht/test_dht_multipeer.c 2012-05-27 20:05:01 UTC (rev 21603)
+++ gnunet/src/dht/test_dht_multipeer.c 2012-05-27 20:14:21 UTC (rev 21604)
@@ -621,7 +621,7 @@
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 =
Modified: gnunet/src/dht/test_dht_topo.c
===================================================================
--- gnunet/src/dht/test_dht_topo.c 2012-05-27 20:05:01 UTC (rev 21603)
+++ gnunet/src/dht/test_dht_topo.c 2012-05-27 20:14:21 UTC (rev 21604)
@@ -308,7 +308,7 @@
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 @@
{
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 @@
&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 */
Modified: gnunet/src/dht/test_dht_twopeer.c
===================================================================
--- gnunet/src/dht/test_dht_twopeer.c 2012-05-27 20:05:01 UTC (rev 21603)
+++ gnunet/src/dht/test_dht_twopeer.c 2012-05-27 20:14:21 UTC (rev 21604)
@@ -250,8 +250,6 @@
&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 @@
&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,
Modified: gnunet/src/dht/test_dht_twopeer_get_put.c
===================================================================
--- gnunet/src/dht/test_dht_twopeer_get_put.c 2012-05-27 20:05:01 UTC (rev
21603)
+++ gnunet/src/dht/test_dht_twopeer_get_put.c 2012-05-27 20:14:21 UTC (rev
21604)
@@ -272,7 +272,7 @@
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
Modified: gnunet/src/dht/test_dht_twopeer_path_tracking.c
===================================================================
--- gnunet/src/dht/test_dht_twopeer_path_tracking.c 2012-05-27 20:05:01 UTC
(rev 21603)
+++ gnunet/src/dht/test_dht_twopeer_path_tracking.c 2012-05-27 20:14:21 UTC
(rev 21604)
@@ -259,7 +259,7 @@
"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);
Modified: gnunet/src/dht/test_dht_twopeer_put_get.c
===================================================================
--- gnunet/src/dht/test_dht_twopeer_put_get.c 2012-05-27 20:05:01 UTC (rev
21603)
+++ gnunet/src/dht/test_dht_twopeer_put_get.c 2012-05-27 20:14:21 UTC (rev
21604)
@@ -266,7 +266,7 @@
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);
}
Modified: gnunet/src/fs/gnunet-service-fs_pr.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_pr.c 2012-05-27 20:05:01 UTC (rev
21603)
+++ gnunet/src/fs/gnunet-service-fs_pr.c 2012-05-27 20:14:21 UTC (rev
21604)
@@ -1082,7 +1082,7 @@
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,
Modified: gnunet/src/gns/gnunet-service-gns_resolver.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns_resolver.c 2012-05-27 20:05:01 UTC
(rev 21603)
+++ gnunet/src/gns/gnunet-service-gns_resolver.c 2012-05-27 20:14:21 UTC
(rev 21604)
@@ -332,7 +332,6 @@
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 @@
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 @@
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,
Modified: gnunet/src/include/gnunet_dht_service.h
===================================================================
--- gnunet/src/include/gnunet_dht_service.h 2012-05-27 20:05:01 UTC (rev
21603)
+++ gnunet/src/include/gnunet_dht_service.h 2012-05-27 20:14:21 UTC (rev
21604)
@@ -220,8 +220,6 @@
* 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 @@
*/
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,
Modified: gnunet/src/mesh/gnunet-service-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh.c 2012-05-27 20:05:01 UTC (rev
21603)
+++ gnunet/src/mesh/gnunet-service-mesh.c 2012-05-27 20:14:21 UTC (rev
21604)
@@ -1604,7 +1604,6 @@
" 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 @@
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,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r21604 - in gnunet/src: dht fs gns include mesh,
gnunet <=