[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33938 - gnunet/src/sensordashboard
From: |
gnunet |
Subject: |
[GNUnet-SVN] r33938 - gnunet/src/sensordashboard |
Date: |
Mon, 7 Jul 2014 16:47:37 +0200 |
Author: otarabai
Date: 2014-07-07 16:47:37 +0200 (Mon, 07 Jul 2014)
New Revision: 33938
Modified:
gnunet/src/sensordashboard/Makefile.am
gnunet/src/sensordashboard/gnunet-service-sensordashboard.c
Log:
sensordashboard: received data stored in peerstore
Modified: gnunet/src/sensordashboard/Makefile.am
===================================================================
--- gnunet/src/sensordashboard/Makefile.am 2014-07-07 10:43:24 UTC (rev
33937)
+++ gnunet/src/sensordashboard/Makefile.am 2014-07-07 14:47:37 UTC (rev
33938)
@@ -33,6 +33,7 @@
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/cadet/libgnunetcadet.la \
$(top_builddir)/src/sensor/libgnunetsensorutil.la \
+ $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
$(GN_LIBINTL)
Modified: gnunet/src/sensordashboard/gnunet-service-sensordashboard.c
===================================================================
--- gnunet/src/sensordashboard/gnunet-service-sensordashboard.c 2014-07-07
10:43:24 UTC (rev 33937)
+++ gnunet/src/sensordashboard/gnunet-service-sensordashboard.c 2014-07-07
14:47:37 UTC (rev 33938)
@@ -30,15 +30,29 @@
#include "sensordashboard.h"
#include "gnunet_cadet_service.h"
#include "gnunet_sensor_util_lib.h"
+#include "gnunet_peerstore_service.h"
/**
* Handle to CADET service
*/
static struct GNUNET_CADET_Handle *cadet;
+/**
+ * Global hashmap of defined sensors
+ */
static struct GNUNET_CONTAINER_MultiHashMap *sensors;
/**
+ * Handle to the peerstore service connection
+ */
+static struct GNUNET_PEERSTORE_Handle *peerstore;
+
+/**
+ * Name of this subsystem to be used for peerstore operations
+ */
+static char *subsystem = "sensordashboard";
+
+/**
* Task run during shutdown.
*
* @param cls unused
@@ -52,6 +66,11 @@
GNUNET_CADET_disconnect(cadet);
cadet = NULL;
}
+ if (NULL != peerstore)
+ {
+ GNUNET_PEERSTORE_disconnect (peerstore);
+ peerstore = NULL;
+ }
GNUNET_SENSOR_destroy_sensors (sensors);
GNUNET_SCHEDULER_shutdown();
}
@@ -143,6 +162,9 @@
reading->sensor->name,
reading->timestamp,
reading->value_size);
+ GNUNET_PEERSTORE_store (peerstore, subsystem, peer, reading->sensor->name,
+ reading->value, reading->value_size, GNUNET_TIME_UNIT_FOREVER_ABS,
+ GNUNET_PEERSTORE_STOREOPTION_MULTIPLE, NULL, NULL);
GNUNET_free (reading->value);
GNUNET_free (reading);
return GNUNET_OK;
@@ -181,10 +203,18 @@
if(NULL == cadet)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to connect to CADET service.\n"));
+ _("Failed to connect to `%s' service.\n"), "CADET");
GNUNET_SCHEDULER_add_now (&cleanup_task, NULL);
return;
}
+ peerstore = GNUNET_PEERSTORE_connect (cfg);
+ if (NULL == peerstore)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Failed to connect to `%s' service.\n"), "PEERSTORE");
+ GNUNET_SCHEDULER_add_now (&cleanup_task, NULL);
+ return;
+ }
GNUNET_SERVER_add_handlers (server, handlers);
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &cleanup_task,
NULL);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33938 - gnunet/src/sensordashboard,
gnunet <=