[GNUnet-SVN] r10744 - gnunet/src/dht

[gnunet]

Author: nevans
Date: 2010-04-01 17:51:58 +0200 (Thu, 01 Apr 2010)
New Revision: 10744

Modified:
   gnunet/src/dht/Makefile.am
   gnunet/src/dht/gnunet-service-dht.c
Log:
datacache instead of datastore

Modified: gnunet/src/dht/Makefile.am
===================================================================
--- gnunet/src/dht/Makefile.am  2010-04-01 15:51:38 UTC (rev 10743)
+++ gnunet/src/dht/Makefile.am  2010-04-01 15:51:58 UTC (rev 10744)
@@ -29,7 +29,7 @@
 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 
 
 

Modified: gnunet/src/dht/gnunet-service-dht.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht.c 2010-04-01 15:51:38 UTC (rev 10743)
+++ gnunet/src/dht/gnunet-service-dht.c 2010-04-01 15:51:58 UTC (rev 10744)
@@ -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 @@
   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);