From: Nathan S. Evans <evans@in.tum.de>
Date: Thu, 1 Apr 2010 15:51:58 +0000 (+0000)
Subject: datacache instead of datastore
X-Git-Tag: initial-import-from-subversion-38251~22326
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b2cab84e0f34bb8f885355a65deb0f19bb258693;p=oweals%2Fgnunet.git

datacache instead of datastore
---

diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index 5b323d489..f7eff755e 100644
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -29,7 +29,7 @@ gnunet_service_dht_SOURCES = \
 gnunet_service_dht_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/datastore/libgnunetdatastore.la \
+  $(top_builddir)/src/datacache/libgnunetdatacache.la \
   $(top_builddir)/src/util/libgnunetutil.la 
 
 
diff --git a/src/dht/gnunet-service-dht.c b/src/dht/gnunet-service-dht.c
index 613f610ac..b8a45e5d1 100644
--- a/src/dht/gnunet-service-dht.c
+++ b/src/dht/gnunet-service-dht.c
@@ -34,13 +34,13 @@
 #include "gnunet_core_service.h"
 #include "gnunet_signal_lib.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_datastore_service.h"
+#include "gnunet_datacache_lib.h"
 #include "dht.h"
 
 /**
- * Handle to the datastore service (for inserting/retrieving data)
+ * Handle to the datacache service (for inserting/retrieving data)
  */
-static struct GNUNET_DATASTORE_Handle *datastore;
+  struct GNUNET_DATACACHE_Handle *datacache;
 
 /**
  * The main scheduler to use for the DHT service
@@ -428,7 +428,7 @@ run (void *cls,
   sched = scheduler;
   cfg = c;
 
-  datastore = GNUNET_DATASTORE_connect(c, scheduler);
+  datacache = GNUNET_DATACACHE_create (sched, cfg, "dhtcache");
 
   client_transmit_timeout = GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 5);
   GNUNET_SERVER_add_handlers (server, plugin_handlers);