[GNUnet-SVN] r34007 - in gnunet/src: include sensor

[gnunet]

Author: otarabai
Date: 2014-07-22 13:56:36 +0200 (Tue, 22 Jul 2014)
New Revision: 34007

Added:
   gnunet/src/sensor/gnunet-service-sensor-update.c
Modified:
   gnunet/src/include/gnunet_applications.h
   gnunet/src/sensor/Makefile.am
   gnunet/src/sensor/gnunet-service-sensor.c
   gnunet/src/sensor/sensor.conf.in
   gnunet/src/sensor/sensor.h
Log:
towards sensor update functionality


Modified: gnunet/src/include/gnunet_applications.h
===================================================================
--- gnunet/src/include/gnunet_applications.h    2014-07-22 02:54:12 UTC (rev 
34006)
+++ gnunet/src/include/gnunet_applications.h    2014-07-22 11:56:36 UTC (rev 
34007)
@@ -106,7 +106,12 @@
  */
 #define GNUNET_APPLICATION_TYPE_SENSORDASHBOARD 24
 
+/**
+ * Application offering sensor updates
+ */
+#define GNUNET_APPLICATION_TYPE_SENSORUPDATE 25
 
+
 #if 0                           /* keep Emacsens' auto-indent happy */
 {
 #endif

Modified: gnunet/src/sensor/Makefile.am
===================================================================
--- gnunet/src/sensor/Makefile.am       2014-07-22 02:54:12 UTC (rev 34006)
+++ gnunet/src/sensor/Makefile.am       2014-07-22 11:56:36 UTC (rev 34007)
@@ -37,7 +37,8 @@
 gnunet_service_sensor_SOURCES = \
  gnunet-service-sensor.c \
  gnunet-service-sensor-analysis.c \
- gnunet-service-sensor-reporting.c
+ gnunet-service-sensor-reporting.c \
+ gnunet-service-sensor-update.c
 gnunet_service_sensor_LDADD = \
   libgnunetsensorutil.la \
   $(top_builddir)/src/util/libgnunetutil.la \

Added: gnunet/src/sensor/gnunet-service-sensor-update.c
===================================================================
--- gnunet/src/sensor/gnunet-service-sensor-update.c                            
(rev 0)
+++ gnunet/src/sensor/gnunet-service-sensor-update.c    2014-07-22 11:56:36 UTC 
(rev 34007)
@@ -0,0 +1,333 @@
+/*
+     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-update.c
+ * @brief sensor service update functionality
+ * @author Omar Tarabai
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "sensor.h"
+#include "gnunet_cadet_service.h"
+#include "gnunet_sensor_model_plugin.h"
+#include "gnunet_applications.h"
+
+#define LOG(kind,...) GNUNET_log_from (kind, "sensor-update",__VA_ARGS__)
+
+/**
+ * Interval at which to contact update points for new sensor updates.
+ */
+//#define SENSOR_UPDATE_CHECK_INTERVAL GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_DAYS, 1)
+
+/**
+ * When connecting to update points fail, retry after...
+ */
+//#define SENSOR_UPDATE_RETRY GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_MINUTES, 5)
+
+
+/**
+ * Sensors update point
+ */
+struct UpdatePoint
+{
+
+  /**
+   * DLL
+   */
+  struct UpdatePoint *prev;
+
+  /**
+   * DLL
+   */
+  struct UpdatePoint *next;
+
+  /**
+   * Identity of peer running update point
+   */
+  struct GNUNET_PeerIdentity peer_id;
+
+  /**
+   * CADET channel to update point
+   */
+  struct GNUNET_CADET_Channel *ch;
+
+  /**
+   * CADET transmit handle for a sensor list request.
+   */
+  struct GNUNET_CADET_TransmitHandle *sensor_list_req_th;
+
+};
+
+
+/**
+ * Our configuration.
+ */
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+/**
+ * Head of update points DLL.
+ */
+static struct UpdatePoint *up_head;
+
+/**
+ * Tail of update points DLL.
+ */
+static struct UpdatePoint *up_tail;
+
+/**
+ * The current default update point to use.
+ */
+static struct UpdatePoint *up_default;
+
+/**
+ * Handle to CADET service
+ */
+static struct GNUNET_CADET_Handle *cadet;
+
+
+/**
+ * Cleanup update point context. This does not destroy the struct itself.
+ *
+ * @param up UpdatePoint struct
+ */
+static void
+cleanup_updatepoint (struct UpdatePoint *up)
+{
+  if (NULL != up->sensor_list_req_th)
+  {
+    GNUNET_CADET_notify_transmit_ready_cancel (up->sensor_list_req_th);
+    up->sensor_list_req_th = NULL;
+  }
+  if (NULL != up->ch)
+  {
+    GNUNET_CADET_channel_destroy (up->ch);
+    up->ch = NULL;
+  }
+}
+
+
+/**
+ * Stop the sensor update module.
+ */
+void
+SENSOR_update_stop ()
+{
+  struct UpdatePoint *up;
+
+  up = up_head;
+  while (NULL != up)
+  {
+    GNUNET_CONTAINER_DLL_remove (up_head, up_tail, up);
+    cleanup_updatepoint (up);
+    GNUNET_free (up);
+    up = up_head;
+  }
+  if (NULL != cadet)
+  {
+    GNUNET_CADET_disconnect (cadet);
+    cadet = NULL;
+  }
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Sensor update module stopped.\n");
+}
+
+
+/**
+ * A failure occured in connecting/retrieval/verification with current default
+ * update point. This method will try to find another update point, do cleanup
+ * and reschedule update check.
+ */
+static void
+fail ()
+{
+  cleanup_updatepoint (up_default);
+  //TODO:
+}
+
+
+/**
+ * Function called to notify a client about the connection begin ready
+ * to queue more data.  @a buf will be NULL and @a size zero if the
+ * connection was closed for writing in the meantime.
+ *
+ * Writes the sensor list request to be sent to the update point.
+ *
+ * @param cls closure (unused)
+ * @param size number of bytes available in @a buf
+ * @param buf where the callee should write the message
+ * @return number of bytes written to @a buf
+ */
+static size_t
+do_send_sensor_list_req (void *cls, size_t size, void *buf)
+{
+  up_default->sensor_list_req_th = NULL;
+  //TODO
+
+  return 0; //FIXME
+}
+
+
+/**
+ * Contact update points to check for new updates
+ *
+ * @param cls unused
+ * @param tc GNUnet scheduler task context
+ */
+static void
+check_for_updates (void *cls,
+                   const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+    return;
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Checking for sensor updates.\n");
+  GNUNET_assert (NULL != up_default);
+  up_default->ch =
+      GNUNET_CADET_channel_create (cadet,
+                                   up_default,
+                                   &up_default->peer_id,
+                                   GNUNET_APPLICATION_TYPE_SENSORUPDATE,
+                                   GNUNET_CADET_OPTION_DEFAULT);
+  if (NULL == up_default->ch)
+  {
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         _("Failed to connect to update point `%s'.\n"),
+         GNUNET_i2s (&up_default->peer_id));
+    fail ();
+    return;
+  }
+  /* Start by requesting list of sensors available from update point */
+  up_default->sensor_list_req_th =
+      GNUNET_CADET_notify_transmit_ready (up_default->ch,
+                                          GNUNET_YES,
+                                          GNUNET_TIME_UNIT_FOREVER_REL,
+                                          sizeof (struct GNUNET_MessageHeader),
+                                          &do_send_sensor_list_req, NULL);
+  //TODO
+}
+
+
+/**
+ * Function that reads and validates (correctness not connectivity) of 
available
+ * sensor update points.
+ *
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
+ */
+static int
+load_update_points ()
+{
+  char *points_list;
+  int points_list_len;
+  int i;
+  int start;
+  int len;
+  struct GNUNET_CRYPTO_EddsaPublicKey public_key;
+  struct UpdatePoint *up;
+
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg,
+                                                          "sensor",
+                                                          "UPDATE_POINTS",
+                                                          &points_list))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               "sensor",
+                               "UPDATE_POINTS");
+    return GNUNET_SYSERR;
+  }
+  points_list_len = strlen (points_list) + 1;
+  for (i = 0; i < points_list_len; i ++)
+  {
+    if (' ' == points_list[i])
+      continue;
+    start = i;
+    len = 0;
+    while (' ' != points_list[i] && '\0' != points_list[i])
+    {
+      len ++;
+      i ++;
+    }
+    if (GNUNET_OK !=
+        GNUNET_CRYPTO_eddsa_public_key_from_string (points_list + start,
+                                                    len,
+                                                    &public_key))
+    {
+      LOG (GNUNET_ERROR_TYPE_ERROR,
+           "Invalid EDDSA public key `%.*s' for update point.\n",
+           len, points_list + len);
+      continue;
+    }
+    up = GNUNET_new (struct UpdatePoint);
+    up->peer_id.public_key = public_key;
+    up->ch = NULL;
+    up->sensor_list_req_th = NULL;
+    GNUNET_CONTAINER_DLL_insert (up_head, up_tail, up);
+    LOG (GNUNET_ERROR_TYPE_DEBUG,
+         "Loaded update point `%s'.\n",
+         GNUNET_i2s_full (&up->peer_id));
+  }
+  return (NULL == up_head) ? GNUNET_SYSERR : GNUNET_OK;
+}
+
+
+/**
+ * Start the sensor update module
+ *
+ * @param c our service configuration
+ * @param sensors multihashmap of loaded sensors
+ * @return #GNUNET_OK if started successfully, #GNUNET_SYSERR otherwise
+ */
+int
+SENSOR_update_start (const struct GNUNET_CONFIGURATION_Handle *c,
+                     struct GNUNET_CONTAINER_MultiHashMap *sensors)
+{
+  static struct GNUNET_CADET_MessageHandler cadet_handlers[] = {
+      {NULL, 0, 0}
+  };
+
+  GNUNET_assert(NULL != sensors);
+  cfg = c;
+  cadet = GNUNET_CADET_connect(cfg,
+                               NULL,
+                               NULL,
+                               NULL,
+                               cadet_handlers,
+                               NULL);
+  if (NULL == cadet)
+  {
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         _("Failed to connect to CADET service.\n"));
+    SENSOR_update_stop ();
+    return GNUNET_SYSERR;
+  }
+  if (GNUNET_OK != load_update_points ())
+  {
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         "Failed to load update points.\n");
+    return GNUNET_SYSERR;
+  }
+  up_default = up_head;
+  GNUNET_SCHEDULER_add_now (&check_for_updates, NULL);
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Sensor update module started.\n");
+  return GNUNET_OK;
+}
+
+/* end of gnunet-service-sensor-update.c */

Modified: gnunet/src/sensor/gnunet-service-sensor.c
===================================================================
--- gnunet/src/sensor/gnunet-service-sensor.c   2014-07-22 02:54:12 UTC (rev 
34006)
+++ gnunet/src/sensor/gnunet-service-sensor.c   2014-07-22 11:56:36 UTC (rev 
34007)
@@ -89,6 +89,7 @@
 shutdown_task (void *cls,
               const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
+  SENSOR_update_stop ();
   SENSOR_reporting_stop();
   SENSOR_analysis_stop();
   GNUNET_SENSOR_destroy_sensors (sensors);
@@ -99,7 +100,7 @@
   }
   if(NULL != peerstore)
   {
-    GNUNET_PEERSTORE_disconnect(peerstore, GNUNET_YES); /*FIXME: merge into a 
global peerstore connection */
+    GNUNET_PEERSTORE_disconnect(peerstore, GNUNET_YES);
     peerstore = NULL;
   }
   GNUNET_SCHEDULER_shutdown();
@@ -588,6 +589,7 @@
   schedule_all_sensors();
   SENSOR_analysis_start(c, sensors);
   SENSOR_reporting_start(c, sensors);
+  SENSOR_update_start (c, sensors);
   statistics = GNUNET_STATISTICS_create("sensor", cfg);
   GNUNET_CRYPTO_get_peer_identity(cfg, &peerid);
   peerstore = GNUNET_PEERSTORE_connect(cfg);

Modified: gnunet/src/sensor/sensor.conf.in
===================================================================
--- gnunet/src/sensor/sensor.conf.in    2014-07-22 02:54:12 UTC (rev 34006)
+++ gnunet/src/sensor/sensor.conf.in    2014-07-22 11:56:36 UTC (rev 34007)
@@ -5,6 +5,9 @@
 UNIX_MATCH_UID = NO
 UNIX_MATCH_GID = YES
 
+# Space separated list of trusted peers running update points
+UPDATE_POINTS = NCEKA096482PC84GFTG61EHAVXY3BQDTPB5FANATQD5CDADJ2HP0
+
 [sensor-analysis]
 model = gaussian
 

Modified: gnunet/src/sensor/sensor.h
===================================================================
--- gnunet/src/sensor/sensor.h  2014-07-22 02:54:12 UTC (rev 34006)
+++ gnunet/src/sensor/sensor.h  2014-07-22 11:56:36 UTC (rev 34007)
@@ -94,3 +94,21 @@
 int
 SENSOR_reporting_start(const struct GNUNET_CONFIGURATION_Handle *c,
     struct GNUNET_CONTAINER_MultiHashMap *sensors);
+
+/**
+ * Stop the sensor update module
+ */
+void
+SENSOR_update_stop ();
+
+/**
+ * Start the sensor update module
+ *
+ * @param c our service configuration
+ * @param sensors multihashmap of loaded sensors
+ * @return #GNUNET_OK if started successfully, #GNUNET_SYSERR otherwise
+ */
+int
+SENSOR_update_start (const struct GNUNET_CONFIGURATION_Handle *c,
+                     struct GNUNET_CONTAINER_MultiHashMap *sensors);
+