[GNUnet-SVN] r10637 - gnunet/src/include

[gnunet]

Author: nevans
Date: 2010-03-17 18:20:19 +0100 (Wed, 17 Mar 2010)
New Revision: 10637

Modified:
   gnunet/src/include/gnunet_dht_service.h
   gnunet/src/include/gnunet_protocols.h
Log:
dht related types and changes

Modified: gnunet/src/include/gnunet_dht_service.h
===================================================================
--- gnunet/src/include/gnunet_dht_service.h     2010-03-17 17:19:30 UTC (rev 
10636)
+++ gnunet/src/include/gnunet_dht_service.h     2010-03-17 17:20:19 UTC (rev 
10637)
@@ -184,7 +184,7 @@
 /**
  * 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 @@
  * @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 @@
                        struct GNUNET_TIME_Relative timeout,
                        GNUNET_DHT_ReplyProcessor iter,
                        void *iter_cls,
-                       struct GNUNET_TIME_Relative timeout,
                        GNUNET_SCHEDULER_Task cont,
                        void *cont_cls);
 

Modified: gnunet/src/include/gnunet_protocols.h
===================================================================
--- gnunet/src/include/gnunet_protocols.h       2010-03-17 17:19:30 UTC (rev 
10636)
+++ gnunet/src/include/gnunet_protocols.h       2010-03-17 17:20:19 UTC (rev 
10637)
@@ -483,7 +483,49 @@
  */
 #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.
  */
 #define GNUNET_MESSAGE_TYPE_ALL 65535