From: Nathan S. Evans <evans@in.tum.de>
Date: Wed, 17 Mar 2010 17:20:19 +0000 (+0000)
Subject: dht related types and changes
X-Git-Tag: initial-import-from-subversion-38251~22426
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8f0591d4ef517f57f01270c4c33150e1c045bc5a;p=oweals%2Fgnunet.git

dht related types and changes
---

diff --git a/src/include/gnunet_dht_service.h b/src/include/gnunet_dht_service.h
index cf09fd649..be7594e32 100644
--- a/src/include/gnunet_dht_service.h
+++ b/src/include/gnunet_dht_service.h
@@ -184,7 +184,7 @@ enum GNUNET_DHT_RouteOption
 /**
  * Perform an asynchronous FIND_PEER operation on the DHT.
  *
- * @param h handle to the DHT service
+ * @param handle handle to the DHT service
  * @param key the key to look up
  * @param desired_replication_level how many peers should ultimately receive
  *                this message (advisory only, target may be too high for the
@@ -202,7 +202,7 @@ enum GNUNET_DHT_RouteOption
  * @return handle to stop the request
  */
 struct GNUNET_DHT_FindPeerHandle *
-GNUNET_DHT_route_start (struct GNUNET_DHT_Handle *h,
+GNUNET_DHT_route_start (struct GNUNET_DHT_Handle *handle,
 			const GNUNET_HashCode *key,
 			unsigned int desired_replication_level,
 			enum GNUNET_DHT_RouteOption options,
@@ -210,7 +210,6 @@ GNUNET_DHT_route_start (struct GNUNET_DHT_Handle *h,
 			struct GNUNET_TIME_Relative timeout,
 			GNUNET_DHT_ReplyProcessor iter,
 			void *iter_cls,
-			struct GNUNET_TIME_Relative timeout,
 			GNUNET_SCHEDULER_Task cont,
 			void *cont_cls);
 
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index bd67db439..f5ce449ce 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -483,6 +483,48 @@ extern "C"
  */
 #define GNUNET_MESSAGE_TYPE_FS_PUT 138
 
+
+/**
+ * DHT Message Types
+ */
+
+/**
+ * Local DHT Get message, from API to service
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_GET 143
+
+/**
+ * Local DHT Get stop message, from API to service
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_GET_STOP 144
+
+/**
+ * Local DHT Get message, from API to service
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_FIND_PEER 145
+
+/**
+ * Local DHT Get stop message, from API to service
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_FIND_PEER_STOP 146
+
+/**
+ * Local DHT Put message, from API to service
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_PUT 147
+
+/**
+ * Local DHT Get result message, from service to API
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_GET_RESULT 149
+
+/**
+ * Local DHT Put result message, from service to API
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_PUT_RESULT 151
+
+
+
 /**
  * Type used to match 'all' message types.
  */