move

diff --git a/src/arm/gnunet-service-manager.c b/src/arm/gnunet-service-manager.c
index 931d0479083ad95f9259739d8ed2911354ae7463..81fb730c778aeeb80de95cbad703a2dfe799d25a 100644 (file)
--- a/src/arm/gnunet-service-manager.c
+++ b/src/arm/gnunet-service-manager.c
@@ -753,7 +753,7 @@ createListeningSocket (struct sockaddr *sa,
  * @param cls callback data, not used
  * @param section configuration section
  * @param option configuration option
- * @param the option's value
+ * @param value the option's value
  */
 static void
 checkPortNumberCB (void *cls,

diff --git a/src/include/gnunet_constants.h b/src/include/gnunet_constants.h
index b8e280d4eb3f51b49c41c84b39e7437edb605791..5c8749ed01301b23a74acc2fd88963c532111019 100644 (file)
--- a/src/include/gnunet_constants.h
+++ b/src/include/gnunet_constants.h
@@ -62,6 +62,13 @@ extern "C"
  */
 #define GNUNET_CONSTANTS_EXEC_WAIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 200)
 
+/**
+ * After how long do we retry a service connection that was 
+ * unavailable?  Used in cases where an exponential back-off
+ * seems inappropriate.
+ */
+#define GNUNET_CONSTANTS_SERVICE_RETRY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 500)
+
 /**
  * After how long do we consider a service irresponsive
  * even if we assume that the service commonly does not

diff --git a/src/include/gnunet_datastore_service.h b/src/include/gnunet_datastore_service.h
index 6f16dad224a74d1a921bd2ee06d43aff448a19da..e2de185bda586878c41888cae77b52680a7c6d38 100644 (file)
--- a/src/include/gnunet_datastore_service.h
+++ b/src/include/gnunet_datastore_service.h
@@ -210,6 +210,36 @@ GNUNET_DATASTORE_update (struct GNUNET_DATASTORE_Handle *h,
                         void *cont_cls);
 
 
+/**
+ * Explicitly remove some content from the database.
+ * The "cont"inuation will be called with status
+ * "GNUNET_OK" if content was removed, "GNUNET_NO"
+ * if no matching entry was found and "GNUNET_SYSERR"
+ * on all other types of errors.
+ *
+ * @param h handle to the datastore
+ * @param key key for the value
+ * @param size number of bytes in data
+ * @param data content stored
+ * @param queue_priority ranking of this request in the priority queue
+ * @param max_queue_size at what queue size should this request be dropped
+ *        (if other requests of higher priority are in the queue)
+ * @param timeout how long to wait at most for a response
+ * @param cont continuation to call when done
+ * @param cont_cls closure for cont
+ */
+void
+GNUNET_DATASTORE_remove (struct GNUNET_DATASTORE_Handle *h,
+                         const GNUNET_HashCode *key,
+                         uint32_t size, 
+                        const void *data,
+                        unsigned int queue_priority,
+                        unsigned int max_queue_size,
+                        struct GNUNET_TIME_Relative timeout,
+                        GNUNET_DATASTORE_ContinuationWithStatus cont,
+                        void *cont_cls);
+
+
 /**
  * An iterator over a set of items stored in the datastore.
  *
@@ -299,35 +329,6 @@ GNUNET_DATASTORE_get_random (struct GNUNET_DATASTORE_Handle *h,
                             void *iter_cls);
 
 
-/**
- * Explicitly remove some content from the database.
- * The "cont"inuation will be called with status
- * "GNUNET_OK" if content was removed, "GNUNET_NO"
- * if no matching entry was found and "GNUNET_SYSERR"
- * on all other types of errors.
- *
- * @param h handle to the datastore
- * @param key key for the value
- * @param size number of bytes in data
- * @param data content stored
- * @param queue_priority ranking of this request in the priority queue
- * @param max_queue_size at what queue size should this request be dropped
- *        (if other requests of higher priority are in the queue)
- * @param timeout how long to wait at most for a response
- * @param cont continuation to call when done
- * @param cont_cls closure for cont
- */
-void
-GNUNET_DATASTORE_remove (struct GNUNET_DATASTORE_Handle *h,
-                         const GNUNET_HashCode *key,
-                         uint32_t size, 
-                        const void *data,
-                        unsigned int queue_priority,
-                        unsigned int max_queue_size,
-                        struct GNUNET_TIME_Relative timeout,
-                        GNUNET_DATASTORE_ContinuationWithStatus cont,
-                        void *cont_cls);
-
 
 #if 0                           /* keep Emacsens' auto-indent happy */
 {