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 0b4dd6da1d29a3ad9a2e4a59b52d1ce68ac7789a..7b7be61ef8269b8a2a95b47cfe713828b7fbaff4 100644 (file)
--- a/src/sensor/gnunet-sensor.c
+++ b/src/sensor/gnunet-sensor.c
@@ -39,10 +39,15 @@ static int get_all;
  */
 static char *get_sensor;
 
+/**
+ * option '-f'
+ */
+static char *force_anomaly;
+
 /*
  * Handle to sensor service
  */
-struct GNUNET_SENSOR_Handle *sensor_handle;
+static struct GNUNET_SENSOR_Handle *sensor_handle;
 
 /**
  * Run on shutdown
@@ -51,16 +56,16 @@ struct GNUNET_SENSOR_Handle *sensor_handle;
  * @param tc scheduler context
  */
 static void
-shutdown_task (void *cls,
-         const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  if(NULL != sensor_handle)
+  if (NULL != sensor_handle)
   {
-    GNUNET_SENSOR_disconnect(sensor_handle);
+    GNUNET_SENSOR_disconnect (sensor_handle);
     sensor_handle = NULL;
   }
 }
 
+
 /**
  * Callback for getting sensor info from service
  *
@@ -68,30 +73,44 @@ shutdown_task (void *cls,
  * @param sensor brief information about sensor (NULL means end of transmission)
  * @param err_msg contains error string if any
  */
-void print_sensor_info(void *cls,
-    const struct SensorInfoShort *sensor,
-    const char *err_msg)
+void
+print_sensor_info (void *cls, const struct SensorInfoShort *sensor,
+                   const char *err_msg)
 {
-  if(NULL != err_msg)
+  if (NULL != err_msg)
   {
-    printf("Error: %s\n", err_msg);
-    GNUNET_SCHEDULER_shutdown();
+    printf ("Error: %s\n", err_msg);
+    GNUNET_SCHEDULER_shutdown ();
     return;
   }
-  if(NULL == sensor) /* no more sensors from service */
+  if (NULL == sensor)           /* no more sensors from service */
   {
-    GNUNET_SCHEDULER_shutdown();
+    GNUNET_SCHEDULER_shutdown ();
     return;
   }
-  printf("Name: %s\nVersion: %d.%d\n",
-      sensor->name,
-      sensor->version_major,
-      sensor->version_minor);
-  if(NULL != sensor->description)
-    printf("Description: %s\n", sensor->description);
-  printf("\n");
+  printf ("Name: %s\nVersion: %d.%d\n", sensor->name, sensor->version_major,
+          sensor->version_minor);
+  if (NULL != sensor->description)
+    printf ("Description: %s\n", sensor->description);
+  printf ("\n");
+}
+
+
+/**
+ * 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.
  *
@@ -101,40 +120,33 @@ void print_sensor_info(void *cls,
  * @param cfg configuration
  */
 static void
-run (void *cls,
-     char *const *args,
-     const char *cfgfile,
+run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-
   sensor_handle = NULL;
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
-                                  &shutdown_task,
-                                  NULL);
-  sensor_handle = GNUNET_SENSOR_connect(cfg);
-  GNUNET_assert(NULL != sensor_handle);
-  if(GNUNET_YES == get_all)
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
+                                NULL);
+  sensor_handle = GNUNET_SENSOR_connect (cfg);
+  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)
+  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);
   }
-
   ret = 0;
 }
 
+
 /**
  * The main function to sensor.
  *
@@ -146,21 +158,22 @@ int
 main (int argc, char *const *argv)
 {
   static const struct GNUNET_GETOPT_CommandLineOption options[] = {
-      {'a', "all", NULL,
-          gettext_noop("Retrieve information about all defined sensors"),
-      0, &GNUNET_GETOPT_set_one, &get_all},
-      {'g', "get-sensor", NULL,
-          gettext_noop("Retrieve information about a single sensor"),
-      1, &GNUNET_GETOPT_set_string, &get_sensor},
+    {'a', "all", NULL,
+     gettext_noop ("Retrieve information about all defined sensors"),
+     0, &GNUNET_GETOPT_set_one, &get_all},
+    {'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
   };
+
   return (GNUNET_OK ==
-          GNUNET_PROGRAM_run (argc,
-                              argv,
-                              "gnunet-sensor [options [value]]",
-                              gettext_noop
-                              ("sensor"),
-                              options, &run, NULL)) ? ret : 1;
+          GNUNET_PROGRAM_run (argc, argv, "gnunet-sensor [options [value]]",
+                              gettext_noop ("sensor"), options, &run,
+                              NULL)) ? ret : 1;
 }
 
 /* end of gnunet-sensor.c */