sensor: minor fixes

7 files changed, 232 insertions, 208 deletions

diff --git a/src/include/gnunet_sensor_util_lib.h b/src/include/gnunet_sensor_util_lib.h
index 54066decb..780b88cda 100644
--- a/src/include/gnunet_sensor_util_lib.h
+++ b/src/include/gnunet_sensor_util_lib.h
@@ -38,7 +38,7 @@ extern "C"
 /**
  * Structure containing sensor definition
  */
-struct SensorInfo
+struct GNUNET_SENSOR_SensorInfo
 {
 
   /**
@@ -196,7 +196,7 @@ struct GNUNET_SENSOR_Reading
   /**
    * Sensor this reading is related to
    */
-  struct SensorInfo *sensor;
+  struct GNUNET_SENSOR_SensorInfo *sensor;
 
   /**
    * Timestamp of taking the reading
@@ -257,8 +257,10 @@ struct GNUNET_SENSOR_ReadingMessage
   uint16_t value_size;
 
 };
+
 GNUNET_NETWORK_STRUCT_END
 
+
 /**
  * Reads sensor definitions from local data files
  *
@@ -267,6 +269,7 @@ GNUNET_NETWORK_STRUCT_END
 struct GNUNET_CONTAINER_MultiHashMap *
 GNUNET_SENSOR_load_all_sensors ();
 
+
 /*
  * Get path to the directory containing the sensor definition files
  *
@@ -275,16 +278,6 @@ GNUNET_SENSOR_load_all_sensors ();
 char *
 GNUNET_SENSOR_get_sensor_dir ();
 
-/**
- * Parses a sensor reading message struct
- *
- * @param msg message header received
- * @param sensors multihashmap of loaded sensors
- * @return sensor reading struct or NULL if error
- */
-struct GNUNET_SENSOR_Reading *
-GNUNET_SENSOR_parse_reading_message (const struct GNUNET_MessageHeader *msg,
-    struct GNUNET_CONTAINER_MultiHashMap *sensors);
 
 /**
  * Destroys a group of sensors in a hashmap and the hashmap itself
diff --git a/src/sensor/gnunet-service-sensor-analysis.c b/src/sensor/gnunet-service-sensor-analysis.c
index bb0e2d505..4b99045ff 100644
--- a/src/sensor/gnunet-service-sensor-analysis.c
+++ b/src/sensor/gnunet-service-sensor-analysis.c
@@ -51,7 +51,7 @@ struct SensorModel
   /*
    * Pointer to sensor info structure
    */
-  struct SensorInfo *sensor;
+  struct GNUNET_SENSOR_SensorInfo *sensor;
 
   /*
    * Watcher of sensor values
@@ -190,7 +190,7 @@ sensor_watcher (void *cls,
  *
  * @param cls unused
  * @param key unused
- * @param value a 'struct SensorInfo *' with sensor information
+ * @param value a 'struct GNUNET_SENSOR_SensorInfo *' with sensor information
  * @return #GNUNET_YES to continue iterations
  */
 static int
@@ -198,7 +198,7 @@ init_sensor_model (void *cls,
     const struct GNUNET_HashCode *key,
     void *value)
 {
-  struct SensorInfo *sensor = value;
+  struct GNUNET_SENSOR_SensorInfo *sensor = value;
   struct SensorModel *sensor_model;
 
   if (0 != strcmp("numeric", sensor->expected_datatype))
diff --git a/src/sensor/gnunet-service-sensor-reporting.c b/src/sensor/gnunet-service-sensor-reporting.c
index 2292649e2..0a422002f 100644
--- a/src/sensor/gnunet-service-sensor-reporting.c
+++ b/src/sensor/gnunet-service-sensor-reporting.c
@@ -57,7 +57,7 @@ struct ReportingContext
   /**
    * Sensor information
    */
-  struct SensorInfo *sensor;
+  struct GNUNET_SENSOR_SensorInfo *sensor;
 
   /**
    * Collection point reporting task
@@ -393,7 +393,7 @@ report_collection_point (void *cls,
                          const struct GNUNET_SCHEDULER_TaskContext* tc)
 {
   struct ReportingContext *rc = cls;
-  struct SensorInfo *sensor = rc->sensor;
+  struct GNUNET_SENSOR_SensorInfo *sensor = rc->sensor;
   struct CadetChannelContext *cc;
   struct GNUNET_SENSOR_ReadingMessage *msg;
   size_t msg_size;
@@ -446,8 +446,8 @@ report_collection_point (void *cls,
  */
 static int
 sensor_watch_cb (void *cls,
-    struct GNUNET_PEERSTORE_Record *record,
-    char *emsg)
+                 struct GNUNET_PEERSTORE_Record *record,
+                 char *emsg)
 {
   struct ReportingContext *rc = cls;
 
@@ -477,15 +477,15 @@ sensor_watch_cb (void *cls,
  *
  * @param cls unused
  * @param key unused
- * @param value a 'struct SensorInfo *' with sensor information
+ * @param value a `struct GNUNET_SENSOR_SensorInfo *` with sensor information
  * @return #GNUNET_YES to continue iterations
  */
 static int
 init_sensor_reporting (void *cls,
-    const struct GNUNET_HashCode *key,
-    void *value)
+                       const struct GNUNET_HashCode *key,
+                       void *value)
 {
-  struct SensorInfo *sensor = value;
+  struct GNUNET_SENSOR_SensorInfo *sensor = value;
   struct ReportingContext *rc;
 
   if (NULL == sensor->collection_point &&
@@ -548,8 +548,8 @@ cadet_channel_destroyed (void *cls,
   if (GNUNET_YES == cc->destroying)
     return;
   LOG (GNUNET_ERROR_TYPE_DEBUG,
-      "Received a `channel destroyed' notification from CADET, "
-      "cleaning up.\n");
+       "Received a `channel destroyed' notification from CADET, "
+       "cleaning up.\n");
   GNUNET_CONTAINER_DLL_remove (cc_head, cc_tail, cc);
   cc->c = NULL;
   destroy_cadet_channel_context (cc);
diff --git a/src/sensor/gnunet-service-sensor.c b/src/sensor/gnunet-service-sensor.c
index 261758595..794ba0b06 100644
--- a/src/sensor/gnunet-service-sensor.c
+++ b/src/sensor/gnunet-service-sensor.c
@@ -61,22 +61,25 @@ char *subsystem = "sensor";
 struct GNUNET_PeerIdentity peerid;
 
 /**
- * Disable a sensor
- * Sensor will not run again unless
- * explicitly enabled or reloaded
+ * Change the state of the sensor.
+ * Write the change to file to make it persistent.
  *
- * @param sensor sensor information
+ * @param sensor sensor info struct
+ * @param state new enabled state: #GNUNET_YES / #GNUNET_NO
  */
-static void set_sensor_enabled(struct SensorInfo *sensor, int state)
+static void
+set_sensor_enabled (struct GNUNET_SENSOR_SensorInfo *sensor, int state)
 {
   GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-      "Sensor `%s': Setting enabled to %d.\n",
-      sensor->name, state);
+             "Sensor `%s': Setting enabled to %d.\n",
+             sensor->name, state);
   sensor->enabled = GNUNET_NO;
-  GNUNET_assert(NULL != sensor->cfg);
-  GNUNET_CONFIGURATION_set_value_string(sensor->cfg, sensor->name, "ENABLED",
-      (GNUNET_YES == state)?"YES":"NO");
-  GNUNET_CONFIGURATION_write(sensor->cfg, sensor->def_file);
+  GNUNET_assert (NULL != sensor->cfg);
+  GNUNET_CONFIGURATION_set_value_string (sensor->cfg,
+                                         sensor->name,
+                                         "ENABLED",
+                                         (GNUNET_YES == state) ? "YES" : "NO");
+  GNUNET_CONFIGURATION_write (sensor->cfg, sensor->def_file);
 }
 
 /**
@@ -87,23 +90,23 @@ static void set_sensor_enabled(struct SensorInfo *sensor, int state)
  */
 static void
 shutdown_task (void *cls,
-               const struct GNUNET_SCHEDULER_TaskContext *tc)
+               const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  SENSOR_update_stop ();
-  SENSOR_reporting_stop();
-  SENSOR_analysis_stop();
+  //SENSOR_update_stop ();
+  SENSOR_reporting_stop ();
+  SENSOR_analysis_stop ();
   GNUNET_SENSOR_destroy_sensors (sensors);
-  if(NULL != statistics)
+  if (NULL != statistics)
   {
-    GNUNET_STATISTICS_destroy(statistics, GNUNET_YES);
+    GNUNET_STATISTICS_destroy (statistics, GNUNET_YES);
     statistics = NULL;
   }
-  if(NULL != peerstore)
+  if (NULL != peerstore)
   {
-    GNUNET_PEERSTORE_disconnect(peerstore, GNUNET_YES);
+    GNUNET_PEERSTORE_disconnect (peerstore, GNUNET_YES);
     peerstore = NULL;
   }
-  GNUNET_SCHEDULER_shutdown();
+  GNUNET_SCHEDULER_shutdown ();
 }
 
 
@@ -115,19 +118,18 @@ shutdown_task (void *cls,
  */
 static void
 handle_client_disconnect (void *cls,
-                          struct GNUNET_SERVER_Client
-                          * client)
+                          struct GNUNET_SERVER_Client *client)
 {
 }
 
 /**
- * Creates a structure with basic sensor info to be sent to a client
+ * Creates a structure with basic sensor info to be sent to a client.
  *
  * @param sensor sensor information
  * @return message ready to be sent to client
  */
 static struct SensorInfoMessage *
-create_sensor_info_msg(struct SensorInfo *sensor)
+create_sensor_info_msg (struct GNUNET_SENSOR_SensorInfo *sensor)
 {
   struct SensorInfoMessage *msg;
   uint16_t len;
@@ -171,14 +173,15 @@ create_sensor_info_msg(struct SensorInfo *sensor)
  * @param message the actual message
  */
 static void
-handle_get_sensor (void *cls, struct GNUNET_SERVER_Client *client,
-            const struct GNUNET_MessageHeader *message)
+handle_get_sensor (void *cls,
+                   struct GNUNET_SERVER_Client *client,
+                   const struct GNUNET_MessageHeader *message)
 {
   struct GNUNET_SERVER_TransmitContext *tc;
   char *sensorname;
   size_t sensorname_len;
   struct GNUNET_HashCode key;
-  struct SensorInfo *sensorinfo;
+  struct GNUNET_SENSOR_SensorInfo *sensorinfo;
   struct SensorInfoMessage *msg;
 
   sensorname = (char *)&message[1];
@@ -188,7 +191,7 @@ handle_get_sensor (void *cls, struct GNUNET_SERVER_Client *client,
   tc = GNUNET_SERVER_transmit_context_create (client);
   GNUNET_CRYPTO_hash(sensorname, sensorname_len, &key);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created key hash for requested sensor\n");
-  sensorinfo = (struct SensorInfo *)GNUNET_CONTAINER_multihashmap_get(sensors, &key);
+  sensorinfo = (struct GNUNET_SENSOR_SensorInfo *)GNUNET_CONTAINER_multihashmap_get(sensors, &key);
   if(NULL != sensorinfo)
   {
     msg = create_sensor_info_msg(sensorinfo);
@@ -205,15 +208,16 @@ handle_get_sensor (void *cls, struct GNUNET_SERVER_Client *client,
 /**
  * Iterator for sensors and adds them to transmit context
  *
- * @param cls a 'struct GNUNET_SERVER_TransmitContext *'
+ * @param cls a `struct GNUNET_SERVER_TransmitContext *`
  * @param key hash of sensor name, key to hashmap
- * @param value a 'struct SensorInfo *'
+ * @param value a `struct GNUNET_SENSOR_SensorInfo *`
  */
-int add_sensor_to_tc(void *cls,
-    const struct GNUNET_HashCode *key, void *value)
+int add_sensor_to_tc (void *cls,
+                      const struct GNUNET_HashCode *key,
+                      void *value)
 {
   struct GNUNET_SERVER_TransmitContext *tc = cls;
-  struct SensorInfo *sensorinfo = value;
+  struct GNUNET_SENSOR_SensorInfo *sensorinfo = value;
   struct SensorInfoMessage *msg;
 
   msg = create_sensor_info_msg(sensorinfo);
@@ -251,7 +255,7 @@ handle_get_all_sensors (void *cls, struct GNUNET_SERVER_Client *client,
  * @return #GNUNET_YES / #GNUNET_NO
  */
 static int
-should_run_sensor(struct SensorInfo *sensorinfo)
+should_run_sensor(struct GNUNET_SENSOR_SensorInfo *sensorinfo)
 {
   struct GNUNET_TIME_Absolute now;
 
@@ -280,7 +284,7 @@ should_run_sensor(struct SensorInfo *sensorinfo)
 /**
  * Callback function to process statistic values
  *
- * @param cls 'struct SensorInfo *'
+ * @param cls `struct GNUNET_SENSOR_SensorInfo *`
  * @param subsystem name of subsystem that created the statistic
  * @param name the name of the datum
  * @param value the current value
@@ -293,7 +297,7 @@ int sensor_statistics_iterator (void *cls,
     uint64_t value,
     int is_persistent)
 {
-  struct SensorInfo *sensorinfo = cls;
+  struct GNUNET_SENSOR_SensorInfo *sensorinfo = cls;
   double dvalue = (double)value;
   struct GNUNET_TIME_Absolute expiry;
 
@@ -315,13 +319,13 @@ int sensor_statistics_iterator (void *cls,
 /**
  * Continuation called after sensor gets all gnunet statistics values
  *
- * @param cls 'struct SensorInfo *'
+ * @param cls `struct GNUNET_SENSOR_SensorInfo *`
  * @param success #GNUNET_OK if statistics were
  *        successfully obtained, #GNUNET_SYSERR if not.
  */
 void end_sensor_run_stat (void *cls, int success)
 {
-  struct SensorInfo *sensorinfo = cls;
+  struct GNUNET_SENSOR_SensorInfo *sensorinfo = cls;
 
   sensorinfo->gnunet_stat_get_handle = NULL;
   sensorinfo->running = GNUNET_NO;
@@ -337,7 +341,9 @@ void end_sensor_run_stat (void *cls, int success)
  * @return size of new parsed value, 0 for error
  */
 static size_t
-parse_sensor_value (const char *value, struct SensorInfo* sensor, void **ret)
+parse_sensor_value (const char *value,
+                    struct GNUNET_SENSOR_SensorInfo *sensor,
+                    void **ret)
 {
   double *dval;
   char *endptr;
@@ -367,12 +373,12 @@ parse_sensor_value (const char *value, struct SensorInfo* sensor, void **ret)
 /**
  * Callback for output of executed sensor process
  *
- * @param cls 'struct SensorInfo *'
+ * @param cls `struct GNUNET_SENSOR_SensorInfo *`
  * @param line line of output from a command, NULL for the end
  */
 void sensor_process_callback (void *cls, const char *line)
 {
-  struct SensorInfo *sensorinfo = cls;
+  struct GNUNET_SENSOR_SensorInfo *sensorinfo = cls;
   void *value;
   size_t valsize;
   struct GNUNET_TIME_Absolute expiry;
@@ -443,7 +449,7 @@ void
 sensor_run (void *cls,
     const struct GNUNET_SCHEDULER_TaskContext * tc)
 {
-  struct SensorInfo *sensorinfo = cls;
+  struct GNUNET_SENSOR_SensorInfo *sensorinfo = cls;
   int check_result;
   char *sensors_dir;
   char *process_path;
@@ -530,7 +536,7 @@ sensor_run (void *cls,
  *
  * @param cls unused
  * @param key hash of sensor name, key to hashmap (unused)
- * @param value a 'struct SensorInfo *'
+ * @param value a `struct GNUNET_SENSOR_SensorInfo *`
  * @return #GNUNET_YES if we should continue to
  *         iterate,
  *         #GNUNET_NO if not.
@@ -538,7 +544,7 @@ sensor_run (void *cls,
 int schedule_sensor(void *cls,
     const struct GNUNET_HashCode *key, void *value)
 {
-  struct SensorInfo *sensorinfo = value;
+  struct GNUNET_SENSOR_SensorInfo *sensorinfo = value;
 
   if(GNUNET_NO == should_run_sensor(sensorinfo))
     return GNUNET_YES;
@@ -589,17 +595,17 @@ run (void *cls,
   schedule_all_sensors();
   SENSOR_analysis_start(c, sensors);
   SENSOR_reporting_start(c, sensors);
-  SENSOR_update_start (c, sensors);
+  //SENSOR_update_start (c, sensors);
   statistics = GNUNET_STATISTICS_create("sensor", cfg);
   GNUNET_CRYPTO_get_peer_identity(cfg, &peerid);
   peerstore = GNUNET_PEERSTORE_connect(cfg);
   GNUNET_SERVER_add_handlers (server, handlers);
   GNUNET_SERVER_disconnect_notify (server, 
-                                   &handle_client_disconnect,
-                                   NULL);
+           &handle_client_disconnect,
+           NULL);
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
-                                &shutdown_task,
-                                NULL);
+        &shutdown_task,
+        NULL);
 }
 
 
@@ -617,8 +623,8 @@ main (int argc, char *const *argv)
           GNUNET_SERVICE_run (argc,
                               argv,
                               "sensor",
-                              GNUNET_SERVICE_OPTION_NONE,
-                              &run, NULL)) ? 0 : 1;
+            GNUNET_SERVICE_OPTION_NONE,
+            &run, NULL)) ? 0 : 1;
 }
 
 /* end of gnunet-service-sensor.c */
diff --git a/src/sensor/sensor_util_lib.c b/src/sensor/sensor_util_lib.c
index 40cdfef30..b77ba48fc 100644
--- a/src/sensor/sensor_util_lib.c
+++ b/src/sensor/sensor_util_lib.c
@@ -87,10 +87,10 @@ version_parse(char *version, uint16_t *major, uint16_t *minor)
  * @param cfg configuration handle
  * @param sectionname configuration section containing definition
  */
-static struct SensorInfo *
+static struct GNUNET_SENSOR_SensorInfo *
 load_sensor_from_cfg(struct GNUNET_CONFIGURATION_Handle *cfg, const char *sectionname)
 {
-  struct SensorInfo *sensor;
+  struct GNUNET_SENSOR_SensorInfo *sensor;
   char *version_str;
   char *starttime_str;
   char *endtime_str;
@@ -98,7 +98,7 @@ load_sensor_from_cfg(struct GNUNET_CONFIGURATION_Handle *cfg, const char *sectio
   char *dummy;
   struct GNUNET_CRYPTO_EddsaPublicKey public_key;
 
-  sensor = GNUNET_new(struct SensorInfo);
+  sensor = GNUNET_new(struct GNUNET_SENSOR_SensorInfo);
   //name
   sensor->name = GNUNET_strdup(sectionname);
   //version
@@ -260,12 +260,12 @@ load_sensor_from_cfg(struct GNUNET_CONFIGURATION_Handle *cfg, const char *sectio
  *
  * @param filename full path to file containing sensor definition
  */
-static struct SensorInfo *
+static struct GNUNET_SENSOR_SensorInfo *
 load_sensor_from_file(const char *filename)
 {
   struct GNUNET_CONFIGURATION_Handle *sensorcfg;
   const char *filebasename;
-  struct SensorInfo *sensor;
+  struct GNUNET_SENSOR_SensorInfo *sensor;
 
   //test file
   if(GNUNET_YES != GNUNET_DISK_file_test(filename))
@@ -303,9 +303,10 @@ load_sensor_from_file(const char *filename)
  * @return 1: s1 > s2, 0: s1 == s2, -1: s1 < s2
  */
 static int
-sensor_version_compare(struct SensorInfo *s1, struct SensorInfo *s2)
+sensor_version_compare (struct GNUNET_SENSOR_SensorInfo *s1,
+                        struct GNUNET_SENSOR_SensorInfo *s2)
 {
-  if(s1->version_major == s2->version_major)
+  if (s1->version_major == s2->version_major)
     return (s1->version_minor < s2->version_minor) ? -1 : (s1->version_minor > s2->version_minor);
   else
     return (s1->version_major < s2->version_major) ? -1 : (s1->version_major > s2->version_major);
@@ -317,13 +318,15 @@ sensor_version_compare(struct SensorInfo *s1, struct SensorInfo *s2)
  *
  * @param sensor Sensor structure to add
  * @param map Hashmap to add to
- * @return #GNUNET_YES if added, #GNUNET_NO if not added which is not necessarily an error
+ * @return #GNUNET_YES if added
+ *         #GNUNET_NO if not added which is not necessarily an error
  */
 static int
-add_sensor_to_hashmap(struct SensorInfo *sensor, struct GNUNET_CONTAINER_MultiHashMap *map)
+add_sensor_to_hashmap (struct GNUNET_SENSOR_SensorInfo *sensor,
+                       struct GNUNET_CONTAINER_MultiHashMap *map)
 {
   struct GNUNET_HashCode key;
-  struct SensorInfo *existing;
+  struct GNUNET_SENSOR_SensorInfo *existing;
 
   GNUNET_CRYPTO_hash(sensor->name, strlen(sensor->name) + 1, &key);
   existing = GNUNET_CONTAINER_multihashmap_get(map, &key);
@@ -331,19 +334,25 @@ add_sensor_to_hashmap(struct SensorInfo *sensor, struct GNUNET_CONTAINER_MultiHa
   {
     if(sensor_version_compare(existing, sensor) >= 0) //same or newer version already exist
     {
-      LOG (GNUNET_ERROR_TYPE_INFO, _("Sensor `%s' already exists with same or newer version\n"), sensor->name);
+      LOG (GNUNET_ERROR_TYPE_INFO,
+           _("Sensor `%s' already exists with same or newer version\n"),
+           sensor->name);
       return GNUNET_NO;
     }
     else
     {
       GNUNET_CONTAINER_multihashmap_remove(map, &key, existing); //remove the old version
       GNUNET_free(existing);
-      LOG (GNUNET_ERROR_TYPE_INFO, "Upgrading sensor `%s' to a newer version\n", sensor->name);
+      LOG (GNUNET_ERROR_TYPE_INFO,
+           "Upgrading sensor `%s' to a newer version\n",
+           sensor->name);
     }
   }
   if(GNUNET_SYSERR == GNUNET_CONTAINER_multihashmap_put(map, &key, sensor, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY))
   {
-    LOG (GNUNET_ERROR_TYPE_ERROR, _("Error adding new sensor `%s' to global hashmap, this should not happen\n"), sensor->name);
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         _("Error adding new sensor `%s' to global hashmap.\n"),
+         sensor->name);
     return GNUNET_NO;
   }
 
@@ -361,7 +370,7 @@ static int
 reload_sensors_dir_cb(void *cls, const char *filename)
 {
   struct GNUNET_CONTAINER_MultiHashMap *sensors = cls;
-  struct SensorInfo *sensor;
+  struct GNUNET_SENSOR_SensorInfo *sensor;
 
   if(GNUNET_YES != GNUNET_DISK_file_test(filename))
     return GNUNET_OK;
@@ -423,131 +432,61 @@ GNUNET_SENSOR_load_all_sensors ()
   return sensors;
 }
 
-/**
- * Parses a sensor reading message struct
- *
- * @param msg message header received
- * @param sensors multihashmap of loaded sensors
- * @return sensor reading struct or NULL if error
- */
-struct GNUNET_SENSOR_Reading *
-GNUNET_SENSOR_parse_reading_message (const struct GNUNET_MessageHeader *msg,
-    struct GNUNET_CONTAINER_MultiHashMap *sensors)
-{
-  uint16_t msg_size;
-  struct GNUNET_SENSOR_ReadingMessage *rm;
-  uint16_t sensorname_size;
-  uint16_t value_size;
-  void *dummy;
-  char *sensorname;
-  struct GNUNET_HashCode key;
-  struct SensorInfo *sensor;
-  struct GNUNET_SENSOR_Reading *reading;
-
-  msg_size = ntohs (msg->size);
-  if (msg_size < sizeof (struct GNUNET_SENSOR_ReadingMessage))
-  {
-    LOG (GNUNET_ERROR_TYPE_WARNING, "Invalid reading message size.\n");
-    return NULL;
-  }
-  rm = (struct GNUNET_SENSOR_ReadingMessage *)msg;
-  sensorname_size = ntohs (rm->sensorname_size);
-  value_size = ntohs (rm->value_size);
-  if ((sizeof (struct GNUNET_SENSOR_ReadingMessage)
-      + sensorname_size + value_size) != msg_size)
-  {
-    LOG (GNUNET_ERROR_TYPE_WARNING, "Invalid reading message size.\n");
-    return NULL;
-  }
-  dummy = &rm[1];
-  sensorname = GNUNET_malloc (sensorname_size);
-  memcpy (sensorname, dummy, sensorname_size);
-  GNUNET_CRYPTO_hash(sensorname, sensorname_size, &key);
-  GNUNET_free (sensorname);
-  sensor = GNUNET_CONTAINER_multihashmap_get (sensors, &key);
-  if (NULL == sensor)
-  {
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-        "Unknown sensor name in reading message.\n");
-    return NULL;
-  }
-  if ((sensor->version_minor != ntohs (rm->sensorversion_minor)) ||
-      (sensor->version_major != ntohs (rm->sensorversion_major)))
-  {
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-        "Sensor version mismatch in reading message.\n");
-    return NULL;
-  }
-  if (0 == strcmp (sensor->expected_datatype, "numeric") &&
-      sizeof (double) != value_size)
-  {
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-        "Invalid value size for a numerical sensor.\n");
-    return NULL;
-  }
-  reading = GNUNET_new (struct GNUNET_SENSOR_Reading);
-  reading->sensor = sensor;
-  reading->timestamp = GNUNET_be64toh (rm->timestamp);
-  reading->value_size = value_size;
-  reading->value = GNUNET_malloc (value_size);
-  dummy += sensorname_size;
-  memcpy (reading->value, dummy, value_size);
-  return reading;
-}
 
 /**
  * Remove sensor execution from scheduler
  *
  * @param cls unused
  * @param key hash of sensor name, key to hashmap
- * @param value a 'struct SensorInfo *'
+ * @param value a `struct GNUNET_SENSOR_SensorInfo *`
  * @return #GNUNET_YES if we should continue to
  *         iterate,
  *         #GNUNET_NO if not.
  */
 static int destroy_sensor(void *cls,
-    const struct GNUNET_HashCode *key, void *value)
+                          const struct GNUNET_HashCode *key,
+                          void *value)
 {
-  struct SensorInfo *sensorinfo = value;
+  struct GNUNET_SENSOR_SensorInfo *sensor = value;
 
-  if(GNUNET_SCHEDULER_NO_TASK != sensorinfo->execution_task)
+  if(GNUNET_SCHEDULER_NO_TASK != sensor->execution_task)
   {
-    GNUNET_SCHEDULER_cancel(sensorinfo->execution_task);
-    sensorinfo->execution_task = GNUNET_SCHEDULER_NO_TASK;
+    GNUNET_SCHEDULER_cancel(sensor->execution_task);
+    sensor->execution_task = GNUNET_SCHEDULER_NO_TASK;
   }
-  if(NULL != sensorinfo->gnunet_stat_get_handle)
+  if(NULL != sensor->gnunet_stat_get_handle)
   {
-    GNUNET_STATISTICS_get_cancel(sensorinfo->gnunet_stat_get_handle);
-    sensorinfo->gnunet_stat_get_handle = NULL;
+    GNUNET_STATISTICS_get_cancel(sensor->gnunet_stat_get_handle);
+    sensor->gnunet_stat_get_handle = NULL;
   }
-  if(NULL != sensorinfo->ext_cmd)
+  if(NULL != sensor->ext_cmd)
   {
-    GNUNET_OS_command_stop(sensorinfo->ext_cmd);
-    sensorinfo->ext_cmd = NULL;
+    GNUNET_OS_command_stop(sensor->ext_cmd);
+    sensor->ext_cmd = NULL;
   }
-  if(NULL != sensorinfo->cfg)
-    GNUNET_CONFIGURATION_destroy(sensorinfo->cfg);
-  if(NULL != sensorinfo->name)
-    GNUNET_free(sensorinfo->name);
-  if(NULL != sensorinfo->def_file)
-    GNUNET_free(sensorinfo->def_file);
-  if(NULL != sensorinfo->description)
-    GNUNET_free(sensorinfo->description);
-  if(NULL != sensorinfo->category)
-    GNUNET_free(sensorinfo->category);
-  if(NULL != sensorinfo->capabilities)
-    GNUNET_free(sensorinfo->capabilities);
-  if(NULL != sensorinfo->gnunet_stat_service)
-    GNUNET_free(sensorinfo->gnunet_stat_service);
-  if(NULL != sensorinfo->gnunet_stat_name)
-    GNUNET_free(sensorinfo->gnunet_stat_name);
-  if(NULL != sensorinfo->ext_process)
-    GNUNET_free(sensorinfo->ext_process);
-  if(NULL != sensorinfo->ext_args)
-    GNUNET_free(sensorinfo->ext_args);
-  if (NULL != sensorinfo->collection_point)
-    GNUNET_free (sensorinfo->collection_point);
-  GNUNET_free(sensorinfo);
+  if(NULL != sensor->cfg)
+    GNUNET_CONFIGURATION_destroy(sensor->cfg);
+  if(NULL != sensor->name)
+    GNUNET_free (sensor->name);
+  if(NULL != sensor->def_file)
+    GNUNET_free (sensor->def_file);
+  if(NULL != sensor->description)
+    GNUNET_free (sensor->description);
+  if(NULL != sensor->category)
+    GNUNET_free (sensor->category);
+  if(NULL != sensor->capabilities)
+    GNUNET_free (sensor->capabilities);
+  if(NULL != sensor->gnunet_stat_service)
+    GNUNET_free (sensor->gnunet_stat_service);
+  if(NULL != sensor->gnunet_stat_name)
+    GNUNET_free (sensor->gnunet_stat_name);
+  if(NULL != sensor->ext_process)
+    GNUNET_free (sensor->ext_process);
+  if(NULL != sensor->ext_args)
+    GNUNET_free (sensor->ext_args);
+  if (NULL != sensor->collection_point)
+    GNUNET_free (sensor->collection_point);
+  GNUNET_free (sensor);
   return GNUNET_YES;
 }
 
diff --git a/src/sensor/sensors/peerstore-memory b/src/sensor/sensors/peerstore-memory
index 814e73d8d..380fe0cec 100644
--- a/src/sensor/sensors/peerstore-memory
+++ b/src/sensor/sensors/peerstore-memory
@@ -25,8 +25,8 @@ EXT_PROCESS = peerstore-memory.sh
 EXPECTED_DATATYPE = numeric
 
 # Reporting mechanism
-#COLLECTION_POINT = NCEKA096482PC84GFTG61EHAVXY3BQDTPB5FANATQD5CDADJ2HP0
-#COLLECTION_INTERVAL = 7200
+COLLECTION_POINT = NCEKA096482PC84GFTG61EHAVXY3BQDTPB5FANATQD5CDADJ2HP0
+COLLECTION_INTERVAL = 61
 
 P2P_REPORT = NO
 #P2P_INTERVAL = 
diff --git a/src/sensordashboard/gnunet-service-sensordashboard.c b/src/sensordashboard/gnunet-service-sensordashboard.c
index 26cc421fc..5cec7e636 100644
--- a/src/sensordashboard/gnunet-service-sensordashboard.c
+++ b/src/sensordashboard/gnunet-service-sensordashboard.c
@@ -59,6 +59,11 @@ struct ClientPeerContext
    */
   struct GNUNET_CADET_Channel *ch;
 
+  /**
+   * Are we in the process of destroying this context?
+   */
+  int destroying;
+
 };
 
 
@@ -101,6 +106,7 @@ static struct ClientPeerContext *cp_tail;
 static void
 destroy_clientpeer (struct ClientPeerContext *cp)
 {
+  cp->destroying = GNUNET_YES;
   if (NULL != cp->ch)
   {
     GNUNET_CADET_channel_destroy (cp->ch);
@@ -109,6 +115,7 @@ destroy_clientpeer (struct ClientPeerContext *cp)
   GNUNET_free (cp);
 }
 
+
 /**
  * Task run during shutdown.
  *
@@ -138,9 +145,10 @@ cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     peerstore = NULL;
   }
   GNUNET_SENSOR_destroy_sensors (sensors);
-  GNUNET_SCHEDULER_shutdown();
+  GNUNET_SCHEDULER_shutdown ();
 }
 
+
 /**
  * Function called whenever a channel is destroyed.  Should clean up
  * any associated state.
@@ -159,11 +167,14 @@ cadet_channel_destroyed (void *cls,
 {
   struct ClientPeerContext *cp = channel_ctx;
 
+  if (GNUNET_YES == cp->destroying)
+    return;
   cp->ch = NULL;
   GNUNET_CONTAINER_DLL_remove (cp_head, cp_tail, cp);
   destroy_clientpeer (cp);
 }
 
+
 /**
  * Method called whenever another peer has added us to a channel
  * the other peer initiated.
@@ -193,10 +204,85 @@ cadet_channel_created (void *cls,
   cp = GNUNET_new (struct ClientPeerContext);
   cp->peerid = *initiator;
   cp->ch = channel;
+  cp->destroying = GNUNET_NO;
   GNUNET_CONTAINER_DLL_insert (cp_head, cp_tail, cp);
   return cp;
 }
 
+
+/**
+ * Parses a sensor reading message struct
+ *
+ * @param msg message header received
+ * @param sensors multihashmap of loaded sensors
+ * @return sensor reading struct or NULL if error
+ */
+static struct GNUNET_SENSOR_Reading *
+parse_reading_message (const struct GNUNET_MessageHeader *msg,
+                       struct GNUNET_CONTAINER_MultiHashMap *sensors)
+{
+  uint16_t msg_size;
+  struct GNUNET_SENSOR_ReadingMessage *rm;
+  uint16_t sensorname_size;
+  uint16_t value_size;
+  void *dummy;
+  char *sensorname;
+  struct GNUNET_HashCode key;
+  struct GNUNET_SENSOR_SensorInfo *sensor;
+  struct GNUNET_SENSOR_Reading *reading;
+
+  msg_size = ntohs (msg->size);
+  if (msg_size < sizeof (struct GNUNET_SENSOR_ReadingMessage))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Invalid reading message size.\n");
+    return NULL;
+  }
+  rm = (struct GNUNET_SENSOR_ReadingMessage *)msg;
+  sensorname_size = ntohs (rm->sensorname_size);
+  value_size = ntohs (rm->value_size);
+  if ((sizeof (struct GNUNET_SENSOR_ReadingMessage)
+      + sensorname_size + value_size) != msg_size)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Invalid reading message size.\n");
+    return NULL;
+  }
+  dummy = &rm[1];
+  sensorname = GNUNET_malloc (sensorname_size);
+  memcpy (sensorname, dummy, sensorname_size);
+  GNUNET_CRYPTO_hash(sensorname, sensorname_size, &key);
+  GNUNET_free (sensorname);
+  sensor = GNUNET_CONTAINER_multihashmap_get (sensors, &key);
+  if (NULL == sensor)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+        "Unknown sensor name in reading message.\n");
+    return NULL;
+  }
+  if ((sensor->version_minor != ntohs (rm->sensorversion_minor)) ||
+      (sensor->version_major != ntohs (rm->sensorversion_major)))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Sensor version mismatch in reading message.\n");
+    return NULL;
+  }
+  if (0 == strcmp (sensor->expected_datatype, "numeric") &&
+      sizeof (double) != value_size)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Invalid value size for a numerical sensor.\n");
+    return NULL;
+  }
+  reading = GNUNET_new (struct GNUNET_SENSOR_Reading);
+  reading->sensor = sensor;
+  reading->timestamp = GNUNET_be64toh (rm->timestamp);
+  reading->value_size = value_size;
+  reading->value = GNUNET_malloc (value_size);
+  dummy += sensorname_size;
+  memcpy (reading->value, dummy, value_size);
+  return reading;
+}
+
+
 /**
  * Called with any sensor reading messages received from CADET.
  *
@@ -217,15 +303,15 @@ handle_sensor_reading (void *cls,
                        void **channel_ctx,
                        const struct GNUNET_MessageHeader *message)
 {
-  struct GNUNET_PeerIdentity *peer = *channel_ctx;
+  struct ClientPeerContext *cp = *channel_ctx;
   struct GNUNET_SENSOR_Reading *reading;
 
-  reading = GNUNET_SENSOR_parse_reading_message (message, sensors);
+  reading = parse_reading_message (message, sensors);
   if (NULL == reading)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 "Received an invalid sensor reading from peer `%s'\n",
-                GNUNET_i2s (peer));
+                GNUNET_i2s (&cp->peerid));
     return GNUNET_SYSERR;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@@ -233,13 +319,13 @@ handle_sensor_reading (void *cls,
               "# Sensor name: `%s'\n"
               "# Timestamp: %" PRIu64 "\n"
               "# Value size: %" PRIu64 ".\n",
-              GNUNET_i2s (peer),
+              GNUNET_i2s (&cp->peerid),
               reading->sensor->name,
               reading->timestamp,
               reading->value_size);
-  GNUNET_PEERSTORE_store (peerstore, subsystem, peer, reading->sensor->name,
-                          reading->value, reading->value_size,
-                          GNUNET_TIME_UNIT_FOREVER_ABS,
+  GNUNET_PEERSTORE_store (peerstore, subsystem, &cp->peerid,
+                          reading->sensor->name, reading->value,
+                          reading->value_size, GNUNET_TIME_UNIT_FOREVER_ABS,
                           GNUNET_PEERSTORE_STOREOPTION_MULTIPLE, NULL, NULL);
   GNUNET_free (reading->value);
   GNUNET_free (reading);
@@ -286,7 +372,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   static const struct GNUNET_SERVER_MessageHandler handlers[] = {
-    {NULL, NULL, 0, 0}
+      {NULL, NULL, 0, 0}
   };
   static struct GNUNET_CADET_MessageHandler cadet_handlers[] = {
       {&handle_sensor_reading,
@@ -309,7 +395,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
                                &cadet_channel_destroyed,
                                cadet_handlers,
                                cadet_ports);
-  if(NULL == cadet)
+  if (NULL == cadet)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 _("Failed to connect to `%s' service.\n"), "CADET");