sensor: fixes for proof-of-work, test passes now

[oweals/gnunet.git] / src / sensor / gnunet-sensor.c

diff --git a/src/sensor/gnunet-sensor.c b/src/sensor/gnunet-sensor.c
index ffd61f8b4110728332aff8251de76c923edc7e51..7b7be61ef8269b8a2a95b47cfe713828b7fbaff4 100644 (file)
--- a/src/sensor/gnunet-sensor.c
+++ b/src/sensor/gnunet-sensor.c
@@ -39,6 +39,11 @@ static int get_all;
  */
 static char *get_sensor;
 
+/**
+ * option '-f'
+ */
+static char *force_anomaly;
+
 /*
  * Handle to sensor service
  */
@@ -79,7 +84,10 @@ print_sensor_info (void *cls, const struct SensorInfoShort *sensor,
     return;
   }
   if (NULL == sensor)           /* no more sensors from service */
+  {
+    GNUNET_SCHEDULER_shutdown ();
     return;
+  }
   printf ("Name: %s\nVersion: %d.%d\n", sensor->name, sensor->version_major,
           sensor->version_minor);
   if (NULL != sensor->description)
@@ -88,6 +96,21 @@ print_sensor_info (void *cls, const struct SensorInfoShort *sensor,
 }
 
 
+/**
+ * Continuation called after a force anomaly request is sent.
+ *
+ * @param cls Closure (unused)
+ * @param emsg Error message, NULL of no error
+ */
+void
+force_anomaly_cont (void *cls, const char *emsg)
+{
+  if (NULL != emsg)
+    printf ("Error: %s\n", emsg);
+  GNUNET_SCHEDULER_shutdown ();
+}
+
+
 /**
  * Main function that will be run by the scheduler.
  *
@@ -107,17 +130,19 @@ run (void *cls, char *const *args, const char *cfgfile,
   GNUNET_assert (NULL != sensor_handle);
   if (GNUNET_YES == get_all)
   {
-    GNUNET_SENSOR_iterate_sensors (sensor_handle, GNUNET_TIME_UNIT_FOREVER_REL,
-                                   NULL, 0, &print_sensor_info, NULL);
+    GNUNET_SENSOR_iterate (sensor_handle, GNUNET_TIME_UNIT_FOREVER_REL, NULL,
+                           &print_sensor_info, NULL);
   }
   else if (NULL != get_sensor)
   {
-    GNUNET_SENSOR_iterate_sensors (sensor_handle, GNUNET_TIME_UNIT_FOREVER_REL,
-                                   get_sensor, strlen (get_sensor),
-                                   &print_sensor_info, NULL);
+    GNUNET_SENSOR_iterate (sensor_handle, GNUNET_TIME_UNIT_FOREVER_REL,
+                           get_sensor, &print_sensor_info, NULL);
+  }
+  else if (NULL != force_anomaly)
+  {
+    GNUNET_SENSOR_force_anomaly (sensor_handle, "nse", GNUNET_YES,
+                                 &force_anomaly_cont, NULL);
   }
-
-  GNUNET_SCHEDULER_shutdown ();
   ret = 0;
 }
 
@@ -139,6 +164,9 @@ main (int argc, char *const *argv)
     {'g', "get-sensor", NULL,
      gettext_noop ("Retrieve information about a single sensor"),
      1, &GNUNET_GETOPT_set_string, &get_sensor},
+    {'f', "force anomaly", NULL,
+     gettext_noop ("Force an anomaly on a sensor, use only for testing"),
+     1, &GNUNET_GETOPT_set_string, &force_anomaly},
     GNUNET_GETOPT_OPTION_END
   };