dht related types and changes

diff --git a/src/include/gnunet_dht_service.h b/src/include/gnunet_dht_service.h
index cf09fd6498b61f508d469411ddb3fbe39354862c..be7594e3213a48ae9e80b04fd43ab4e906ac1fa0 100644 (file)
--- 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 bd67db439406be5883fbbd2bdb5bc79cd8581c49..f5ce449ce570379cfb069a4bfa36c450d32101d7 100644 (file)
--- 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.
  */