[GNUnet-SVN] r33785 - gnunet/src/sensor

[gnunet]

Author: otarabai
Date: 2014-06-23 14:02:36 +0200 (Mon, 23 Jun 2014)
New Revision: 33785

Modified:
   gnunet/src/sensor/gnunet-service-sensor.c
Log:
sensor: using data lifetime value


Modified: gnunet/src/sensor/gnunet-service-sensor.c
===================================================================
--- gnunet/src/sensor/gnunet-service-sensor.c   2014-06-23 11:50:06 UTC (rev 
33784)
+++ gnunet/src/sensor/gnunet-service-sensor.c   2014-06-23 12:02:36 UTC (rev 
33785)
@@ -99,6 +99,7 @@
 
   /*
    * Lifetime of an information sample after which it is deleted from storage
+   * If not supplied, will default to the interval value
    */
   struct GNUNET_TIME_Relative lifetime;
 
@@ -459,7 +460,7 @@
     sensor->lifetime = GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 
time_sec);
   }
   else
-    sensor->lifetime = GNUNET_TIME_UNIT_FOREVER_REL;
+    sensor->lifetime = sensor->interval;
   //capabilities TODO
   //source
   if(GNUNET_OK != GNUNET_CONFIGURATION_get_value_choice(cfg, sectionname, 
"SOURCE", sources, (const char **)&sensor->source))
@@ -850,7 +851,7 @@
   struct GNUNET_TIME_Absolute expiry;
 
   GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Received a value for sensor `%s': %" 
PRIu64 "\n", sensorinfo->name, value);
-  expiry = GNUNET_TIME_relative_to_absolute(sensorinfo->interval);
+  expiry = GNUNET_TIME_relative_to_absolute(sensorinfo->lifetime);
   GNUNET_PEERSTORE_store(peerstore,
       subsystem,
       &peerid,
@@ -962,7 +963,7 @@
   else
   {
     sensorinfo->ext_cmd_value_received = GNUNET_YES;
-    expiry = GNUNET_TIME_relative_to_absolute(sensorinfo->interval);
+    expiry = GNUNET_TIME_relative_to_absolute(sensorinfo->lifetime);
     GNUNET_PEERSTORE_store(peerstore,
         subsystem,
         &peerid,