[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r16902 - gnunet/src/dht
From: |
gnunet |
Subject: |
[GNUnet-SVN] r16902 - gnunet/src/dht |
Date: |
Fri, 16 Sep 2011 20:08:35 +0200 |
Author: grothoff
Date: 2011-09-16 20:08:35 +0200 (Fri, 16 Sep 2011)
New Revision: 16902
Modified:
gnunet/src/dht/dht.h
Log:
make 'obsolete' data structures conditionally compiled
Modified: gnunet/src/dht/dht.h
===================================================================
--- gnunet/src/dht/dht.h 2011-09-16 18:08:00 UTC (rev 16901)
+++ gnunet/src/dht/dht.h 2011-09-16 18:08:35 UTC (rev 16902)
@@ -30,6 +30,19 @@
#define DEBUG_DHT GNUNET_NO
/**
+ * Add a unique ID to every request to make testing/profiling easier.
+ * Should NEVER be enabled in production and makes the DHT incompatible
+ * (since this changes the message format).
+ */
+#define HAVE_UID_FOR_TESTING GNUNET_YES
+
+/**
+ * Include a bf for replies? Should not be needed (see Mantis #1769), but if I
remove
+ * this code it stops to work!?
+ */
+#define HAVE_REPLY_BLOOMFILTER GNUNET_YES
+
+/**
* Needs to be GNUNET_YES for logging to dhtlog to work!
*/
#define DEBUG_DHT_ROUTING GNUNET_YES
@@ -147,8 +160,7 @@
/**
* Generic DHT message, indicates that a route request
- * should be issued, if coming from a client. Shared
- * usage for api->server and P2P message passing.
+ * should be issued.
*/
struct GNUNET_DHT_RouteMessage
{
@@ -265,10 +277,12 @@
*/
uint32_t outgoing_path_length GNUNET_PACKED;
+#if HAVE_UID_FOR_TESTING
/**
- * Unique ID identifying this request
+ * Unique ID identifying this request (may not be set)
*/
uint64_t unique_id GNUNET_PACKED;
+#endif
/**
* Bloomfilter (for peer identities) to stop circular routes
@@ -313,28 +327,25 @@
*/
uint32_t hop_count GNUNET_PACKED;
+#if HAVE_UID_FOR_TESTING
/**
* Unique ID identifying this request (may not be set)
*/
uint64_t unique_id GNUNET_PACKED;
+#endif
+#if HAVE_REPLY_BLOOMFILTER
/**
* Bloomfilter to stop circular routes
*/
char bloomfilter[DHT_BLOOM_SIZE];
+#endif
/**
* The key that was searched for
*/
GNUNET_HashCode key;
-#if FORWARD_UNKNOWN
- /**
- * Network size estimate
- */
- uint32_t network_size GNUNET_PACKED;
-#endif
-
/* GNUNET_MessageHeader *enc actual DHT message, copied to end of this dealy
do */
/* OUTGOING PATH */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r16902 - gnunet/src/dht,
gnunet <=