new sensors + fixes

16 files changed, 323 insertions, 62 deletions

diff --git a/src/peerstore/perf_peerstore_store.c b/src/peerstore/perf_peerstore_store.c
index 4f5366225..e7a8fec04 100644
--- a/src/peerstore/perf_peerstore_store.c
+++ b/src/peerstore/perf_peerstore_store.c
@@ -30,12 +30,12 @@
 
 static int ok = 1;
 
-struct GNUNET_PEERSTORE_Handle *h;
+static struct GNUNET_PEERSTORE_Handle *h;
 
-char *ss = "test_peerstore_stress";
-struct GNUNET_PeerIdentity p;
-char *k = "test_peerstore_stress_key";
-char *v = "test_peerstore_stress_val";
+static char *ss = "test_peerstore_stress";
+static struct GNUNET_PeerIdentity p;
+static char *k = "test_peerstore_stress_key";
+static char *v = "test_peerstore_stress_val";
 
 int count = 0;
 
diff --git a/src/peerstore/test_peerstore_api_iterate.c b/src/peerstore/test_peerstore_api_iterate.c
index 0655be25f..515e8f7df 100644
--- a/src/peerstore/test_peerstore_api_iterate.c
+++ b/src/peerstore/test_peerstore_api_iterate.c
@@ -28,16 +28,16 @@
 
 static int ok = 1;
 
-struct GNUNET_PEERSTORE_Handle *h;
+static struct GNUNET_PEERSTORE_Handle *h;
 
-char *ss = "test_peerstore_api_iterate";
-struct GNUNET_PeerIdentity p1;
-struct GNUNET_PeerIdentity p2;
-char *k1 = "test_peerstore_api_iterate_key1";
-char *k2 = "test_peerstore_api_iterate_key2";
-char *k3 = "test_peerstore_api_iterate_key3";
-char *val = "test_peerstore_api_iterate_val";
-int count = 0;
+static char *ss = "test_peerstore_api_iterate";
+static struct GNUNET_PeerIdentity p1;
+static struct GNUNET_PeerIdentity p2;
+static char *k1 = "test_peerstore_api_iterate_key1";
+static char *k2 = "test_peerstore_api_iterate_key2";
+static char *k3 = "test_peerstore_api_iterate_key3";
+static char *val = "test_peerstore_api_iterate_val";
+static int count = 0;
 
 static int
 iter3_cb(void *cls,
diff --git a/src/peerstore/test_peerstore_api_store.c b/src/peerstore/test_peerstore_api_store.c
index 8b3391d83..ff02ac3ab 100644
--- a/src/peerstore/test_peerstore_api_store.c
+++ b/src/peerstore/test_peerstore_api_store.c
@@ -28,14 +28,14 @@
 
 static int ok = 1;
 
-struct GNUNET_PEERSTORE_Handle *h;
-
-char *subsystem = "test_peerstore_api_store";
-struct GNUNET_PeerIdentity pid;
-char *key = "test_peerstore_api_store_key";
-char *val1 = "test_peerstore_api_store_val1";
-char *val2 = "test_peerstore_api_store_val2-";
-char *val3 = "test_peerstore_api_store_val3--";
+static struct GNUNET_PEERSTORE_Handle *h;
+
+static char *subsystem = "test_peerstore_api_store";
+static struct GNUNET_PeerIdentity pid;
+static char *key = "test_peerstore_api_store_key";
+static char *val1 = "test_peerstore_api_store_val1";
+static char *val2 = "test_peerstore_api_store_val2-";
+static char *val3 = "test_peerstore_api_store_val3--";
 
 int count = 0;
 
diff --git a/src/peerstore/test_peerstore_api_watch.c b/src/peerstore/test_peerstore_api_watch.c
index b8d0a0cce..2ab67eeb9 100644
--- a/src/peerstore/test_peerstore_api_watch.c
+++ b/src/peerstore/test_peerstore_api_watch.c
@@ -28,12 +28,12 @@
 
 static int ok = 1;
 
-struct GNUNET_PEERSTORE_Handle *h;
+static struct GNUNET_PEERSTORE_Handle *h;
 
-char *ss = "test_peerstore_api_watch";
-struct GNUNET_PeerIdentity p;
-char *k = "test_peerstore_api_watch_key";
-char *val = "test_peerstore_api_watch_val";
+static char *ss = "test_peerstore_api_watch";
+static struct GNUNET_PeerIdentity p;
+static char *k = "test_peerstore_api_watch_key";
+static char *val = "test_peerstore_api_watch_val";
 
 static int
 watch_cb(void *cls,
diff --git a/src/sensor/gnunet-sensor.c b/src/sensor/gnunet-sensor.c
index 22a854d42..fa7930832 100644
--- a/src/sensor/gnunet-sensor.c
+++ b/src/sensor/gnunet-sensor.c
@@ -42,7 +42,7 @@ static char *get_sensor;
 /*
  * Handle to sensor service
  */
-struct GNUNET_SENSOR_Handle *sensor_handle;
+static struct GNUNET_SENSOR_Handle *sensor_handle;
 
 /**
  * Run on shutdown
diff --git a/src/sensor/gnunet-service-sensor.c b/src/sensor/gnunet-service-sensor.c
index 04ba8e435..2fc882196 100644
--- a/src/sensor/gnunet-service-sensor.c
+++ b/src/sensor/gnunet-service-sensor.c
@@ -143,6 +143,13 @@ struct SensorInfo
   struct GNUNET_OS_CommandHandle *ext_cmd;
 
   /*
+   * Did we already receive a value
+   * from the currently running external
+   * proccess ? #GNUNET_YES / #GNUNET_NO
+   */
+  int ext_cmd_value_received;
+
+  /*
    * The output datatype to be expected
    */
   char *expected_datatype;
@@ -587,7 +594,7 @@ add_sensor_to_hashmap(struct SensorInfo *sensor, struct GNUNET_CONTAINER_MultiHa
     {
       GNUNET_CONTAINER_multihashmap_remove(map, &key, existing); //remove the old version
       GNUNET_free(existing);
-      GNUNET_log(GNUNET_ERROR_TYPE_INFO, _("Upgrading sensor `%s' to a newer version\n"), sensor->name);
+      GNUNET_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))
@@ -843,7 +850,6 @@ int sensor_statistics_iterator (void *cls,
   struct GNUNET_TIME_Absolute expiry;
 
   GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Received a value for sensor `%s': %" PRIu64 "\n", sensorinfo->name, value);
-  //FIXME: store first line, last line or all ??
   expiry = GNUNET_TIME_relative_to_absolute(sensorinfo->interval);
   GNUNET_PEERSTORE_store(peerstore,
       subsystem,
@@ -855,7 +861,7 @@ int sensor_statistics_iterator (void *cls,
       GNUNET_PEERSTORE_STOREOPTION_MULTIPLE,
       NULL,
       NULL);
-  return GNUNET_OK;
+  return GNUNET_SYSERR; /* We only want one value */
 }
 
 /**
@@ -874,6 +880,55 @@ void end_sensor_run_stat (void *cls, int success)
 }
 
 /**
+ * Tries to parse a received sensor value to its
+ * expected datatype
+ *
+ * @param value the string value received, should be null terminated
+ * @param sensor sensor information struct
+ * @param ret pointer to parsed value
+ * @return size of new parsed value, 0 for error
+ */
+static size_t
+parse_sensor_value (const char *value, struct SensorInfo* sensor, void **ret)
+{
+  uint64_t *ullval;
+  double *dval;
+  char *endptr;
+
+  *ret = NULL;
+  if ('\0' == *value)
+    return 0;
+  //"uint64", "double", "string"
+  if (0 == strcmp("uint64", sensor->expected_datatype))
+  {
+    ullval = GNUNET_new(uint64_t);
+    *ullval = strtoull(value, &endptr, 10);
+    if ('\0' != *endptr &&
+        '\n' != *endptr) /* Invalid string */
+      return 0;
+    *ret = ullval;
+    return sizeof(uint64_t);
+  }
+  if(0 == strcmp("double", sensor->expected_datatype))
+  {
+    dval = GNUNET_new(double);
+    *dval = strtod(value, &endptr);
+    if(value == endptr)
+      return 0;
+   *ret = dval;
+   return sizeof(double);
+  }
+  if(0 == strcmp("string", sensor->expected_datatype))
+  {
+    *ret = GNUNET_strdup(value);
+    return strlen(value) + 1;
+  }
+  GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+      _("Unknown value type expected by sensor, this should not happen.\n"));
+  return 0;
+}
+
+/**
  * Callback for output of executed sensor process
  *
  * @param cls 'struct SensorInfo *'
@@ -882,29 +937,43 @@ void end_sensor_run_stat (void *cls, int success)
 void sensor_process_callback (void *cls, const char *line)
 {
   struct SensorInfo *sensorinfo = cls;
+  void *value;
+  size_t valsize;
   struct GNUNET_TIME_Absolute expiry;
 
-  if(NULL == line) //end of output
+  if(NULL == line)
   {
     GNUNET_OS_command_stop(sensorinfo->ext_cmd);
     sensorinfo->ext_cmd = NULL;
     sensorinfo->running = GNUNET_NO;
+    sensorinfo->ext_cmd_value_received = GNUNET_NO;
     return;
   }
+  if(GNUNET_YES == sensorinfo->ext_cmd_value_received)
+    return; /* We only want one *valid* value */
   GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Received a value for sensor `%s': %s\n", sensorinfo->name, line);
-  //FIXME: store first line, last line or all ??
-  //FIXME: check and parse datatype
-  expiry = GNUNET_TIME_relative_to_absolute(sensorinfo->interval);
-  GNUNET_PEERSTORE_store(peerstore,
-      subsystem,
-      &peerid,
-      sensorinfo->name,
-      line,
-      strlen(line) + 1,
-      expiry,
-      GNUNET_PEERSTORE_STOREOPTION_MULTIPLE,
-      NULL,
-      NULL);
+  valsize = parse_sensor_value(line, sensorinfo, &value);
+  if (valsize == 0) /* invalid value, FIXME: should we disable the sensor now? */
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+        _("Received an invalid value for sensor `%s': %s\n"),
+        sensorinfo->name, line);
+  }
+  else
+  {
+    sensorinfo->ext_cmd_value_received = GNUNET_YES;
+    expiry = GNUNET_TIME_relative_to_absolute(sensorinfo->interval);
+    GNUNET_PEERSTORE_store(peerstore,
+        subsystem,
+        &peerid,
+        sensorinfo->name,
+        value,
+        valsize,
+        expiry,
+        GNUNET_PEERSTORE_STOREOPTION_MULTIPLE,
+        NULL,
+        NULL);
+  }
 }
 
 /**
@@ -967,7 +1036,7 @@ sensor_run (void *cls,
     if(GNUNET_YES == is_path(sensorinfo->ext_process))
     {
       GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-          "Sensor `%s': External process should not be a path, disabling sensor.\n",
+          _("Sensor `%s': External process should not be a path, disabling sensor.\n"),
           sensorinfo->name);
       set_sensor_enabled(sensorinfo, GNUNET_NO);
       return;
@@ -992,7 +1061,8 @@ sensor_run (void *cls,
     }
     if(GNUNET_SYSERR == check_result)
     {
-      GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Sensor `%s' process `%s' problem: binary doesn't exist or not executable\n",
+      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+          _("Sensor `%s' process `%s' problem: binary doesn't exist or not executable\n"),
           sensorinfo->name,
           sensorinfo->ext_process);
       set_sensor_enabled(sensorinfo, GNUNET_NO);
@@ -1000,6 +1070,7 @@ sensor_run (void *cls,
       GNUNET_free(process_path);
       return;
     }
+    sensorinfo->ext_cmd_value_received = GNUNET_NO;
     sensorinfo->ext_cmd = GNUNET_OS_command_run(&sensor_process_callback,
         sensorinfo,
         GNUNET_TIME_UNIT_FOREVER_REL,
@@ -1038,7 +1109,8 @@ int schedule_sensor(void *cls,
       sensorinfo->name, sensorinfo->interval.rel_value_us);
   if(GNUNET_SCHEDULER_NO_TASK != sensorinfo->execution_task)
   {
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Sensor `%s' execution task already set, this should not happen\n", sensorinfo->name);
+    GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+        _("Sensor `%s' execution task already set, this should not happen\n"), sensorinfo->name);
     return GNUNET_NO;
   }
   sensorinfo->execution_task = GNUNET_SCHEDULER_add_delayed(sensorinfo->interval, &sensor_run, sensorinfo);
diff --git a/src/sensor/sensors/averagepingrtt b/src/sensor/sensors/average-ping-rtt
index b8880c696..aaf84e0b6 100644
--- a/src/sensor/sensors/averagepingrtt
+++ b/src/sensor/sensors/average-ping-rtt
@@ -1,15 +1,15 @@
-[averagepingrtt]
+[average-ping-rtt]
 
 VERSION = 1.0
 DESCRIPTION = Calculate average ping latency to gnunet.org
-CATEGORY = Internet-Connectivity
+CATEGORY = Underlay
 ENABLED = YES
 
 # Start and end time format: %Y-%m-%d %H:%M:%S
 #START_TIME = 
 #END_TIME = 
 #Interval in seconds
-INTERVAL = 30
+INTERVAL = 60
 #LIFETIME = 
 
 #CAPABILITIES = 
diff --git a/src/sensor/sensors/averagepingrtt-files/avgping.sh b/src/sensor/sensors/averagepingrtt-files/avgping.sh
deleted file mode 100755
index 35e585b77..000000000
--- a/src/sensor/sensors/averagepingrtt-files/avgping.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-ping -c 10 gnunet.org | awk -F/ '/^rtt/ { print $5 }'
diff --git a/src/sensor/sensors/connectedpeers b/src/sensor/sensors/datacache-bytes-stored
index fcd01b097..c58bb4ea1 100644
--- a/src/sensor/sensors/connectedpeers
+++ b/src/sensor/sensors/datacache-bytes-stored
@@ -1,8 +1,8 @@
-[connectedpeers]
+[datacache-bytes-stored]
 
 VERSION = 1.0
-DESCRIPTION = Gets the number of connected peers from core
-CATEGORY = P2P-Connectivity
+DESCRIPTION = Bytes stored by GNUnet datacache service
+CATEGORY = GNUnet
 ENABLED = YES
 
 # Start and end time format: %Y-%m-%d %H:%M:%S
@@ -16,8 +16,8 @@ INTERVAL = 60
 
 SOURCE = gnunet-statistics
 
-GNUNET_STAT_SERVICE = core
-GNUNET_STAT_NAME = # peers connected
+GNUNET_STAT_SERVICE = datacache
+GNUNET_STAT_NAME = # bytes stored
 
 #EXT_PROCESS = 
 #EXT_ARGS = 
diff --git a/src/sensor/sensors/gnunetversion b/src/sensor/sensors/gnunet-version
index dd213b605..b9941f77f 100644
--- a/src/sensor/sensors/gnunetversion
+++ b/src/sensor/sensors/gnunet-version
@@ -1,15 +1,15 @@
-[gnunetversion]
+[gnunet-version]
 
 VERSION = 1.0
 DESCRIPTION = Gets gnunet version number
-CATEGORY = P2P-Software
+CATEGORY = GNUnet
 ENABLED = YES
 
 # Start and end time format: %Y-%m-%d %H:%M:%S
 #START_TIME = 
 #END_TIME = 
 #Interval in seconds
-INTERVAL = 30
+INTERVAL = 86400
 LIFETIME = 30
 
 #CAPABILITIES = 
diff --git a/src/sensor/sensors/known-peers b/src/sensor/sensors/known-peers
new file mode 100644
index 000000000..fa92bd7c7
--- /dev/null
+++ b/src/sensor/sensors/known-peers
@@ -0,0 +1,32 @@
+[known-peers]
+
+VERSION = 1.0
+DESCRIPTION = Gets the number of known peers
+CATEGORY = GNUnet
+ENABLED = YES
+
+# Start and end time format: %Y-%m-%d %H:%M:%S
+#START_TIME = 
+#END_TIME = 
+#Interval in seconds
+INTERVAL = 60
+#LIFETIME = 
+
+#CAPABILITIES = 
+
+SOURCE = gnunet-statistics
+
+GNUNET_STAT_SERVICE = peerinfo
+GNUNET_STAT_NAME = # peers known
+
+#EXT_PROCESS = 
+#EXT_ARGS = 
+
+EXPECTED_DATATYPE = uint64
+
+# Reporting mechanism
+COLLECTION_POINT = JLAPIAOB2DJA4B4I676TCOCVU0DUIRMKKUSM71BLLGCV3OHMUQ80
+COLLECTION_INTERVAL = 120
+
+P2P_REPORT = NO
+#P2P_INTERVAL = 
diff --git a/src/sensor/sensors/nse b/src/sensor/sensors/nse
new file mode 100644
index 000000000..429e80478
--- /dev/null
+++ b/src/sensor/sensors/nse
@@ -0,0 +1,32 @@
+[nse]
+
+VERSION = 1.0
+DESCRIPTION = GNUnet network size estimate
+CATEGORY = GNUnet
+ENABLED = YES
+
+# Start and end time format: %Y-%m-%d %H:%M:%S
+#START_TIME = 
+#END_TIME = 
+#Interval in seconds
+INTERVAL = 60
+#LIFETIME = 
+
+#CAPABILITIES = 
+
+SOURCE = gnunet-statistics
+
+GNUNET_STAT_SERVICE = nse
+GNUNET_STAT_NAME = # nodes in the network (estimate)
+
+#EXT_PROCESS = 
+#EXT_ARGS = 
+
+EXPECTED_DATATYPE = uint64
+
+# Reporting mechanism
+COLLECTION_POINT = JLAPIAOB2DJA4B4I676TCOCVU0DUIRMKKUSM71BLLGCV3OHMUQ80
+COLLECTION_INTERVAL = 120
+
+P2P_REPORT = NO
+#P2P_INTERVAL = 
diff --git a/src/sensor/sensors/peerstore-memory b/src/sensor/sensors/peerstore-memory
new file mode 100644
index 000000000..a75110d36
--- /dev/null
+++ b/src/sensor/sensors/peerstore-memory
@@ -0,0 +1,32 @@
+[peerstore-memory]
+
+VERSION = 1.0
+DESCRIPTION = Memory consumption of GNUnet peerstore service
+CATEGORY = GNUnet
+ENABLED = YES
+
+# Start and end time format: %Y-%m-%d %H:%M:%S
+#START_TIME = 
+#END_TIME = 
+#Interval in seconds
+INTERVAL = 60
+#LIFETIME = 
+
+#CAPABILITIES = 
+
+SOURCE = process
+
+#GNUNET_STAT_SERVICE = 
+#GNUNET_STAT_NAME = 
+
+EXT_PROCESS = peerstore-memory.sh
+#EXT_ARGS = 
+
+EXPECTED_DATATYPE = uint64
+
+# Reporting mechanism
+COLLECTION_POINT = JLAPIAOB2DJA4B4I676TCOCVU0DUIRMKKUSM71BLLGCV3OHMUQ80
+COLLECTION_INTERVAL = 7200
+
+P2P_REPORT = NO
+#P2P_INTERVAL = 
diff --git a/src/sensor/sensors/transport-bytes-received b/src/sensor/sensors/transport-bytes-received
new file mode 100644
index 000000000..014546934
--- /dev/null
+++ b/src/sensor/sensors/transport-bytes-received
@@ -0,0 +1,32 @@
+[transport-bytes-received]
+
+VERSION = 1.0
+DESCRIPTION = Number of bytes received by GNUnet transport service
+CATEGORY = GNUnet
+ENABLED = YES
+
+# Start and end time format: %Y-%m-%d %H:%M:%S
+#START_TIME = 
+#END_TIME = 
+#Interval in seconds
+INTERVAL = 60
+#LIFETIME = 
+
+#CAPABILITIES = 
+
+SOURCE = gnunet-statistics
+
+GNUNET_STAT_SERVICE = transport
+GNUNET_STAT_NAME = # bytes total received
+
+#EXT_PROCESS = 
+#EXT_ARGS = 
+
+EXPECTED_DATATYPE = uint64
+
+# Reporting mechanism
+COLLECTION_POINT = JLAPIAOB2DJA4B4I676TCOCVU0DUIRMKKUSM71BLLGCV3OHMUQ80
+COLLECTION_INTERVAL = 120
+
+P2P_REPORT = NO
+#P2P_INTERVAL = 
diff --git a/src/sensor/sensors/transport-tcp-bytes-transmitted b/src/sensor/sensors/transport-tcp-bytes-transmitted
new file mode 100644
index 000000000..43b0f572c
--- /dev/null
+++ b/src/sensor/sensors/transport-tcp-bytes-transmitted
@@ -0,0 +1,32 @@
+[transport-tcp-bytes-transmitted]
+
+VERSION = 1.0
+DESCRIPTION = Number of GNUnet transport service active TCP sessions
+CATEGORY = GNUnet
+ENABLED = YES
+
+# Start and end time format: %Y-%m-%d %H:%M:%S
+#START_TIME = 
+#END_TIME = 
+#Interval in seconds
+INTERVAL = 60
+#LIFETIME = 
+
+#CAPABILITIES = 
+
+SOURCE = gnunet-statistics
+
+GNUNET_STAT_SERVICE = transport
+GNUNET_STAT_NAME = # bytes transmitted via TCP
+
+#EXT_PROCESS = 
+#EXT_ARGS = 
+
+EXPECTED_DATATYPE = uint64
+
+# Reporting mechanism
+COLLECTION_POINT = JLAPIAOB2DJA4B4I676TCOCVU0DUIRMKKUSM71BLLGCV3OHMUQ80
+COLLECTION_INTERVAL = 120
+
+P2P_REPORT = NO
+#P2P_INTERVAL = 
diff --git a/src/sensor/sensors/transport-tcp-sessions-active b/src/sensor/sensors/transport-tcp-sessions-active
new file mode 100644
index 000000000..a0466f81a
--- /dev/null
+++ b/src/sensor/sensors/transport-tcp-sessions-active
@@ -0,0 +1,32 @@
+[transport-tcp-sessions-active]
+
+VERSION = 1.0
+DESCRIPTION = Number of GNUnet transport service active TCP sessions
+CATEGORY = GNUnet
+ENABLED = YES
+
+# Start and end time format: %Y-%m-%d %H:%M:%S
+#START_TIME = 
+#END_TIME = 
+#Interval in seconds
+INTERVAL = 60
+#LIFETIME = 
+
+#CAPABILITIES = 
+
+SOURCE = gnunet-statistics
+
+GNUNET_STAT_SERVICE = transport
+GNUNET_STAT_NAME = # TCP sessions active
+
+#EXT_PROCESS = 
+#EXT_ARGS = 
+
+EXPECTED_DATATYPE = uint64
+
+# Reporting mechanism
+COLLECTION_POINT = JLAPIAOB2DJA4B4I676TCOCVU0DUIRMKKUSM71BLLGCV3OHMUQ80
+COLLECTION_INTERVAL = 120
+
+P2P_REPORT = NO
+#P2P_INTERVAL =