sensor: towards anomaly reporting

7 files changed, 409 insertions, 91 deletions

diff --git a/src/sensor/Makefile.am b/src/sensor/Makefile.am
index 70604208c..fb90513dd 100644
--- a/src/sensor/Makefile.am
+++ b/src/sensor/Makefile.am
@@ -36,15 +36,17 @@ gnunet_sensor_LDADD = \
 
 gnunet_service_sensor_SOURCES = \
  gnunet-service-sensor.c \
- gnunet-service-sensor-analysis.c \
- gnunet-service-sensor-reporting.c \
- gnunet-service-sensor-update.c
+ gnunet-service-sensor_analysis.c \
+ gnunet-service-sensor_reporting_value.c \
+ gnunet-service-sensor_reporting_anomaly.c \
+ gnunet-service-sensor_update.c
 gnunet_service_sensor_LDADD = \
   libgnunetsensorutil.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/cadet/libgnunetcadet.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
   $(GN_LIBINTL)
 
 libgnunetsensor_la_SOURCES = \
diff --git a/src/sensor/gnunet-service-sensor.c b/src/sensor/gnunet-service-sensor.c
index d9f3670d4..1df300410 100644
--- a/src/sensor/gnunet-service-sensor.c
+++ b/src/sensor/gnunet-service-sensor.c
@@ -43,22 +43,22 @@ static struct GNUNET_CONTAINER_MultiHashMap *sensors;
 /**
  * Handle to statistics service
  */
-struct GNUNET_STATISTICS_Handle *statistics;
+static struct GNUNET_STATISTICS_Handle *statistics;
 
 /**
  * Handle to peerstore service
  */
-struct GNUNET_PEERSTORE_Handle *peerstore;
+static struct GNUNET_PEERSTORE_Handle *peerstore;
 
 /**
  * Service name
  */
-char *subsystem = "sensor";
+static char *subsystem = "sensor";
 
 /**
  * My peer id
  */
-struct GNUNET_PeerIdentity peerid;
+static struct GNUNET_PeerIdentity peerid;
 
 
 /**
@@ -96,8 +96,9 @@ static void
 stop ()
 {
   SENSOR_update_stop ();
-  SENSOR_reporting_stop ();
   SENSOR_analysis_stop ();
+  SENSOR_reporting_value_stop ();
+  SENSOR_reporting_anomaly_stop ();
   GNUNET_SENSOR_destroy_sensors (sensors);
 }
 
@@ -612,8 +613,9 @@ start ()
 {
   sensors = GNUNET_SENSOR_load_all_sensors ();
   schedule_all_sensors ();
+  SENSOR_reporting_value_start (cfg, sensors);
+  SENSOR_reporting_anomaly_start (cfg, sensors);
   SENSOR_analysis_start (cfg, sensors);
-  SENSOR_reporting_start (cfg, sensors);
   SENSOR_update_start (cfg, sensors, &reset);
 }
 
diff --git a/src/sensor/gnunet-service-sensor-analysis.c b/src/sensor/gnunet-service-sensor_analysis.c
index 175fc259c..46422d039 100644
--- a/src/sensor/gnunet-service-sensor-analysis.c
+++ b/src/sensor/gnunet-service-sensor_analysis.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file sensor/gnunet-service-sensor-analysis.c
+ * @file sensor/gnunet-service-sensor_analysis.c
  * @brief sensor service analysis functionality
  * @author Omar Tarabai
  */
@@ -212,7 +212,7 @@ sensor_watcher (void *cls, struct GNUNET_PEERSTORE_Record *record, char *emsg)
       GNUNET_PEERSTORE_store (peerstore, "senosr-analysis", &peerid,
                               model->sensor->name, &model->anomalous,
                               sizeof (model->anomalous),
-                              GNUNET_TIME_UNIT_FOREVER_ABS,
+                              GNUNET_TIME_absolute_get (),
                               GNUNET_PEERSTORE_STOREOPTION_REPLACE, NULL, NULL);
     }
   }
@@ -229,7 +229,7 @@ sensor_watcher (void *cls, struct GNUNET_PEERSTORE_Record *record, char *emsg)
       GNUNET_PEERSTORE_store (peerstore, "senosr-analysis", &peerid,
                               model->sensor->name, &model->anomalous,
                               sizeof (model->anomalous),
-                              GNUNET_TIME_UNIT_FOREVER_ABS,
+                              GNUNET_TIME_absolute_get (),
                               GNUNET_PEERSTORE_STOREOPTION_REPLACE, NULL, NULL);
     }
   }
@@ -321,4 +321,4 @@ SENSOR_analysis_start (const struct GNUNET_CONFIGURATION_Handle *c,
   return GNUNET_OK;
 }
 
-/* end of gnunet-service-sensor-analysis.c */
+/* end of gnunet-service-sensor_analysis.c */
diff --git a/src/sensor/gnunet-service-sensor_reporting_anomaly.c b/src/sensor/gnunet-service-sensor_reporting_anomaly.c
new file mode 100644
index 000000000..9a7a4eeb0
--- /dev/null
+++ b/src/sensor/gnunet-service-sensor_reporting_anomaly.c
@@ -0,0 +1,302 @@
+/*
+     This file is part of GNUnet.
+     (C)
+
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file sensor/gnunet-service-sensor_reporting_anomaly.c
+ * @brief sensor service anomaly reporting functionality
+ * @author Omar Tarabai
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "sensor.h"
+#include "gnunet_peerstore_service.h"
+#include "gnunet_core_service.h"
+
+#define LOG(kind,...) GNUNET_log_from (kind, "sensor-reporting-anomaly",__VA_ARGS__)
+
+struct AnomalyReportingContext
+{
+
+  /**
+   * DLL
+   */
+  struct AnomalyReportingContext *prev;
+
+  /**
+   * DLL
+   */
+  struct AnomalyReportingContext *next;
+
+  /**
+   * Sensor information
+   */
+  struct GNUNET_SENSOR_SensorInfo *sensor;
+
+};
+
+/**
+ * Context of a connection to a peer through CORE
+ */
+struct CorePeerContext
+{
+
+  /**
+   * DLL
+   */
+  struct CorePeerContext *prev;
+
+  /**
+   * DLL
+   */
+  struct CorePeerContext *next;
+
+  /**
+   * Peer identity of connected peer
+   */
+  struct GNUNET_PeerIdentity *peerid;
+
+};
+
+
+/**
+ * Our configuration.
+ */
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+/**
+ * Handle to core service
+ */
+static struct GNUNET_CORE_Handle *core;
+
+/**
+ * My peer id
+ */
+static struct GNUNET_PeerIdentity mypeerid;
+
+/**
+ * Head of DLL of anomaly reporting contexts
+ */
+static struct AnomalyReportingContext *arc_head;
+
+/**
+ * Tail of DLL of anomaly reporting contexts
+ */
+static struct AnomalyReportingContext *arc_tail;
+
+/**
+ * Head of DLL of CORE peer contexts
+ */
+static struct CorePeerContext *cp_head;
+
+/**
+ * Tail of DLL of CORE peer contexts
+ */
+static struct CorePeerContext *cp_tail;
+
+
+/**
+ * Destroy anomaly reporting context struct
+ *
+ * @param arc struct to destroy
+ */
+static void
+destroy_anomaly_reporting_context (struct AnomalyReportingContext *arc)
+{
+  GNUNET_free (arc);
+}
+
+
+/**
+ * Stop sensor anomaly reporting module
+ */
+void
+SENSOR_reporting_anomaly_stop ()
+{
+  struct AnomalyReportingContext *arc;
+
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Stopping sensor anomaly reporting module.\n");
+  //TODO: destroy core peer contexts
+  //TODO: destroy core connection
+  arc = arc_head;
+  while (NULL != arc)
+  {
+    GNUNET_CONTAINER_DLL_remove (arc_head, arc_tail, arc);
+    destroy_anomaly_reporting_context (arc);
+    arc = arc_head;
+  }
+}
+
+
+/**
+ * Iterator for defined sensors
+ * Watches sensors for anomaly status change to report
+ *
+ * @param cls unused
+ * @param key unused
+ * @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)
+{
+  struct GNUNET_SENSOR_SensorInfo *sensor = value;
+  struct AnomalyReportingContext *arc;
+
+  if (NULL == sensor->collection_point)
+    return GNUNET_YES;
+  LOG (GNUNET_ERROR_TYPE_INFO,
+       "Reporting sensor `%s' anomalies to collection point `%s'.\n",
+       sensor->name, GNUNET_i2s_full (sensor->collection_point));
+  arc = GNUNET_new (struct AnomalyReportingContext);
+  arc->sensor = sensor;
+  GNUNET_CONTAINER_DLL_insert (arc_head, arc_tail, arc);
+  //TODO
+  return GNUNET_YES;
+}
+
+
+/**
+ * Function called after #GNUNET_CORE_connect has succeeded (or failed
+ * for good).  Note that the private key of the peer is intentionally
+ * not exposed here; if you need it, your process should try to read
+ * the private key file directly (which should work if you are
+ * authorized...).  Implementations of this function must not call
+ * #GNUNET_CORE_disconnect (other than by scheduling a new task to
+ * do this later).
+ *
+ * @param cls closure (unused)
+ * @param my_identity ID of this peer, NULL if we failed
+ */
+static void
+core_startup_cb (void *cls, const struct GNUNET_PeerIdentity *my_identity)
+{
+  if (NULL == my_identity)
+  {
+    LOG (GNUNET_ERROR_TYPE_ERROR, _("Failed to connect to CORE service.\n"));
+    SENSOR_reporting_anomaly_stop ();
+    return;
+  }
+  if (0 != GNUNET_CRYPTO_cmp_peer_identity (&mypeerid, my_identity))
+  {
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         _("Peer identity received from CORE doesn't match ours.\n"));
+    SENSOR_reporting_anomaly_stop ();
+    return;
+  }
+}
+
+
+/**
+ * Method called whenever a given peer connects through CORE.
+ *
+ * @param cls closure (unused)
+ * @param peer peer identity this notification is about
+ */
+static void
+core_connect_cb (void *cls, const struct GNUNET_PeerIdentity *peer)
+{
+  struct CorePeerContext *cp;
+
+  if (0 == GNUNET_CRYPTO_cmp_peer_identity (&mypeerid, peer))
+    return;
+  cp = GNUNET_new (struct CorePeerContext);
+  cp->peerid = (struct GNUNET_PeerIdentity *)peer;
+  GNUNET_CONTAINER_DLL_insert (cp_head, cp_tail, cp);
+  //TODO: report to peer your anomaly status
+}
+
+
+/**
+ * Method called whenever a CORE peer disconnects.
+ *
+ * @param cls closure (unused)
+ * @param peer peer identity this notification is about
+ */
+static void
+core_disconnect_cb (void *cls, const struct GNUNET_PeerIdentity *peer)
+{
+  struct CorePeerContext *cp;
+
+  if (0 == GNUNET_CRYPTO_cmp_peer_identity (&mypeerid, peer))
+    return;
+  cp = cp_head;
+  while (NULL != cp)
+  {
+    if (peer == cp->peerid)
+    {
+      GNUNET_CONTAINER_DLL_remove (cp_head, cp_tail, cp);
+      //TODO: call peer context destroy function
+      return;
+    }
+  }
+  LOG (GNUNET_ERROR_TYPE_ERROR,
+       _("Received disconnect notification from CORE"
+         " for a peer we didn't know about.\n"));
+}
+
+
+/**
+ * An inbound message is received from a peer through CORE.
+ *
+ * @param cls closure (unused)
+ * @param peer the other peer involved
+ * @param message the actual message
+ * @return #GNUNET_OK to keep the connection open,
+ *         #GNUNET_SYSERR to close connection to the peer (signal serious error)
+ */
+static int
+core_inbound_cb (void *cls,
+    const struct GNUNET_PeerIdentity *other,
+    const struct GNUNET_MessageHeader *message)
+{
+  //TODO
+  return GNUNET_OK;
+}
+
+
+/**
+ * Start the sensor anomaly reporting module
+ *
+ * @param c our service configuration
+ * @param sensors multihashmap of loaded sensors
+ * @return #GNUNET_OK if started successfully, #GNUNET_SYSERR otherwise
+ */
+int
+SENSOR_reporting_anomaly_start (const struct GNUNET_CONFIGURATION_Handle *c,
+                                struct GNUNET_CONTAINER_MultiHashMap *sensors)
+{
+  static struct GNUNET_CORE_MessageHandler core_handlers[] = {
+    {NULL, 0, 0}                //TODO
+  };
+
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Starting sensor anomaly reporting module.\n");
+  GNUNET_assert (NULL != sensors);
+  cfg = c;
+  core =
+      GNUNET_CORE_connect (cfg, NULL, &core_startup_cb, core_connect_cb,
+                           &core_disconnect_cb, core_inbound_cb, GNUNET_NO,
+                           NULL, GNUNET_YES, core_handlers);
+  GNUNET_CRYPTO_get_peer_identity (cfg, &mypeerid);
+  GNUNET_CONTAINER_multihashmap_iterate (sensors, &init_sensor_reporting, NULL);
+  return GNUNET_OK;
+}
+
+/* end of gnunet-service-sensor_reporting_anomaly.c */
diff --git a/src/sensor/gnunet-service-sensor-reporting.c b/src/sensor/gnunet-service-sensor_reporting_value.c
index 9bcf9904b..84fbd11ae 100644
--- a/src/sensor/gnunet-service-sensor-reporting.c
+++ b/src/sensor/gnunet-service-sensor_reporting_value.c
@@ -19,8 +19,8 @@
 */
 
 /**
- * @file sensor/gnunet-service-sensor-reporting.c
- * @brief sensor service reporting functionality
+ * @file sensor/gnunet-service-sensor_reporting_value.c
+ * @brief sensor service value reporting functionality
  * @author Omar Tarabai
  */
 #include <inttypes.h>
@@ -31,7 +31,7 @@
 #include "gnunet_cadet_service.h"
 #include "gnunet_applications.h"
 
-#define LOG(kind,...) GNUNET_log_from (kind, "sensor-reporting",__VA_ARGS__)
+#define LOG(kind,...) GNUNET_log_from (kind, "sensor-reporting-value",__VA_ARGS__)
 
 /**
  * Retry interval (seconds) in case channel to collection point is busy
@@ -39,7 +39,7 @@
 #define COLLECTION_RETRY 1
 
 /**
- * Context of reporting operations
+ * Context of reporting sensor values
  */
 struct ValueReportingContext
 {
@@ -186,7 +186,7 @@ struct CadetChannelContext *cc_tail;
  * Destroy a reporting context structure
  */
 static void
-destroy_reporting_context (struct ValueReportingContext *vrc)
+destroy_value_reporting_context (struct ValueReportingContext *vrc)
 {
   if (NULL != vrc->wc)
   {
@@ -234,15 +234,15 @@ destroy_cadet_channel_context (struct CadetChannelContext *cc)
 
 
 /**
- * Stop sensor reporting module
+ * Stop sensor value reporting module
  */
 void
-SENSOR_reporting_stop ()
+SENSOR_reporting_value_stop ()
 {
   struct ValueReportingContext *vrc;
   struct CadetChannelContext *cc;
 
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Stopping sensor reporting module.\n");
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Stopping sensor value reporting module.\n");
   while (NULL != cc_head)
   {
     cc = cc_head;
@@ -253,7 +253,7 @@ SENSOR_reporting_stop ()
   {
     vrc = vrc_head;
     GNUNET_CONTAINER_DLL_remove (vrc_head, vrc_tail, vrc);
-    destroy_reporting_context (vrc);
+    destroy_value_reporting_context (vrc);
   }
   if (NULL != peerstore)
   {
@@ -269,8 +269,7 @@ SENSOR_reporting_stop ()
 
 
 /**
- * Returns CADET channel established to given peer
- * or creates a new one
+ * Returns CADET channel established to given peer or creates a new one.
  *
  * @param pid Peer Identity
  * @return Context of established cadet channel
@@ -348,7 +347,7 @@ construct_reading_message (struct ValueReportingContext *vrc,
  * @return number of bytes written to @a buf
  */
 static size_t
-do_report_collection_point (void *cls, size_t size, void *buf)
+do_report_value (void *cls, size_t size, void *buf)
 {
   struct CadetChannelContext *cc = cls;
   size_t written = 0;
@@ -386,8 +385,7 @@ do_report_collection_point (void *cls, size_t size, void *buf)
  * @param tc unused
  */
 static void
-report_collection_point (void *cls,
-                         const struct GNUNET_SCHEDULER_TaskContext *tc)
+report_value (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct ValueReportingContext *vrc = cls;
   struct GNUNET_SENSOR_SensorInfo *sensor = vrc->sensor;
@@ -396,14 +394,14 @@ report_collection_point (void *cls,
   size_t msg_size;
 
   vrc->cp_task = GNUNET_SCHEDULER_NO_TASK;
-  if (0 == vrc->last_value_size) /* Did not receive a sensor value yet */
+  if (0 == vrc->last_value_size)        /* Did not receive a sensor value yet */
   {
     LOG (GNUNET_ERROR_TYPE_WARNING,
          "Did not receive a value from `%s' to report yet.\n",
          vrc->sensor->name);
     vrc->cp_task =
         GNUNET_SCHEDULER_add_delayed (sensor->value_reporting_interval,
-                                      &report_collection_point, vrc);
+                                      &report_value, vrc);
     return;
   }
   LOG (GNUNET_ERROR_TYPE_DEBUG,
@@ -420,8 +418,7 @@ report_collection_point (void *cls,
     vrc->cp_task =
         GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
                                       (GNUNET_TIME_UNIT_SECONDS,
-                                       COLLECTION_RETRY),
-                                      &report_collection_point, vrc);
+                                       COLLECTION_RETRY), &report_value, vrc);
     return;
   }
   msg_size = construct_reading_message (vrc, &msg);
@@ -430,11 +427,11 @@ report_collection_point (void *cls,
   cc->pending_msg_size = msg_size;
   cc->th =
       GNUNET_CADET_notify_transmit_ready (cc->c, GNUNET_YES,
-                                          sensor->value_reporting_interval, msg_size,
-                                          &do_report_collection_point, cc);
+                                          sensor->value_reporting_interval,
+                                          msg_size, &do_report_value, cc);
   vrc->cp_task =
       GNUNET_SCHEDULER_add_delayed (sensor->value_reporting_interval,
-                                    &report_collection_point, vrc);
+                                    &report_value, vrc);
 }
 
 
@@ -442,7 +439,7 @@ report_collection_point (void *cls,
  * Sensor value watch callback
  */
 static int
-sensor_watch_cb (void *cls, struct GNUNET_PEERSTORE_Record *record, char *emsg)
+value_watch_cb (void *cls, struct GNUNET_PEERSTORE_Record *record, char *emsg)
 {
   struct ValueReportingContext *vrc = cls;
 
@@ -466,6 +463,34 @@ sensor_watch_cb (void *cls, struct GNUNET_PEERSTORE_Record *record, char *emsg)
 
 
 /**
+ * Function called whenever a channel is destroyed.  Should clean up
+ * any associated state.
+ *
+ * It must NOT call #GNUNET_CADET_channel_destroy on the channel.
+ *
+ * @param cls closure (set from #GNUNET_CADET_connect)
+ * @param channel connection to the other end (henceforth invalid)
+ * @param channel_ctx place where local state associated
+ *                   with the channel is stored
+ */
+static void
+cadet_channel_destroyed (void *cls, const struct GNUNET_CADET_Channel *channel,
+                         void *channel_ctx)
+{
+  struct CadetChannelContext *cc = channel_ctx;
+
+  if (GNUNET_YES == cc->destroying)
+    return;
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "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);
+}
+
+
+/**
  * Iterator for defined sensors
  * Watches sensors for readings to report
  *
@@ -481,76 +506,44 @@ init_sensor_reporting (void *cls, const struct GNUNET_HashCode *key,
   struct GNUNET_SENSOR_SensorInfo *sensor = value;
   struct ValueReportingContext *vrc;
 
-  if (NULL == sensor->collection_point ||
-      (GNUNET_NO == sensor->report_values && GNUNET_NO == sensor->report_anomalies))
+  if (NULL == sensor->collection_point || GNUNET_NO == sensor->report_values)
     return GNUNET_YES;
+  LOG (GNUNET_ERROR_TYPE_INFO,
+       "Reporting sensor `%s' values to collection point `%s' every %s.\n",
+       sensor->name, GNUNET_i2s_full (sensor->collection_point),
+       GNUNET_STRINGS_relative_time_to_string (sensor->value_reporting_interval,
+                                               GNUNET_YES));
   vrc = GNUNET_new (struct ValueReportingContext);
   vrc->sensor = sensor;
   vrc->last_value = NULL;
   vrc->last_value_size = 0;
   vrc->wc =
       GNUNET_PEERSTORE_watch (peerstore, "sensor", &mypeerid, sensor->name,
-                              &sensor_watch_cb, vrc);
-  if (NULL != sensor->collection_point)
-  {
-    LOG (GNUNET_ERROR_TYPE_INFO,
-         "Will start reporting sensor `%s' values to "
-         "collection point `%s' every %s.\n", sensor->name,
-         GNUNET_i2s_full (sensor->collection_point),
-         GNUNET_STRINGS_relative_time_to_string (sensor->value_reporting_interval,
-                                                 GNUNET_YES));
-    vrc->cp_task =
-        GNUNET_SCHEDULER_add_delayed (sensor->value_reporting_interval,
-                                      &report_collection_point, vrc);
-  }
+                              &value_watch_cb, vrc);
+  vrc->cp_task =
+      GNUNET_SCHEDULER_add_delayed (sensor->value_reporting_interval,
+                                    &report_value, vrc);
   GNUNET_CONTAINER_DLL_insert (vrc_head, vrc_tail, vrc);
   return GNUNET_YES;
 }
 
 
 /**
- * Function called whenever a channel is destroyed.  Should clean up
- * any associated state.
- *
- * It must NOT call #GNUNET_CADET_channel_destroy on the channel.
- *
- * @param cls closure (set from #GNUNET_CADET_connect)
- * @param channel connection to the other end (henceforth invalid)
- * @param channel_ctx place where local state associated
- *                   with the channel is stored
- */
-static void
-cadet_channel_destroyed (void *cls, const struct GNUNET_CADET_Channel *channel,
-                         void *channel_ctx)
-{
-  struct CadetChannelContext *cc = channel_ctx;
-
-  if (GNUNET_YES == cc->destroying)
-    return;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "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);
-}
-
-/**
- * Start the sensor reporting module
+ * Start the sensor value reporting module
  *
  * @param c our service configuration
  * @param sensors multihashmap of loaded sensors
  * @return #GNUNET_OK if started successfully, #GNUNET_SYSERR otherwise
  */
 int
-SENSOR_reporting_start (const struct GNUNET_CONFIGURATION_Handle *c,
-                        struct GNUNET_CONTAINER_MultiHashMap *sensors)
+SENSOR_reporting_value_start (const struct GNUNET_CONFIGURATION_Handle *c,
+                              struct GNUNET_CONTAINER_MultiHashMap *sensors)
 {
   static struct GNUNET_CADET_MessageHandler cadet_handlers[] = {
     {NULL, 0, 0}
   };
 
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Starting sensor reporting module.\n");
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Starting sensor value reporting module.\n");
   GNUNET_assert (NULL != sensors);
   cfg = c;
   peerstore = GNUNET_PEERSTORE_connect (cfg);
@@ -558,7 +551,7 @@ SENSOR_reporting_start (const struct GNUNET_CONFIGURATION_Handle *c,
   {
     LOG (GNUNET_ERROR_TYPE_ERROR,
          _("Failed to connect to peerstore service.\n"));
-    SENSOR_reporting_stop ();
+    SENSOR_reporting_value_stop ();
     return GNUNET_SYSERR;
   }
   cadet =
@@ -567,7 +560,7 @@ SENSOR_reporting_start (const struct GNUNET_CONFIGURATION_Handle *c,
   if (NULL == cadet)
   {
     LOG (GNUNET_ERROR_TYPE_ERROR, _("Failed to connect to CADET service.\n"));
-    SENSOR_reporting_stop ();
+    SENSOR_reporting_value_stop ();
     return GNUNET_SYSERR;
   }
   GNUNET_CRYPTO_get_peer_identity (cfg, &mypeerid);
@@ -575,4 +568,4 @@ SENSOR_reporting_start (const struct GNUNET_CONFIGURATION_Handle *c,
   return GNUNET_OK;
 }
 
-/* end of gnunet-service-sensor-reporting.c */
+/* end of gnunet-service-sensor_reporting_value.c */
diff --git a/src/sensor/gnunet-service-sensor-update.c b/src/sensor/gnunet-service-sensor_update.c
index 3d3eb335d..1d8b32832 100644
--- a/src/sensor/gnunet-service-sensor-update.c
+++ b/src/sensor/gnunet-service-sensor_update.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file sensor/gnunet-service-sensor-update.c
+ * @file sensor/gnunet-service-sensor_update.c
  * @brief sensor service update functionality
  * @author Omar Tarabai
  */
@@ -785,4 +785,4 @@ SENSOR_update_start (const struct GNUNET_CONFIGURATION_Handle *c,
   return GNUNET_OK;
 }
 
-/* end of gnunet-service-sensor-update.c */
+/* end of gnunet-service-sensor_update.c */
diff --git a/src/sensor/sensor.h b/src/sensor/sensor.h
index 0fdb5a6e2..45fe2edda 100644
--- a/src/sensor/sensor.h
+++ b/src/sensor/sensor.h
@@ -81,22 +81,41 @@ SENSOR_analysis_start (const struct GNUNET_CONFIGURATION_Handle *c,
 
 
 /**
- * Stop sensor reporting module
+ * Stop sensor value reporting module
  */
 void
-SENSOR_reporting_stop ();
+SENSOR_reporting_value_stop ();
 
 
 /**
- * Start the sensor reporting module
+ * Start the sensor value reporting module
  *
  * @param c our service configuration
  * @param sensors multihashmap of loaded sensors
  * @return #GNUNET_OK if started successfully, #GNUNET_SYSERR otherwise
  */
 int
-SENSOR_reporting_start (const struct GNUNET_CONFIGURATION_Handle *c,
-                        struct GNUNET_CONTAINER_MultiHashMap *sensors);
+SENSOR_reporting_value_start (const struct GNUNET_CONFIGURATION_Handle *c,
+                              struct GNUNET_CONTAINER_MultiHashMap *sensors);
+
+
+/**
+ * Stop sensor anomaly reporting module
+ */
+void
+SENSOR_reporting_anomaly_stop ();
+
+
+/**
+ * Start the sensor anomaly reporting module
+ *
+ * @param c our service configuration
+ * @param sensors multihashmap of loaded sensors
+ * @return #GNUNET_OK if started successfully, #GNUNET_SYSERR otherwise
+ */
+int
+SENSOR_reporting_anomaly_start (const struct GNUNET_CONFIGURATION_Handle *c,
+                                struct GNUNET_CONTAINER_MultiHashMap *sensors);
 
 
 /**