[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r16805 - gnunet/src/dht
From: |
gnunet |
Subject: |
[GNUnet-SVN] r16805 - gnunet/src/dht |
Date: |
Tue, 13 Sep 2011 14:22:24 +0200 |
Author: grothoff
Date: 2011-09-13 14:22:24 +0200 (Tue, 13 Sep 2011)
New Revision: 16805
Modified:
gnunet/src/dht/gnunet-service-dht.c
Log:
dce
Modified: gnunet/src/dht/gnunet-service-dht.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht.c 2011-09-13 12:17:47 UTC (rev 16804)
+++ gnunet/src/dht/gnunet-service-dht.c 2011-09-13 12:22:24 UTC (rev 16805)
@@ -86,7 +86,8 @@
#define DHT_MAX_RECENT (1024 * 16)
/**
- * Default time to wait to send messages on behalf of other peers.
+ * How long do we wait at most when queueing messages with core
+ * that we are sending on behalf of other peers.
*/
#define DHT_DEFAULT_P2P_TIMEOUT GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 10)
@@ -98,7 +99,7 @@
/**
* How long to keep recent requests around by default.
*/
-#define DEFAULT_RECENT_REMOVAL GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 15)
+#define DEFAULT_RECENT_REMOVAL GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 60)
/**
* Default time to wait to send find peer messages sent by the dht service.
@@ -116,12 +117,6 @@
#define DHT_DEFAULT_FIND_PEER_REPLICATION 4
/**
- * Default options for find peer requests sent by the dht service.
- */
-#define DHT_DEFAULT_FIND_PEER_OPTIONS GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE
-/*#define DHT_DEFAULT_FIND_PEER_OPTIONS GNUNET_DHT_RO_NONE*/
-
-/**
* How long at least to wait before sending another find peer request.
*/
#define DHT_MINIMUM_FIND_PEER_INTERVAL
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 2)
@@ -157,9 +152,6 @@
*/
#define DEFAULT_MALICIOUS_PUT_FREQUENCY GNUNET_TIME_UNIT_SECONDS
-
-#define DHT_DEFAULT_PING_DELAY
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 1)
-
/**
* How many time differences between requesting a core send and
* the actual callback to remember.
@@ -204,6 +196,7 @@
};
+
/**
* Per-peer information.
*/
@@ -3313,7 +3306,8 @@
recent_req = GNUNET_CONTAINER_heap_peek (recent.minHeap);
GNUNET_assert (recent_req != NULL);
GNUNET_SCHEDULER_cancel (recent_req->remove_task);
- GNUNET_SCHEDULER_add_now (&remove_recent, recent_req);
+ recent_req->remove_task =
+ GNUNET_SCHEDULER_add_now (&remove_recent, recent_req);
}
forward_count = 0;
@@ -3762,7 +3756,7 @@
GNUNET_ntohll (GNUNET_CRYPTO_random_u64
(GNUNET_CRYPTO_QUALITY_STRONG, UINT64_MAX));
msg_ctx.replication = DHT_DEFAULT_FIND_PEER_REPLICATION;
- msg_ctx.msg_options = DHT_DEFAULT_FIND_PEER_OPTIONS;
+ msg_ctx.msg_options = GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE;
msg_ctx.network_size = log_of_network_size_estimate;
msg_ctx.peer = &my_identity;
msg_ctx.importance = DHT_DEFAULT_FIND_PEER_IMPORTANCE;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r16805 - gnunet/src/dht,
gnunet <=