diff options
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | po/POTFILES.in | 12 | ||||
-rw-r--r-- | src/Makefile.am | 1 | ||||
-rw-r--r-- | src/cli/Makefile.am | 1 | ||||
-rw-r--r-- | src/cli/namecache/.gitignore | 1 | ||||
-rw-r--r-- | src/cli/namecache/Makefile.am | 20 | ||||
-rw-r--r-- | src/cli/namecache/gnunet-namecache.c (renamed from src/namecache/gnunet-namecache.c) | 0 | ||||
-rw-r--r-- | src/gns/Makefile.am | 2 | ||||
-rw-r--r-- | src/namestore/Makefile.am | 10 | ||||
-rw-r--r-- | src/plugin/Makefile.am | 3 | ||||
-rw-r--r-- | src/plugin/namecache/Makefile.am (renamed from src/namecache/Makefile.am) | 64 | ||||
-rw-r--r-- | src/plugin/namecache/namecache-0001.sql (renamed from src/namecache/namecache-0001.sql) | 0 | ||||
-rw-r--r-- | src/plugin/namecache/namecache-drop.sql (renamed from src/namecache/namecache-drop.sql) | 0 | ||||
-rw-r--r-- | src/plugin/namecache/plugin_namecache_flat.c (renamed from src/namecache/plugin_namecache_flat.c) | 1 | ||||
-rw-r--r-- | src/plugin/namecache/plugin_namecache_postgres.c (renamed from src/namecache/plugin_namecache_postgres.c) | 1 | ||||
-rw-r--r-- | src/plugin/namecache/plugin_namecache_sqlite.c (renamed from src/namecache/plugin_namecache_sqlite.c) | 1 | ||||
-rw-r--r-- | src/service/Makefile.am | 1 | ||||
-rw-r--r-- | src/service/namecache/.gitignore (renamed from src/namecache/.gitignore) | 1 | ||||
-rw-r--r-- | src/service/namecache/Makefile.am | 76 | ||||
-rw-r--r-- | src/service/namecache/gnunet-service-namecache.c (renamed from src/namecache/gnunet-service-namecache.c) | 0 | ||||
-rw-r--r-- | src/service/namecache/meson.build (renamed from src/namecache/meson.build) | 0 | ||||
-rw-r--r-- | src/service/namecache/namecache.conf.in (renamed from src/namecache/namecache.conf.in) | 0 | ||||
-rw-r--r-- | src/service/namecache/namecache.h (renamed from src/namecache/namecache.h) | 0 | ||||
-rw-r--r-- | src/service/namecache/namecache_api.c (renamed from src/namecache/namecache_api.c) | 0 | ||||
-rw-r--r-- | src/service/namecache/test_namecache_api.conf (renamed from src/namecache/test_namecache_api.conf) | 0 | ||||
-rw-r--r-- | src/service/namecache/test_namecache_api_cache_block.c (renamed from src/namecache/test_namecache_api_cache_block.c) | 0 | ||||
-rw-r--r-- | src/service/namecache/test_plugin_namecache.c (renamed from src/namecache/test_plugin_namecache.c) | 0 | ||||
-rw-r--r-- | src/service/namecache/test_plugin_namecache_flat.conf (renamed from src/namecache/test_plugin_namecache_flat.conf) | 0 | ||||
-rw-r--r-- | src/service/namecache/test_plugin_namecache_postgres.conf (renamed from src/namecache/test_plugin_namecache_postgres.conf) | 0 | ||||
-rw-r--r-- | src/service/namecache/test_plugin_namecache_sqlite.conf (renamed from src/namecache/test_plugin_namecache_sqlite.conf) | 0 | ||||
-rw-r--r-- | src/zonemaster/Makefile.am | 2 |
31 files changed, 121 insertions, 82 deletions
diff --git a/configure.ac b/configure.ac index bb3868651..df0f29095 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1241,6 +1241,7 @@ src/plugin/Makefile | |||
1241 | src/plugin/block/Makefile | 1241 | src/plugin/block/Makefile |
1242 | src/plugin/dhtu/Makefile | 1242 | src/plugin/dhtu/Makefile |
1243 | src/plugin/gnsrecord/Makefile | 1243 | src/plugin/gnsrecord/Makefile |
1244 | src/plugin/namecache/Makefile | ||
1244 | src/service/Makefile | 1245 | src/service/Makefile |
1245 | src/service/arm/Makefile | 1246 | src/service/arm/Makefile |
1246 | src/service/arm/arm.conf | 1247 | src/service/arm/arm.conf |
@@ -1258,6 +1259,8 @@ src/service/dns/dns.conf | |||
1258 | src/service/hostlist/Makefile | 1259 | src/service/hostlist/Makefile |
1259 | src/service/identity/Makefile | 1260 | src/service/identity/Makefile |
1260 | src/service/identity/identity.conf | 1261 | src/service/identity/identity.conf |
1262 | src/service/namecache/Makefile | ||
1263 | src/service/namecache/namecache.conf | ||
1261 | src/service/nat/Makefile | 1264 | src/service/nat/Makefile |
1262 | src/service/nat/nat.conf | 1265 | src/service/nat/nat.conf |
1263 | src/service/nat-auto/Makefile | 1266 | src/service/nat-auto/Makefile |
@@ -1285,6 +1288,7 @@ src/cli/cadet/Makefile | |||
1285 | src/cli/core/Makefile | 1288 | src/cli/core/Makefile |
1286 | src/cli/datastore/Makefile | 1289 | src/cli/datastore/Makefile |
1287 | src/cli/dht/Makefile | 1290 | src/cli/dht/Makefile |
1291 | src/cli/namecache/Makefile | ||
1288 | src/cli/nat/Makefile | 1292 | src/cli/nat/Makefile |
1289 | src/cli/nat-auto/Makefile | 1293 | src/cli/nat-auto/Makefile |
1290 | src/cli/nse/Makefile | 1294 | src/cli/nse/Makefile |
@@ -1312,8 +1316,6 @@ src/gns/nss/Makefile | |||
1312 | src/lib/hello/Makefile | 1316 | src/lib/hello/Makefile |
1313 | src/include/Makefile | 1317 | src/include/Makefile |
1314 | src/include/gnunet_config.h | 1318 | src/include/gnunet_config.h |
1315 | src/namecache/Makefile | ||
1316 | src/namecache/namecache.conf | ||
1317 | src/namestore/Makefile | 1319 | src/namestore/Makefile |
1318 | src/namestore/namestore.conf | 1320 | src/namestore/namestore.conf |
1319 | src/pt/Makefile | 1321 | src/pt/Makefile |
diff --git a/po/POTFILES.in b/po/POTFILES.in index 9086d5edc..d34922beb 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in | |||
@@ -7,6 +7,7 @@ src/cli/dht/gnunet-dht-hello.c | |||
7 | src/cli/dht/gnunet-dht-monitor.c | 7 | src/cli/dht/gnunet-dht-monitor.c |
8 | src/cli/dht/gnunet-dht-put.c | 8 | src/cli/dht/gnunet-dht-put.c |
9 | src/cli/identity/gnunet-identity.c | 9 | src/cli/identity/gnunet-identity.c |
10 | src/cli/namecache/gnunet-namecache.c | ||
10 | src/cli/nat-auto/gnunet-nat-auto.c | 11 | src/cli/nat-auto/gnunet-nat-auto.c |
11 | src/cli/nat-auto/gnunet-nat-server.c | 12 | src/cli/nat-auto/gnunet-nat-server.c |
12 | src/cli/nat/gnunet-nat.c | 13 | src/cli/nat/gnunet-nat.c |
@@ -255,12 +256,6 @@ src/messenger/messenger_api_util.c | |||
255 | src/messenger/plugin_gnsrecord_messenger.c | 256 | src/messenger/plugin_gnsrecord_messenger.c |
256 | src/messenger/testing_messenger_barrier.c | 257 | src/messenger/testing_messenger_barrier.c |
257 | src/messenger/testing_messenger_setup.c | 258 | src/messenger/testing_messenger_setup.c |
258 | src/namecache/gnunet-namecache.c | ||
259 | src/namecache/gnunet-service-namecache.c | ||
260 | src/namecache/namecache_api.c | ||
261 | src/namecache/plugin_namecache_flat.c | ||
262 | src/namecache/plugin_namecache_postgres.c | ||
263 | src/namecache/plugin_namecache_sqlite.c | ||
264 | src/namestore/gnunet-namestore-dbtool.c | 259 | src/namestore/gnunet-namestore-dbtool.c |
265 | src/namestore/gnunet-namestore-fcfsd.c | 260 | src/namestore/gnunet-namestore-fcfsd.c |
266 | src/namestore/gnunet-namestore-zonefile.c | 261 | src/namestore/gnunet-namestore-zonefile.c |
@@ -279,6 +274,9 @@ src/plugin/dhtu/plugin_dhtu_gnunet.c | |||
279 | src/plugin/dhtu/plugin_dhtu_ip.c | 274 | src/plugin/dhtu/plugin_dhtu_ip.c |
280 | src/plugin/dhtu/testing_dhtu_cmd_send.c | 275 | src/plugin/dhtu/testing_dhtu_cmd_send.c |
281 | src/plugin/gnsrecord/plugin_gnsrecord_dns.c | 276 | src/plugin/gnsrecord/plugin_gnsrecord_dns.c |
277 | src/plugin/namecache/plugin_namecache_flat.c | ||
278 | src/plugin/namecache/plugin_namecache_postgres.c | ||
279 | src/plugin/namecache/plugin_namecache_sqlite.c | ||
282 | src/pt/gnunet-daemon-pt.c | 280 | src/pt/gnunet-daemon-pt.c |
283 | src/reclaim/did_core.c | 281 | src/reclaim/did_core.c |
284 | src/reclaim/did_helper.c | 282 | src/reclaim/did_helper.c |
@@ -381,6 +379,8 @@ src/service/identity/gnunet-service-identity.c | |||
381 | src/service/identity/identity_api.c | 379 | src/service/identity/identity_api.c |
382 | src/service/identity/identity_api_lookup.c | 380 | src/service/identity/identity_api_lookup.c |
383 | src/service/identity/identity_api_suffix_lookup.c | 381 | src/service/identity/identity_api_suffix_lookup.c |
382 | src/service/namecache/gnunet-service-namecache.c | ||
383 | src/service/namecache/namecache_api.c | ||
384 | src/service/nat-auto/gnunet-nat-auto_legacy.c | 384 | src/service/nat-auto/gnunet-nat-auto_legacy.c |
385 | src/service/nat-auto/gnunet-service-nat-auto.c | 385 | src/service/nat-auto/gnunet-service-nat-auto.c |
386 | src/service/nat-auto/gnunet-service-nat-auto_legacy.c | 386 | src/service/nat-auto/gnunet-service-nat-auto_legacy.c |
diff --git a/src/Makefile.am b/src/Makefile.am index 16eafc57b..d166fd788 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -17,7 +17,6 @@ SUBDIRS = \ | |||
17 | rest-plugin \ | 17 | rest-plugin \ |
18 | cli \ | 18 | cli \ |
19 | contrib \ | 19 | contrib \ |
20 | namecache \ | ||
21 | namestore \ | 20 | namestore \ |
22 | set \ | 21 | set \ |
23 | seti \ | 22 | seti \ |
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am index 69f440f21..0235c0a1c 100644 --- a/src/cli/Makefile.am +++ b/src/cli/Makefile.am | |||
@@ -8,4 +8,5 @@ SUBDIRS = \ | |||
8 | nse \ | 8 | nse \ |
9 | datastore \ | 9 | datastore \ |
10 | dht \ | 10 | dht \ |
11 | namecache \ | ||
11 | cadet | 12 | cadet |
diff --git a/src/cli/namecache/.gitignore b/src/cli/namecache/.gitignore new file mode 100644 index 000000000..54aa17e9f --- /dev/null +++ b/src/cli/namecache/.gitignore | |||
@@ -0,0 +1 @@ | |||
gnunet-namecache | |||
diff --git a/src/cli/namecache/Makefile.am b/src/cli/namecache/Makefile.am new file mode 100644 index 000000000..48ee216be --- /dev/null +++ b/src/cli/namecache/Makefile.am | |||
@@ -0,0 +1,20 @@ | |||
1 | # This Makefile.am is in the public domain | ||
2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include $(POSTGRESQL_CPPFLAGS) | ||
3 | |||
4 | plugindir = $(libdir)/gnunet | ||
5 | |||
6 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
7 | |||
8 | libexecdir= $(pkglibdir)/libexec/ | ||
9 | |||
10 | bin_PROGRAMS = \ | ||
11 | gnunet-namecache | ||
12 | |||
13 | gnunet_namecache_SOURCES = \ | ||
14 | gnunet-namecache.c | ||
15 | gnunet_namecache_LDADD = \ | ||
16 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | ||
17 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | ||
18 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | ||
19 | $(top_builddir)/src/service/namecache/libgnunetnamecache.la \ | ||
20 | $(GN_LIBINTL) | ||
diff --git a/src/namecache/gnunet-namecache.c b/src/cli/namecache/gnunet-namecache.c index 0236609aa..0236609aa 100644 --- a/src/namecache/gnunet-namecache.c +++ b/src/cli/namecache/gnunet-namecache.c | |||
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am index 4a84f914f..379d6697a 100644 --- a/src/gns/Makefile.am +++ b/src/gns/Makefile.am | |||
@@ -205,7 +205,7 @@ gnunet_service_gns_LDADD = \ | |||
205 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 205 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
206 | $(top_builddir)/src/service/dns/libgnunetdns.la \ | 206 | $(top_builddir)/src/service/dns/libgnunetdns.la \ |
207 | $(top_builddir)/src/service/dht/libgnunetdht.la \ | 207 | $(top_builddir)/src/service/dht/libgnunetdht.la \ |
208 | $(top_builddir)/src/namecache/libgnunetnamecache.la \ | 208 | $(top_builddir)/src/service/namecache/libgnunetnamecache.la \ |
209 | $(LIBIDN) $(LIBIDN2) \ | 209 | $(LIBIDN) $(LIBIDN2) \ |
210 | $(GN_LIBINTL) | 210 | $(GN_LIBINTL) |
211 | 211 | ||
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am index 3dbec4a25..685829cc2 100644 --- a/src/namestore/Makefile.am +++ b/src/namestore/Makefile.am | |||
@@ -186,7 +186,7 @@ gnunet_namestore_fcfsd_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) | |||
186 | gnunet_service_namestore_SOURCES = \ | 186 | gnunet_service_namestore_SOURCES = \ |
187 | gnunet-service-namestore.c | 187 | gnunet-service-namestore.c |
188 | gnunet_service_namestore_LDADD = \ | 188 | gnunet_service_namestore_LDADD = \ |
189 | $(top_builddir)/src/namecache/libgnunetnamecache.la \ | 189 | $(top_builddir)/src/service/namecache/libgnunetnamecache.la \ |
190 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 190 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
191 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 191 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
192 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ | 192 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
@@ -245,7 +245,7 @@ test_namestore_api_store_update_sqlite_LDADD = \ | |||
245 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 245 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
246 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 246 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
247 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 247 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
248 | $(top_builddir)/src/namecache/libgnunetnamecache.la \ | 248 | $(top_builddir)/src/service/namecache/libgnunetnamecache.la \ |
249 | libgnunetnamestore.la | 249 | libgnunetnamestore.la |
250 | 250 | ||
251 | test_namestore_api_store_update_postgres_SOURCES = \ | 251 | test_namestore_api_store_update_postgres_SOURCES = \ |
@@ -255,7 +255,7 @@ test_namestore_api_store_update_postgres_LDADD = \ | |||
255 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 255 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
256 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 256 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
257 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 257 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
258 | $(top_builddir)/src/namecache/libgnunetnamecache.la \ | 258 | $(top_builddir)/src/service/namecache/libgnunetnamecache.la \ |
259 | libgnunetnamestore.la | 259 | libgnunetnamestore.la |
260 | 260 | ||
261 | test_namestore_api_lookup_nick_sqlite_SOURCES = \ | 261 | test_namestore_api_lookup_nick_sqlite_SOURCES = \ |
@@ -265,7 +265,7 @@ test_namestore_api_lookup_nick_sqlite_LDADD = \ | |||
265 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 265 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
266 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 266 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
267 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 267 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
268 | $(top_builddir)/src/namecache/libgnunetnamecache.la \ | 268 | $(top_builddir)/src/service/namecache/libgnunetnamecache.la \ |
269 | libgnunetnamestore.la | 269 | libgnunetnamestore.la |
270 | 270 | ||
271 | test_namestore_api_lookup_nick_postgres_SOURCES = \ | 271 | test_namestore_api_lookup_nick_postgres_SOURCES = \ |
@@ -275,7 +275,7 @@ test_namestore_api_lookup_nick_postgres_LDADD = \ | |||
275 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 275 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
276 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 276 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
277 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 277 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
278 | $(top_builddir)/src/namecache/libgnunetnamecache.la \ | 278 | $(top_builddir)/src/service/namecache/libgnunetnamecache.la \ |
279 | libgnunetnamestore.la | 279 | libgnunetnamestore.la |
280 | 280 | ||
281 | test_namestore_api_remove_sqlite_SOURCES = \ | 281 | test_namestore_api_remove_sqlite_SOURCES = \ |
diff --git a/src/plugin/Makefile.am b/src/plugin/Makefile.am index 891777369..2939d3379 100644 --- a/src/plugin/Makefile.am +++ b/src/plugin/Makefile.am | |||
@@ -1,4 +1,5 @@ | |||
1 | SUBDIRS = \ | 1 | SUBDIRS = \ |
2 | block \ | 2 | block \ |
3 | gnsrecord \ | 3 | gnsrecord \ |
4 | dhtu | 4 | dhtu \ |
5 | namecache | ||
diff --git a/src/namecache/Makefile.am b/src/plugin/namecache/Makefile.am index 36e70813a..ac2e2592b 100644 --- a/src/namecache/Makefile.am +++ b/src/plugin/namecache/Makefile.am | |||
@@ -7,9 +7,6 @@ pkgcfgdir= $(pkgdatadir)/config.d/ | |||
7 | 7 | ||
8 | libexecdir= $(pkglibdir)/libexec/ | 8 | libexecdir= $(pkglibdir)/libexec/ |
9 | 9 | ||
10 | pkgcfg_DATA = \ | ||
11 | namecache.conf | ||
12 | |||
13 | sqldir = $(prefix)/share/gnunet/sql/ | 10 | sqldir = $(prefix)/share/gnunet/sql/ |
14 | 11 | ||
15 | sql_DATA = \ | 12 | sql_DATA = \ |
@@ -55,50 +52,6 @@ TESTS = \ | |||
55 | $(check_PROGRAMS) | 52 | $(check_PROGRAMS) |
56 | endif | 53 | endif |
57 | 54 | ||
58 | lib_LTLIBRARIES = \ | ||
59 | libgnunetnamecache.la | ||
60 | |||
61 | |||
62 | libgnunetnamecache_la_SOURCES = \ | ||
63 | namecache_api.c \ | ||
64 | namecache.h | ||
65 | libgnunetnamecache_la_LIBADD = \ | ||
66 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | ||
67 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | ||
68 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | ||
69 | $(GN_LIBINTL) | ||
70 | libgnunetnamecache_la_LDFLAGS = \ | ||
71 | $(GN_LIB_LDFLAGS) \ | ||
72 | -version-info 0:0:0 | ||
73 | |||
74 | |||
75 | libexec_PROGRAMS = \ | ||
76 | gnunet-service-namecache | ||
77 | |||
78 | bin_PROGRAMS = \ | ||
79 | gnunet-namecache | ||
80 | |||
81 | gnunet_namecache_SOURCES = \ | ||
82 | gnunet-namecache.c | ||
83 | gnunet_namecache_LDADD = \ | ||
84 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | ||
85 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | ||
86 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | ||
87 | libgnunetnamecache.la \ | ||
88 | $(GN_LIBINTL) | ||
89 | |||
90 | gnunet_service_namecache_SOURCES = \ | ||
91 | gnunet-service-namecache.c | ||
92 | |||
93 | gnunet_service_namecache_LDADD = \ | ||
94 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | ||
95 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | ||
96 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ | ||
97 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | ||
98 | libgnunetnamecache.la \ | ||
99 | $(GN_LIBINTL) | ||
100 | |||
101 | |||
102 | plugin_LTLIBRARIES = \ | 55 | plugin_LTLIBRARIES = \ |
103 | $(SQLITE_PLUGIN) \ | 56 | $(SQLITE_PLUGIN) \ |
104 | $(FLAT_PLUGIN) \ | 57 | $(FLAT_PLUGIN) \ |
@@ -107,7 +60,7 @@ plugin_LTLIBRARIES = \ | |||
107 | libgnunet_plugin_namecache_flat_la_SOURCES = \ | 60 | libgnunet_plugin_namecache_flat_la_SOURCES = \ |
108 | plugin_namecache_flat.c | 61 | plugin_namecache_flat.c |
109 | libgnunet_plugin_namecache_flat_la_LIBADD = \ | 62 | libgnunet_plugin_namecache_flat_la_LIBADD = \ |
110 | libgnunetnamecache.la \ | 63 | $(top_builddir)/src/service/namecache/libgnunetnamecache.la \ |
111 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ | 64 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
112 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 65 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
113 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 66 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
@@ -119,7 +72,7 @@ libgnunet_plugin_namecache_flat_la_LDFLAGS = \ | |||
119 | libgnunet_plugin_namecache_sqlite_la_SOURCES = \ | 72 | libgnunet_plugin_namecache_sqlite_la_SOURCES = \ |
120 | plugin_namecache_sqlite.c | 73 | plugin_namecache_sqlite.c |
121 | libgnunet_plugin_namecache_sqlite_la_LIBADD = \ | 74 | libgnunet_plugin_namecache_sqlite_la_LIBADD = \ |
122 | libgnunetnamecache.la \ | 75 | $(top_builddir)/src/service/namecache/libgnunetnamecache.la \ |
123 | $(top_builddir)/src/lib/sq/libgnunetsq.la \ | 76 | $(top_builddir)/src/lib/sq/libgnunetsq.la \ |
124 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ | 77 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
125 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 78 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
@@ -133,7 +86,7 @@ libgnunet_plugin_namecache_sqlite_la_LDFLAGS = \ | |||
133 | libgnunet_plugin_namecache_postgres_la_SOURCES = \ | 86 | libgnunet_plugin_namecache_postgres_la_SOURCES = \ |
134 | plugin_namecache_postgres.c | 87 | plugin_namecache_postgres.c |
135 | libgnunet_plugin_namecache_postgres_la_LIBADD = \ | 88 | libgnunet_plugin_namecache_postgres_la_LIBADD = \ |
136 | libgnunetnamecache.la \ | 89 | $(top_builddir)/src/service/namecache/libgnunetnamecache.la \ |
137 | $(top_builddir)/src/lib/pq/libgnunetpq.la \ | 90 | $(top_builddir)/src/lib/pq/libgnunetpq.la \ |
138 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ | 91 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
139 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 92 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
@@ -143,16 +96,6 @@ libgnunet_plugin_namecache_postgres_la_LIBADD = \ | |||
143 | libgnunet_plugin_namecache_postgres_la_LDFLAGS = \ | 96 | libgnunet_plugin_namecache_postgres_la_LDFLAGS = \ |
144 | $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS) | 97 | $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS) |
145 | 98 | ||
146 | test_namecache_api_cache_block_SOURCES = \ | ||
147 | test_namecache_api_cache_block.c | ||
148 | test_namecache_api_cache_block_LDADD = \ | ||
149 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | ||
150 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | ||
151 | libgnunetnamecache.la \ | ||
152 | $(top_builddir)/src/service/testing/libgnunettesting.la \ | ||
153 | $(top_builddir)/src/lib/util/libgnunetutil.la | ||
154 | |||
155 | |||
156 | test_plugin_namecache_flat_SOURCES = \ | 99 | test_plugin_namecache_flat_SOURCES = \ |
157 | test_plugin_namecache.c | 100 | test_plugin_namecache.c |
158 | test_plugin_namecache_flat_LDADD = \ | 101 | test_plugin_namecache_flat_LDADD = \ |
@@ -172,7 +115,6 @@ test_plugin_namecache_postgres_LDADD = \ | |||
172 | $(top_builddir)/src/lib/util/libgnunetutil.la | 115 | $(top_builddir)/src/lib/util/libgnunetutil.la |
173 | 116 | ||
174 | EXTRA_DIST = \ | 117 | EXTRA_DIST = \ |
175 | test_namecache_api.conf \ | ||
176 | test_plugin_namecache_sqlite.conf \ | 118 | test_plugin_namecache_sqlite.conf \ |
177 | test_plugin_namecache_postgres.conf \ | 119 | test_plugin_namecache_postgres.conf \ |
178 | test_plugin_namecache_flat.conf \ | 120 | test_plugin_namecache_flat.conf \ |
diff --git a/src/namecache/namecache-0001.sql b/src/plugin/namecache/namecache-0001.sql index 8509b078f..8509b078f 100644 --- a/src/namecache/namecache-0001.sql +++ b/src/plugin/namecache/namecache-0001.sql | |||
diff --git a/src/namecache/namecache-drop.sql b/src/plugin/namecache/namecache-drop.sql index 197ee78c1..197ee78c1 100644 --- a/src/namecache/namecache-drop.sql +++ b/src/plugin/namecache/namecache-drop.sql | |||
diff --git a/src/namecache/plugin_namecache_flat.c b/src/plugin/namecache/plugin_namecache_flat.c index eb7800051..ba118bf02 100644 --- a/src/namecache/plugin_namecache_flat.c +++ b/src/plugin/namecache/plugin_namecache_flat.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include "gnunet_namecache_plugin.h" | 28 | #include "gnunet_namecache_plugin.h" |
29 | #include "gnunet_namecache_service.h" | 29 | #include "gnunet_namecache_service.h" |
30 | #include "gnunet_gnsrecord_lib.h" | 30 | #include "gnunet_gnsrecord_lib.h" |
31 | #include "namecache.h" | ||
32 | 31 | ||
33 | /** | 32 | /** |
34 | * Context for all functions in this plugin. | 33 | * Context for all functions in this plugin. |
diff --git a/src/namecache/plugin_namecache_postgres.c b/src/plugin/namecache/plugin_namecache_postgres.c index cdbe248b6..7e2925d1a 100644 --- a/src/namecache/plugin_namecache_postgres.c +++ b/src/plugin/namecache/plugin_namecache_postgres.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include "gnunet_namecache_service.h" | 28 | #include "gnunet_namecache_service.h" |
29 | #include "gnunet_gnsrecord_lib.h" | 29 | #include "gnunet_gnsrecord_lib.h" |
30 | #include "gnunet_pq_lib.h" | 30 | #include "gnunet_pq_lib.h" |
31 | #include "namecache.h" | ||
32 | 31 | ||
33 | 32 | ||
34 | #define LOG(kind, ...) GNUNET_log_from (kind, "namecache-postgres", __VA_ARGS__) | 33 | #define LOG(kind, ...) GNUNET_log_from (kind, "namecache-postgres", __VA_ARGS__) |
diff --git a/src/namecache/plugin_namecache_sqlite.c b/src/plugin/namecache/plugin_namecache_sqlite.c index 2271d1db5..d8b485381 100644 --- a/src/namecache/plugin_namecache_sqlite.c +++ b/src/plugin/namecache/plugin_namecache_sqlite.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include "gnunet_namecache_plugin.h" | 28 | #include "gnunet_namecache_plugin.h" |
29 | #include "gnunet_namecache_service.h" | 29 | #include "gnunet_namecache_service.h" |
30 | #include "gnunet_gnsrecord_lib.h" | 30 | #include "gnunet_gnsrecord_lib.h" |
31 | #include "namecache.h" | ||
32 | #include <sqlite3.h> | 31 | #include <sqlite3.h> |
33 | 32 | ||
34 | /** | 33 | /** |
diff --git a/src/service/Makefile.am b/src/service/Makefile.am index 45b24a4a2..02148d0c7 100644 --- a/src/service/Makefile.am +++ b/src/service/Makefile.am | |||
@@ -17,5 +17,6 @@ SUBDIRS = \ | |||
17 | datacache \ | 17 | datacache \ |
18 | datastore \ | 18 | datastore \ |
19 | dht \ | 19 | dht \ |
20 | namecache \ | ||
20 | regex \ | 21 | regex \ |
21 | cadet | 22 | cadet |
diff --git a/src/namecache/.gitignore b/src/service/namecache/.gitignore index 2abc07dfb..280bf9f39 100644 --- a/src/namecache/.gitignore +++ b/src/service/namecache/.gitignore | |||
@@ -1,5 +1,4 @@ | |||
1 | gnunet-service-namecache | 1 | gnunet-service-namecache |
2 | gnunet-namecache | ||
3 | test_namecache_api_cache_block | 2 | test_namecache_api_cache_block |
4 | test_plugin_namecache_postgres | 3 | test_plugin_namecache_postgres |
5 | test_plugin_namecache_sqlite | 4 | test_plugin_namecache_sqlite |
diff --git a/src/service/namecache/Makefile.am b/src/service/namecache/Makefile.am new file mode 100644 index 000000000..78e9eb48c --- /dev/null +++ b/src/service/namecache/Makefile.am | |||
@@ -0,0 +1,76 @@ | |||
1 | # This Makefile.am is in the public domain | ||
2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include $(POSTGRESQL_CPPFLAGS) | ||
3 | |||
4 | plugindir = $(libdir)/gnunet | ||
5 | |||
6 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
7 | |||
8 | libexecdir= $(pkglibdir)/libexec/ | ||
9 | |||
10 | pkgcfg_DATA = \ | ||
11 | namecache.conf | ||
12 | |||
13 | if USE_COVERAGE | ||
14 | AM_CFLAGS = --coverage -O0 | ||
15 | XLIBS = -lgcov | ||
16 | endif | ||
17 | |||
18 | # testcases do not even build yet; thus: experimental! | ||
19 | TESTING_TESTS = \ | ||
20 | test_namecache_api_cache_block | ||
21 | |||
22 | if HAVE_SQLITE | ||
23 | check_PROGRAMS = \ | ||
24 | $(TESTING_TESTS) | ||
25 | endif | ||
26 | |||
27 | if ENABLE_TEST_RUN | ||
28 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; | ||
29 | TESTS = \ | ||
30 | $(check_PROGRAMS) | ||
31 | endif | ||
32 | |||
33 | lib_LTLIBRARIES = \ | ||
34 | libgnunetnamecache.la | ||
35 | |||
36 | |||
37 | libgnunetnamecache_la_SOURCES = \ | ||
38 | namecache_api.c \ | ||
39 | namecache.h | ||
40 | libgnunetnamecache_la_LIBADD = \ | ||
41 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | ||
42 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | ||
43 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | ||
44 | $(GN_LIBINTL) | ||
45 | libgnunetnamecache_la_LDFLAGS = \ | ||
46 | $(GN_LIB_LDFLAGS) \ | ||
47 | -version-info 0:0:0 | ||
48 | |||
49 | |||
50 | libexec_PROGRAMS = \ | ||
51 | gnunet-service-namecache | ||
52 | |||
53 | gnunet_service_namecache_SOURCES = \ | ||
54 | gnunet-service-namecache.c | ||
55 | |||
56 | gnunet_service_namecache_LDADD = \ | ||
57 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | ||
58 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | ||
59 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ | ||
60 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | ||
61 | libgnunetnamecache.la \ | ||
62 | $(GN_LIBINTL) | ||
63 | |||
64 | |||
65 | test_namecache_api_cache_block_SOURCES = \ | ||
66 | test_namecache_api_cache_block.c | ||
67 | test_namecache_api_cache_block_LDADD = \ | ||
68 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | ||
69 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | ||
70 | libgnunetnamecache.la \ | ||
71 | $(top_builddir)/src/service/testing/libgnunettesting.la \ | ||
72 | $(top_builddir)/src/lib/util/libgnunetutil.la | ||
73 | |||
74 | |||
75 | EXTRA_DIST = \ | ||
76 | test_namecache_api.conf | ||
diff --git a/src/namecache/gnunet-service-namecache.c b/src/service/namecache/gnunet-service-namecache.c index dce843801..dce843801 100644 --- a/src/namecache/gnunet-service-namecache.c +++ b/src/service/namecache/gnunet-service-namecache.c | |||
diff --git a/src/namecache/meson.build b/src/service/namecache/meson.build index ee6988a99..ee6988a99 100644 --- a/src/namecache/meson.build +++ b/src/service/namecache/meson.build | |||
diff --git a/src/namecache/namecache.conf.in b/src/service/namecache/namecache.conf.in index 6bf75454b..6bf75454b 100644 --- a/src/namecache/namecache.conf.in +++ b/src/service/namecache/namecache.conf.in | |||
diff --git a/src/namecache/namecache.h b/src/service/namecache/namecache.h index cb4d1bcdd..cb4d1bcdd 100644 --- a/src/namecache/namecache.h +++ b/src/service/namecache/namecache.h | |||
diff --git a/src/namecache/namecache_api.c b/src/service/namecache/namecache_api.c index fb4b0e304..fb4b0e304 100644 --- a/src/namecache/namecache_api.c +++ b/src/service/namecache/namecache_api.c | |||
diff --git a/src/namecache/test_namecache_api.conf b/src/service/namecache/test_namecache_api.conf index b1ae31f14..b1ae31f14 100644 --- a/src/namecache/test_namecache_api.conf +++ b/src/service/namecache/test_namecache_api.conf | |||
diff --git a/src/namecache/test_namecache_api_cache_block.c b/src/service/namecache/test_namecache_api_cache_block.c index 3a18a72e1..3a18a72e1 100644 --- a/src/namecache/test_namecache_api_cache_block.c +++ b/src/service/namecache/test_namecache_api_cache_block.c | |||
diff --git a/src/namecache/test_plugin_namecache.c b/src/service/namecache/test_plugin_namecache.c index 141698a23..141698a23 100644 --- a/src/namecache/test_plugin_namecache.c +++ b/src/service/namecache/test_plugin_namecache.c | |||
diff --git a/src/namecache/test_plugin_namecache_flat.conf b/src/service/namecache/test_plugin_namecache_flat.conf index efe77e37a..efe77e37a 100644 --- a/src/namecache/test_plugin_namecache_flat.conf +++ b/src/service/namecache/test_plugin_namecache_flat.conf | |||
diff --git a/src/namecache/test_plugin_namecache_postgres.conf b/src/service/namecache/test_plugin_namecache_postgres.conf index 8473857d5..8473857d5 100644 --- a/src/namecache/test_plugin_namecache_postgres.conf +++ b/src/service/namecache/test_plugin_namecache_postgres.conf | |||
diff --git a/src/namecache/test_plugin_namecache_sqlite.conf b/src/service/namecache/test_plugin_namecache_sqlite.conf index 24eecd286..24eecd286 100644 --- a/src/namecache/test_plugin_namecache_sqlite.conf +++ b/src/service/namecache/test_plugin_namecache_sqlite.conf | |||
diff --git a/src/zonemaster/Makefile.am b/src/zonemaster/Makefile.am index 1c0d882d6..8f4e74588 100644 --- a/src/zonemaster/Makefile.am +++ b/src/zonemaster/Makefile.am | |||
@@ -27,6 +27,6 @@ gnunet_service_zonemaster_LDADD = \ | |||
27 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ | 27 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
28 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 28 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
29 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 29 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
30 | $(top_builddir)/src/namecache/libgnunetnamecache.la \ | 30 | $(top_builddir)/src/service/namecache/libgnunetnamecache.la \ |
31 | $(GN_LIBINTL) \ | 31 | $(GN_LIBINTL) \ |
32 | -lpthread | 32 | -lpthread |