get time cfg api added

3 files changed, 35 insertions, 5 deletions

diff --git a/src/include/gnunet_configuration_lib.h b/src/include/gnunet_configuration_lib.h
index fefc6884a..3f7d099ce 100644
--- a/src/include/gnunet_configuration_lib.h
+++ b/src/include/gnunet_configuration_lib.h
@@ -38,6 +38,7 @@ extern "C"
 #endif
 
 #include "gnunet_common.h"
+#include "gnunet_time_lib.h"
 
 /**
  * A configuration object.
@@ -99,6 +100,17 @@ int GNUNET_CONFIGURATION_get_value_number (struct GNUNET_CONFIGURATION_Handle
                                            unsigned long long *number);
 
 /**
+ * Get a configuration value that should be a relative time.
+ *
+ * @param time set to the time value stored in the configuration
+ * @return GNUNET_OK on success, GNUNET_SYSERR on error
+ */
+int GNUNET_CONFIGURATION_get_value_time (struct GNUNET_CONFIGURATION_Handle
+                                         *cfg, const char *section,
+                                         const char *option,
+                                         struct GNUNET_TIME_Relative *time);
+
+/**
  * Test if we have a value for a particular option
  * @return GNUNET_YES if so, GNUNET_NO if not.
  */
diff --git a/src/util/configuration.c b/src/util/configuration.c
index 4413b0377..eacbdbf05 100644
--- a/src/util/configuration.c
+++ b/src/util/configuration.c
@@ -402,6 +402,24 @@ GNUNET_CONFIGURATION_get_value_number (struct GNUNET_CONFIGURATION_Handle
 }
 
 int
+GNUNET_CONFIGURATION_get_value_time (struct GNUNET_CONFIGURATION_Handle
+                                     *cfg, const char *section,
+                                     const char *option,
+                                     struct GNUNET_TIME_Relative *time)
+{
+  unsigned long long num;
+  int ret;
+
+  ret = GNUNET_CONFIGURATION_get_value_number (cfg,
+                                               section,
+                                               option,
+                                               &num);
+  if (ret == GNUNET_OK)
+    time->value = (uint64_t) num;
+  return ret;
+}
+
+int
 GNUNET_CONFIGURATION_get_value_string (struct GNUNET_CONFIGURATION_Handle
                                        *cfg, const char *section,
                                        const char *option, char **value)
diff --git a/src/util/service.c b/src/util/service.c
index 8d72a749a..732dbe9af 100644
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -754,7 +754,7 @@ static int
 setup_service (struct GNUNET_SERVICE_Context *sctx)
 {
   unsigned long long maxbuf;
-  unsigned long long idleout;
+  struct GNUNET_TIME_Relative idleout;
   char *hostname;
   unsigned long long port;
   int disablev6;
@@ -768,12 +768,12 @@ setup_service (struct GNUNET_SERVICE_Context *sctx)
                                        sctx->serviceName, "TIMEOUT"))
     {
       if (GNUNET_OK !=
-          GNUNET_CONFIGURATION_get_value_number (sctx->cfg,
-                                                 sctx->serviceName,
-                                                 "TIMEOUT", &idleout))
+          GNUNET_CONFIGURATION_get_value_time (sctx->cfg,
+                                               sctx->serviceName,
+                                               "TIMEOUT", &idleout))
         return GNUNET_SYSERR;
 
-      sctx->timeout.value = idleout;
+      sctx->timeout = idleout;
     }
   else
     sctx->timeout = GNUNET_TIME_UNIT_FOREVER_REL;