datacache instead of datastore

diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index 5b323d489e59e0407ee759eeb32c3302bf8322aa..f7eff755eceff736b6336dbbaa2f66e3fc881675 100644 (file)
--- 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 613f610ac505c05c90c72f8f827009ab0514f927..b8a45e5d15d60e4bfe76e5fdee4e428d81bcf0f9 100644 (file)
--- 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);