diff options
author | Nathan S. Evans <evans@in.tum.de> | 2010-04-01 15:51:58 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2010-04-01 15:51:58 +0000 |
commit | b2cab84e0f34bb8f885355a65deb0f19bb258693 (patch) | |
tree | 59fa81b74f26241ade2443761ad8bf24382f10df /src | |
parent | d816ced9a78620f055abc3c556736ee2887f1603 (diff) | |
download | gnunet-b2cab84e0f34bb8f885355a65deb0f19bb258693.tar.gz gnunet-b2cab84e0f34bb8f885355a65deb0f19bb258693.zip |
datacache instead of datastore
Diffstat (limited to 'src')
-rw-r--r-- | src/dht/Makefile.am | 2 | ||||
-rw-r--r-- | src/dht/gnunet-service-dht.c | 8 |
2 files changed, 5 insertions, 5 deletions
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 = \ | |||
29 | gnunet_service_dht_LDADD = \ | 29 | gnunet_service_dht_LDADD = \ |
30 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 30 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
31 | $(top_builddir)/src/core/libgnunetcore.la \ | 31 | $(top_builddir)/src/core/libgnunetcore.la \ |
32 | $(top_builddir)/src/datastore/libgnunetdatastore.la \ | 32 | $(top_builddir)/src/datacache/libgnunetdatacache.la \ |
33 | $(top_builddir)/src/util/libgnunetutil.la | 33 | $(top_builddir)/src/util/libgnunetutil.la |
34 | 34 | ||
35 | 35 | ||
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 @@ | |||
34 | #include "gnunet_core_service.h" | 34 | #include "gnunet_core_service.h" |
35 | #include "gnunet_signal_lib.h" | 35 | #include "gnunet_signal_lib.h" |
36 | #include "gnunet_util_lib.h" | 36 | #include "gnunet_util_lib.h" |
37 | #include "gnunet_datastore_service.h" | 37 | #include "gnunet_datacache_lib.h" |
38 | #include "dht.h" | 38 | #include "dht.h" |
39 | 39 | ||
40 | /** | 40 | /** |
41 | * Handle to the datastore service (for inserting/retrieving data) | 41 | * Handle to the datacache service (for inserting/retrieving data) |
42 | */ | 42 | */ |
43 | static struct GNUNET_DATASTORE_Handle *datastore; | 43 | struct GNUNET_DATACACHE_Handle *datacache; |
44 | 44 | ||
45 | /** | 45 | /** |
46 | * The main scheduler to use for the DHT service | 46 | * The main scheduler to use for the DHT service |
@@ -428,7 +428,7 @@ run (void *cls, | |||
428 | sched = scheduler; | 428 | sched = scheduler; |
429 | cfg = c; | 429 | cfg = c; |
430 | 430 | ||
431 | datastore = GNUNET_DATASTORE_connect(c, scheduler); | 431 | datacache = GNUNET_DATACACHE_create (sched, cfg, "dhtcache"); |
432 | 432 | ||
433 | client_transmit_timeout = GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 5); | 433 | client_transmit_timeout = GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 5); |
434 | GNUNET_SERVER_add_handlers (server, plugin_handlers); | 434 | GNUNET_SERVER_add_handlers (server, plugin_handlers); |