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

[gnunet]

Author: otarabai
Date: 2014-04-14 14:16:18 +0200 (Mon, 14 Apr 2014)
New Revision: 33062

Added:
   gnunet/src/include/gnunet_sensor_service.h
Modified:
   gnunet/src/include/gnunet_protocols.h
   gnunet/src/sensor/gnunet-sensor.c
   gnunet/src/sensor/gnunet-service-sensor.c
   gnunet/src/sensor/sensor_api.c
   gnunet/src/sensor/test_sensor_api.c
Log:
SENSOR service integration


Modified: gnunet/src/include/gnunet_protocols.h
===================================================================
--- gnunet/src/include/gnunet_protocols.h       2014-04-14 12:08:48 UTC (rev 
33061)
+++ gnunet/src/include/gnunet_protocols.h       2014-04-14 12:16:18 UTC (rev 
33062)
@@ -2407,13 +2407,37 @@
 #define GNUNET_MESSAGE_TYPE_SECRETSHARING_CLIENT_SECRET_READY 783
 
 
+/*******************************************************************************
+ * SENSOR message types
+ 
******************************************************************************/
 
 /**
- * Next available: 800
+ * Request information about all sensors
  */
+#define GNUNET_MESSAGE_TYPE_SENSOR_GETALL 800
 
+/**
+ * Request information about one sensor
+ */
+#define GNUNET_MESSAGE_TYPE_SENSOR_GET 801
 
+/**
+ * Message carrying sensor information
+ */
+#define GNUNET_MESSAGE_TYPE_SENSOR_INFO 802
 
+/**
+ * End of an iteration sequence
+ */
+#define GNUNET_MESSAGE_TYPE_SENSOR_END 803
+
+
+/**
+ * Next available: 830
+ */
+
+
+
 
/*******************************************************************************
  * SOCIAL message types
  
******************************************************************************/

Added: gnunet/src/include/gnunet_sensor_service.h
===================================================================
--- gnunet/src/include/gnunet_sensor_service.h                          (rev 0)
+++ gnunet/src/include/gnunet_sensor_service.h  2014-04-14 12:16:18 UTC (rev 
33062)
@@ -0,0 +1,111 @@
+/*
+      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 include/gnunet_sensor_service.h
+ * @brief API to the sensor service
+ * @author Omar Tarabai
+ */
+#ifndef GNUNET_SENSOR_SERVICE_H
+#define GNUNET_SENSOR_SERVICE_H
+
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_util_lib.h>
+#include "gnunet_protocols_mi.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#if 0                           /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
+
+/**
+ * Handle to the sensor service.
+ */
+struct GNUNET_SENSOR_Handle;
+
+/**
+ * Structure containing brief info about sensor
+ */
+struct SensorInfoShort
+{
+
+  /*
+   * Sensor name
+   */
+  char *name;
+
+  /*
+   * First part of version number
+   */
+  uint16_t version_major;
+
+  /*
+   * Second part of version number
+   */
+  uint16_t version_minor;
+
+  /*
+   * Sensor description
+   */
+  char *description;
+
+};
+
+/**
+ * Type of an iterator over sensor definitions.
+ *
+ * @param cls closure
+ * @param hello hello message for the peer (can be NULL)
+ * @param error message
+ */
+typedef void (*GNUNET_SENSOR_SensorIteratorCB) (void *cls,
+                                             const struct SensorInfoShort 
*sensor,
+                                             const char *err_msg);
+
+/**
+ * Continuation called with a status result.
+ *
+ * @param cls closure
+ * @param emsg error message, NULL on success
+ */
+typedef void (*GNUNET_SENSOR_Continuation)(void *cls,
+               const char *emsg);
+
+/**
+ * Connect to the sensor service.
+ *
+ * @return NULL on error
+ */
+struct GNUNET_SENSOR_Handle *
+GNUNET_SENSOR_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
+
+
+#if 0                           /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+#endif

Modified: gnunet/src/sensor/gnunet-sensor.c
===================================================================
--- gnunet/src/sensor/gnunet-sensor.c   2014-04-14 12:08:48 UTC (rev 33061)
+++ gnunet/src/sensor/gnunet-sensor.c   2014-04-14 12:16:18 UTC (rev 33062)
@@ -23,8 +23,8 @@
  * @brief sensor tool
  * @author Omar Tarabai
  */
-#include <gnunet/platform.h>
-#include <gnunet/gnunet_util_lib.h>
+#include "platform.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_sensor_service.h"
 
 static int ret;

Modified: gnunet/src/sensor/gnunet-service-sensor.c
===================================================================
--- gnunet/src/sensor/gnunet-service-sensor.c   2014-04-14 12:08:48 UTC (rev 
33061)
+++ gnunet/src/sensor/gnunet-service-sensor.c   2014-04-14 12:16:18 UTC (rev 
33062)
@@ -23,8 +23,8 @@
  * @brief sensor service implementation
  * @author Christian Grothoff
  */
-#include <gnunet/platform.h>
-#include <gnunet/gnunet_util_lib.h>
+#include "platform.h"
+#include "gnunet_util_lib.h"
 #include "sensor.h"
 
 /**

Modified: gnunet/src/sensor/sensor_api.c
===================================================================
--- gnunet/src/sensor/sensor_api.c      2014-04-14 12:08:48 UTC (rev 33061)
+++ gnunet/src/sensor/sensor_api.c      2014-04-14 12:16:18 UTC (rev 33062)
@@ -23,8 +23,8 @@
  * @brief API for sensor
  * @author Omar Tarabai
  */
-#include <gnunet/platform.h>
-#include <gnunet/gnunet_util_lib.h>
+#include "platform.h"
+#include "gnunet_util_lib.h"
 #include "sensor.h"
 
 #define LOG(kind,...) GNUNET_log_from (kind, "sensor-api",__VA_ARGS__)

Modified: gnunet/src/sensor/test_sensor_api.c
===================================================================
--- gnunet/src/sensor/test_sensor_api.c 2014-04-14 12:08:48 UTC (rev 33061)
+++ gnunet/src/sensor/test_sensor_api.c 2014-04-14 12:16:18 UTC (rev 33062)
@@ -21,8 +21,8 @@
  * @file sensor/test_sensor_api.c
  * @brief testcase for sensor_api.c
  */
-#include <gnunet/platform.h>
-#include <gnunet/gnunet_util_lib.h>
+#include "platform.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_sensor_service.h"