sensor: test case + fixes

3 files changed, 45 insertions, 2 deletions

diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index 176391580..68472a3f9 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -2458,6 +2458,11 @@ extern "C"
  */
 #define GNUNET_MESSAGE_TYPE_SENSOR_ANOMALY_FORCE 810
 
+/**
+ * Sensor anomaly report exchanged between peers
+ */
+#define GNUNET_MESSAGE_TYPE_SENSOR_ANOMALY_REPORT_P2P 811
+
 
 /*******************************************************************************
  * PEERSTORE message types
diff --git a/src/include/gnunet_sensor_service.h b/src/include/gnunet_sensor_service.h
index 59e4248ab..250256cef 100644
--- a/src/include/gnunet_sensor_service.h
+++ b/src/include/gnunet_sensor_service.h
@@ -49,6 +49,11 @@ struct GNUNET_SENSOR_Handle;
 struct GNUNET_SENSOR_IterateContext;
 
 /**
+ * Context of a force anomaly request
+ */
+struct GNUNET_SENSOR_ForceAnomalyContext;
+
+/**
  * Structure containing brief info about sensor
  */
 struct SensorInfoShort
@@ -147,6 +152,16 @@ GNUNET_SENSOR_iterate (struct GNUNET_SENSOR_Handle *h,
 
 
 /**
+ * Cancel a force anomaly request.
+ *
+ * @param fa Force anomaly context returned by GNUNET_SENSOR_force_anomaly()
+ */
+void
+GNUNET_SENSOR_force_anomaly_cancel (struct GNUNET_SENSOR_ForceAnomalyContext
+                                    *fa);
+
+
+/**
  * Force an anomaly status change on a given sensor. If the sensor reporting
  * module is running, this will trigger the usual reporting logic, therefore,
  * please only use this in a test environment.
@@ -157,10 +172,13 @@ GNUNET_SENSOR_iterate (struct GNUNET_SENSOR_Handle *h,
  * @param h Service handle
  * @param sensor_name Sensor name to set the anomaly status
  * @param anomalous The desired status: #GNUNET_YES / #GNUNET_NO
+ * @param cont Continuation function to be called after the request is sent
+ * @param cont_cls Closure for cont
  */
-void
+struct GNUNET_SENSOR_ForceAnomalyContext *
 GNUNET_SENSOR_force_anomaly (struct GNUNET_SENSOR_Handle *h, char *sensor_name,
-                             int anomalous);
+                             int anomalous, GNUNET_SENSOR_Continuation cont,
+                             void *cont_cls);
 
 #if 0                           /* keep Emacsens' auto-indent happy */
 {
diff --git a/src/include/gnunet_sensor_util_lib.h b/src/include/gnunet_sensor_util_lib.h
index 87ae564fa..897fbbaad 100644
--- a/src/include/gnunet_sensor_util_lib.h
+++ b/src/include/gnunet_sensor_util_lib.h
@@ -189,6 +189,26 @@ struct GNUNET_SENSOR_SensorInfo
 
 };
 
+/**
+ * Anomaly report received and stored by sensor dashboard.
+ * Sensor name and peer id are not included because they are part of the
+ * peerstore key.
+ */
+struct GNUNET_SENSOR_DashboardAnomalyEntry
+{
+
+  /**
+   * New anomaly status
+   */
+  uint16_t anomalous;
+
+  /**
+   * Percentage of neighbors reported the same anomaly
+   */
+  float anomalous_neighbors;
+
+};
+
 GNUNET_NETWORK_STRUCT_BEGIN
 
 /**