diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/cli/Makefile.am | 1 | ||||
-rw-r--r-- | src/cli/gns/.gitignore | 2 | ||||
-rw-r--r-- | src/cli/gns/Makefile.am | 98 | ||||
-rw-r--r-- | src/cli/gns/gnunet-gns-proxy-ca.template (renamed from src/gns/gnunet-gns-proxy-ca.template) | 0 | ||||
-rw-r--r-- | src/cli/gns/gnunet-gns-proxy-setup-ca.in (renamed from src/gns/gnunet-gns-proxy-setup-ca.in) | 0 | ||||
-rw-r--r-- | src/cli/gns/gnunet-gns.c (renamed from src/gns/gnunet-gns.c) | 0 | ||||
-rwxr-xr-x | src/cli/gns/test_dns2gns.sh (renamed from src/gns/test_dns2gns.sh) | 0 | ||||
-rwxr-xr-x | src/cli/gns/test_gns_at_lookup.sh (renamed from src/gns/test_gns_at_lookup.sh) | 0 | ||||
-rwxr-xr-x | src/cli/gns/test_gns_caa_lookup.sh (renamed from src/gns/test_gns_caa_lookup.sh) | 0 | ||||
-rwxr-xr-x | src/cli/gns/test_gns_config_lookup.sh (renamed from src/gns/test_gns_config_lookup.sh) | 0 | ||||
-rwxr-xr-x | src/cli/gns/test_gns_delegated_lookup.sh (renamed from src/gns/test_gns_delegated_lookup.sh) | 0 | ||||
-rwxr-xr-x | src/cli/gns/test_gns_dht_lookup.sh (renamed from src/gns/test_gns_dht_lookup.sh) | 0 | ||||
-rwxr-xr-x | src/cli/gns/test_gns_gns2dns_cname_lookup.sh (renamed from src/gns/test_gns_gns2dns_cname_lookup.sh) | 0 | ||||
-rwxr-xr-x | src/cli/gns/test_gns_gns2dns_lookup.sh (renamed from src/gns/test_gns_gns2dns_lookup.sh) | 0 | ||||
-rwxr-xr-x | src/cli/gns/test_gns_gns2dns_zkey_lookup.sh (renamed from src/gns/test_gns_gns2dns_zkey_lookup.sh) | 0 | ||||
-rwxr-xr-x | src/cli/gns/test_gns_ipv6_lookup.sh (renamed from src/gns/test_gns_ipv6_lookup.sh) | 0 | ||||
-rwxr-xr-x | src/cli/gns/test_gns_lookup.sh (renamed from src/gns/test_gns_lookup.sh) | 0 | ||||
-rwxr-xr-x | src/cli/gns/test_gns_multiple_record_lookup.sh (renamed from src/gns/test_gns_multiple_record_lookup.sh) | 0 | ||||
-rwxr-xr-x | src/cli/gns/test_gns_mx_lookup.sh (renamed from src/gns/test_gns_mx_lookup.sh) | 0 | ||||
-rwxr-xr-x | src/cli/gns/test_gns_quickupdate.sh (renamed from src/gns/test_gns_quickupdate.sh) | 0 | ||||
-rwxr-xr-x | src/cli/gns/test_gns_redirect_lookup.sh (renamed from src/gns/test_gns_redirect_lookup.sh) | 0 | ||||
-rwxr-xr-x | src/cli/gns/test_gns_rel_expiration.sh (renamed from src/gns/test_gns_rel_expiration.sh) | 0 | ||||
-rwxr-xr-x | src/cli/gns/test_gns_revocation.sh (renamed from src/gns/test_gns_revocation.sh) | 0 | ||||
-rwxr-xr-x | src/cli/gns/test_gns_soa_lookup.sh (renamed from src/gns/test_gns_soa_lookup.sh) | 0 | ||||
-rwxr-xr-x | src/cli/gns/test_gns_txt_lookup.sh (renamed from src/gns/test_gns_txt_lookup.sh) | 0 | ||||
-rwxr-xr-x | src/cli/gns/test_gns_zkey_lookup.sh (renamed from src/gns/test_gns_zkey_lookup.sh) | 0 | ||||
-rw-r--r-- | src/contrib/service/abd/Makefile.am | 2 | ||||
-rw-r--r-- | src/conversation/Makefile.am | 4 | ||||
-rw-r--r-- | src/plugin/Makefile.am | 3 | ||||
-rw-r--r-- | src/plugin/gns/Makefile.am | 61 | ||||
-rw-r--r-- | src/plugin/gns/plugin_block_gns.c (renamed from src/gns/plugin_block_gns.c) | 0 | ||||
-rw-r--r-- | src/plugin/gns/plugin_gnsrecord_gns.c (renamed from src/gns/plugin_gnsrecord_gns.c) | 0 | ||||
-rw-r--r-- | src/reclaim/Makefile.am | 10 | ||||
-rw-r--r-- | src/rest-plugin/Makefile.am | 3 | ||||
-rw-r--r-- | src/rest-plugin/gns/Makefile.am | 61 | ||||
-rw-r--r-- | src/rest-plugin/gns/plugin_rest_gns.c (renamed from src/gns/plugin_rest_gns.c) | 0 | ||||
-rwxr-xr-x | src/rest-plugin/gns/test_plugin_rest_gns.sh (renamed from src/gns/test_plugin_rest_gns.sh) | 0 | ||||
-rw-r--r-- | src/service/Makefile.am | 4 | ||||
-rw-r--r-- | src/service/gns/.gitignore (renamed from src/gns/.gitignore) | 0 | ||||
-rw-r--r-- | src/service/gns/Makefile.am (renamed from src/gns/Makefile.am) | 130 | ||||
-rw-r--r-- | src/service/gns/gns.conf.in (renamed from src/gns/gns.conf.in) | 0 | ||||
-rw-r--r-- | src/service/gns/gns.h (renamed from src/gns/gns.h) | 0 | ||||
-rw-r--r-- | src/service/gns/gns_api.c (renamed from src/gns/gns_api.c) | 0 | ||||
-rw-r--r-- | src/service/gns/gns_api.h (renamed from src/gns/gns_api.h) | 0 | ||||
-rw-r--r-- | src/service/gns/gns_tld_api.c (renamed from src/gns/gns_tld_api.c) | 0 | ||||
-rw-r--r-- | src/service/gns/gnunet-bcd.c (renamed from src/gns/gnunet-bcd.c) | 0 | ||||
-rw-r--r-- | src/service/gns/gnunet-dns2gns.c (renamed from src/gns/gnunet-dns2gns.c) | 0 | ||||
-rw-r--r-- | src/service/gns/gnunet-gns-benchmark.c (renamed from src/gns/gnunet-gns-benchmark.c) | 0 | ||||
-rw-r--r-- | src/service/gns/gnunet-gns-import.c (renamed from src/gns/gnunet-gns-import.c) | 0 | ||||
-rw-r--r-- | src/service/gns/gnunet-gns-proxy.c (renamed from src/gns/gnunet-gns-proxy.c) | 0 | ||||
-rw-r--r-- | src/service/gns/gnunet-service-gns.c (renamed from src/gns/gnunet-service-gns.c) | 0 | ||||
-rw-r--r-- | src/service/gns/gnunet-service-gns.h (renamed from src/gns/gnunet-service-gns.h) | 0 | ||||
-rw-r--r-- | src/service/gns/gnunet-service-gns_interceptor.c (renamed from src/gns/gnunet-service-gns_interceptor.c) | 0 | ||||
-rw-r--r-- | src/service/gns/gnunet-service-gns_interceptor.h (renamed from src/gns/gnunet-service-gns_interceptor.h) | 0 | ||||
-rw-r--r-- | src/service/gns/gnunet-service-gns_resolver.c (renamed from src/gns/gnunet-service-gns_resolver.c) | 0 | ||||
-rw-r--r-- | src/service/gns/gnunet-service-gns_resolver.h (renamed from src/gns/gnunet-service-gns_resolver.h) | 0 | ||||
-rw-r--r-- | src/service/gns/gnunet_w32nsp_lib.h (renamed from src/gns/gnunet_w32nsp_lib.h) | 0 | ||||
-rw-r--r-- | src/service/gns/meson.build (renamed from src/gns/meson.build) | 0 | ||||
-rw-r--r-- | src/service/gns/nss/Makefile.am (renamed from src/gns/nss/Makefile.am) | 0 | ||||
-rw-r--r-- | src/service/gns/nss/map-file (renamed from src/gns/nss/map-file) | 0 | ||||
-rw-r--r-- | src/service/gns/nss/meson.build (renamed from src/gns/nss/meson.build) | 0 | ||||
-rw-r--r-- | src/service/gns/nss/nss_gns.c (renamed from src/gns/nss/nss_gns.c) | 0 | ||||
-rw-r--r-- | src/service/gns/nss/nss_gns_query.c (renamed from src/gns/nss/nss_gns_query.c) | 0 | ||||
-rw-r--r-- | src/service/gns/nss/nss_gns_query.h (renamed from src/gns/nss/nss_gns_query.h) | 0 | ||||
-rw-r--r-- | src/service/gns/openssl.cnf (renamed from src/gns/openssl.cnf) | 0 | ||||
-rw-r--r-- | src/service/gns/test_dns2gns.conf (renamed from src/gns/test_dns2gns.conf) | 0 | ||||
-rw-r--r-- | src/service/gns/test_gns_defaults.conf (renamed from src/gns/test_gns_defaults.conf) | 0 | ||||
-rw-r--r-- | src/service/gns/test_gns_lookup.conf (renamed from src/gns/test_gns_lookup.conf) | 0 | ||||
-rw-r--r-- | src/service/gns/test_gns_lookup_peer1.conf (renamed from src/gns/test_gns_lookup_peer1.conf) | 0 | ||||
-rw-r--r-- | src/service/gns/test_gns_lookup_peer2.conf (renamed from src/gns/test_gns_lookup_peer2.conf) | 0 | ||||
-rw-r--r-- | src/service/gns/test_gns_proxy.c (renamed from src/gns/test_gns_proxy.c) | 0 | ||||
-rw-r--r-- | src/service/gns/test_gns_proxy.conf (renamed from src/gns/test_gns_proxy.conf) | 0 | ||||
-rw-r--r-- | src/service/gns/test_gns_simple_lookup.conf (renamed from src/gns/test_gns_simple_lookup.conf) | 0 | ||||
-rwxr-xr-x | src/service/gns/test_gnunet_gns.sh.in (renamed from src/gns/test_gnunet_gns.sh.in) | 0 | ||||
-rwxr-xr-x | src/service/gns/test_proxy.sh (renamed from src/gns/test_proxy.sh) | 0 | ||||
-rw-r--r-- | src/service/gns/tlds.conf (renamed from src/gns/tlds.conf) | 0 | ||||
-rw-r--r-- | src/service/gns/w32resolver.h (renamed from src/gns/w32resolver.h) | 0 | ||||
-rw-r--r-- | src/service/gns/zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey (renamed from src/gns/zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey) | bin | 827 -> 827 bytes | |||
-rw-r--r-- | src/service/gns/zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey (renamed from src/gns/zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey) | bin | 826 -> 826 bytes | |||
-rw-r--r-- | src/service/gns/zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey (renamed from src/gns/zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey) | bin | 826 -> 826 bytes | |||
-rw-r--r-- | src/service/gns/zonefiles/test_zonekey (renamed from src/gns/zonefiles/test_zonekey) | bin | 827 -> 827 bytes | |||
-rw-r--r-- | src/service/testing/.gitignore | 1 | ||||
-rw-r--r-- | src/service/zonemaster/.gitignore (renamed from src/zonemaster/.gitignore) | 0 | ||||
-rw-r--r-- | src/service/zonemaster/Makefile.am (renamed from src/zonemaster/Makefile.am) | 0 | ||||
-rw-r--r-- | src/service/zonemaster/gnunet-service-zonemaster.c (renamed from src/zonemaster/gnunet-service-zonemaster.c) | 0 | ||||
-rw-r--r-- | src/service/zonemaster/meson.build (renamed from src/zonemaster/meson.build) | 0 | ||||
-rw-r--r-- | src/service/zonemaster/zonemaster.conf.in (renamed from src/zonemaster/zonemaster.conf.in) | 0 |
88 files changed, 241 insertions, 141 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index f55c535bf..3cc409f31 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -17,8 +17,6 @@ SUBDIRS = \ | |||
17 | rest-plugin \ | 17 | rest-plugin \ |
18 | cli \ | 18 | cli \ |
19 | contrib \ | 19 | contrib \ |
20 | gns \ | ||
21 | zonemaster \ | ||
22 | $(CONVERSATION_DIR) \ | 20 | $(CONVERSATION_DIR) \ |
23 | fs \ | 21 | fs \ |
24 | exit \ | 22 | exit \ |
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am index c7682bb36..e968c0bce 100644 --- a/src/cli/Makefile.am +++ b/src/cli/Makefile.am | |||
@@ -12,4 +12,5 @@ SUBDIRS = \ | |||
12 | namestore \ | 12 | namestore \ |
13 | revocation \ | 13 | revocation \ |
14 | vpn \ | 14 | vpn \ |
15 | gns \ | ||
15 | cadet | 16 | cadet |
diff --git a/src/cli/gns/.gitignore b/src/cli/gns/.gitignore new file mode 100644 index 000000000..23bd1d13b --- /dev/null +++ b/src/cli/gns/.gitignore | |||
@@ -0,0 +1,2 @@ | |||
1 | gnunet-gns | ||
2 | gnunet-gns-proxy-setup-ca | ||
diff --git a/src/cli/gns/Makefile.am b/src/cli/gns/Makefile.am new file mode 100644 index 000000000..0b41fbb19 --- /dev/null +++ b/src/cli/gns/Makefile.am | |||
@@ -0,0 +1,98 @@ | |||
1 | # This Makefile.am is in the public domain | ||
2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include | ||
3 | |||
4 | pkgdata_DATA = \ | ||
5 | gnunet-gns-proxy-ca.template | ||
6 | |||
7 | if USE_COVERAGE | ||
8 | AM_CFLAGS = --coverage -O0 | ||
9 | endif | ||
10 | |||
11 | pkgcfgdir = $(pkgdatadir)/config.d/ | ||
12 | |||
13 | libexecdir= $(pkglibdir)/libexec/ | ||
14 | |||
15 | plugindir = $(libdir)/gnunet | ||
16 | |||
17 | bin_PROGRAMS = \ | ||
18 | gnunet-gns | ||
19 | |||
20 | bin_SCRIPTS = \ | ||
21 | gnunet-gns-proxy-setup-ca | ||
22 | |||
23 | gnunet-gns-proxy-setup-ca: gnunet-gns-proxy-setup-ca.in Makefile | ||
24 | $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/gnunet-gns-proxy-setup-ca.in > gnunet-gns-proxy-setup-ca | ||
25 | @chmod +x gnunet-gns-proxy-setup-ca | ||
26 | |||
27 | test_gnunet_gns.sh: test_gnunet_gns.sh.in Makefile | ||
28 | $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/test_gnunet_gns.sh.in > test_gnunet_gns.sh | ||
29 | @chmod +x test_gnunet_gns.sh | ||
30 | |||
31 | CLEANFILES = test_gnunet_gns.sh | ||
32 | |||
33 | gnunet_gns_SOURCES = \ | ||
34 | gnunet-gns.c | ||
35 | gnunet_gns_LDADD = \ | ||
36 | $(top_builddir)/src/service/gns/libgnunetgns.la \ | ||
37 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | ||
38 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | ||
39 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | ||
40 | $(LIBIDN) $(LIBIDN2) \ | ||
41 | $(GN_LIBINTL) | ||
42 | |||
43 | check_SCRIPTS = \ | ||
44 | test_gns_lookup.sh \ | ||
45 | test_gns_config_lookup.sh \ | ||
46 | test_gns_ipv6_lookup.sh\ | ||
47 | test_gns_txt_lookup.sh\ | ||
48 | test_gns_caa_lookup.sh\ | ||
49 | test_gns_mx_lookup.sh \ | ||
50 | test_gns_gns2dns_lookup.sh \ | ||
51 | test_gns_gns2dns_zkey_lookup.sh \ | ||
52 | test_gns_gns2dns_cname_lookup.sh \ | ||
53 | test_gns_dht_lookup.sh\ | ||
54 | test_gns_delegated_lookup.sh \ | ||
55 | test_gns_at_lookup.sh\ | ||
56 | test_gns_zkey_lookup.sh\ | ||
57 | test_gns_rel_expiration.sh\ | ||
58 | test_gns_soa_lookup.sh\ | ||
59 | test_gns_revocation.sh\ | ||
60 | test_gns_redirect_lookup.sh | ||
61 | |||
62 | EXTRA_DIST = \ | ||
63 | test_gns_defaults.conf \ | ||
64 | test_gns_lookup.conf \ | ||
65 | test_gns_proxy.conf \ | ||
66 | test_gns_simple_lookup.conf \ | ||
67 | openssl.cnf \ | ||
68 | gnunet-gns-proxy-setup-ca.in \ | ||
69 | zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey \ | ||
70 | zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey \ | ||
71 | zonefiles/test_zonekey \ | ||
72 | test_gns_lookup.sh \ | ||
73 | test_gns_config_lookup.sh \ | ||
74 | test_gns_ipv6_lookup.sh\ | ||
75 | test_gns_txt_lookup.sh\ | ||
76 | test_gns_caa_lookup.sh\ | ||
77 | test_gns_mx_lookup.sh \ | ||
78 | test_gns_gns2dns_lookup.sh \ | ||
79 | test_gns_gns2dns_zkey_lookup.sh \ | ||
80 | test_gns_gns2dns_cname_lookup.sh \ | ||
81 | test_gns_dht_lookup.sh\ | ||
82 | test_gns_delegated_lookup.sh \ | ||
83 | test_gns_at_lookup.sh\ | ||
84 | test_gns_zkey_lookup.sh\ | ||
85 | test_gns_rel_expiration.sh\ | ||
86 | test_gns_soa_lookup.sh\ | ||
87 | test_gns_revocation.sh\ | ||
88 | test_gns_redirect_lookup.sh\ | ||
89 | test_proxy.sh\ | ||
90 | $(pkgdata_DATA) \ | ||
91 | test_gnunet_gns.sh.in | ||
92 | |||
93 | if ENABLE_TEST_RUN | ||
94 | if HAVE_SQLITE | ||
95 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; | ||
96 | TESTS = $(check_SCRIPTS) | ||
97 | endif | ||
98 | endif | ||
diff --git a/src/gns/gnunet-gns-proxy-ca.template b/src/cli/gns/gnunet-gns-proxy-ca.template index b1a0d16fd..b1a0d16fd 100644 --- a/src/gns/gnunet-gns-proxy-ca.template +++ b/src/cli/gns/gnunet-gns-proxy-ca.template | |||
diff --git a/src/gns/gnunet-gns-proxy-setup-ca.in b/src/cli/gns/gnunet-gns-proxy-setup-ca.in index b3ebfd11d..b3ebfd11d 100644 --- a/src/gns/gnunet-gns-proxy-setup-ca.in +++ b/src/cli/gns/gnunet-gns-proxy-setup-ca.in | |||
diff --git a/src/gns/gnunet-gns.c b/src/cli/gns/gnunet-gns.c index c71676a08..c71676a08 100644 --- a/src/gns/gnunet-gns.c +++ b/src/cli/gns/gnunet-gns.c | |||
diff --git a/src/gns/test_dns2gns.sh b/src/cli/gns/test_dns2gns.sh index 295bcc766..295bcc766 100755 --- a/src/gns/test_dns2gns.sh +++ b/src/cli/gns/test_dns2gns.sh | |||
diff --git a/src/gns/test_gns_at_lookup.sh b/src/cli/gns/test_gns_at_lookup.sh index 6a2c958de..6a2c958de 100755 --- a/src/gns/test_gns_at_lookup.sh +++ b/src/cli/gns/test_gns_at_lookup.sh | |||
diff --git a/src/gns/test_gns_caa_lookup.sh b/src/cli/gns/test_gns_caa_lookup.sh index fb488f47b..fb488f47b 100755 --- a/src/gns/test_gns_caa_lookup.sh +++ b/src/cli/gns/test_gns_caa_lookup.sh | |||
diff --git a/src/gns/test_gns_config_lookup.sh b/src/cli/gns/test_gns_config_lookup.sh index bda08f87b..bda08f87b 100755 --- a/src/gns/test_gns_config_lookup.sh +++ b/src/cli/gns/test_gns_config_lookup.sh | |||
diff --git a/src/gns/test_gns_delegated_lookup.sh b/src/cli/gns/test_gns_delegated_lookup.sh index 5105abdb5..5105abdb5 100755 --- a/src/gns/test_gns_delegated_lookup.sh +++ b/src/cli/gns/test_gns_delegated_lookup.sh | |||
diff --git a/src/gns/test_gns_dht_lookup.sh b/src/cli/gns/test_gns_dht_lookup.sh index da87d8477..da87d8477 100755 --- a/src/gns/test_gns_dht_lookup.sh +++ b/src/cli/gns/test_gns_dht_lookup.sh | |||
diff --git a/src/gns/test_gns_gns2dns_cname_lookup.sh b/src/cli/gns/test_gns_gns2dns_cname_lookup.sh index c33c9d132..c33c9d132 100755 --- a/src/gns/test_gns_gns2dns_cname_lookup.sh +++ b/src/cli/gns/test_gns_gns2dns_cname_lookup.sh | |||
diff --git a/src/gns/test_gns_gns2dns_lookup.sh b/src/cli/gns/test_gns_gns2dns_lookup.sh index 43a4756d3..43a4756d3 100755 --- a/src/gns/test_gns_gns2dns_lookup.sh +++ b/src/cli/gns/test_gns_gns2dns_lookup.sh | |||
diff --git a/src/gns/test_gns_gns2dns_zkey_lookup.sh b/src/cli/gns/test_gns_gns2dns_zkey_lookup.sh index 03549314e..03549314e 100755 --- a/src/gns/test_gns_gns2dns_zkey_lookup.sh +++ b/src/cli/gns/test_gns_gns2dns_zkey_lookup.sh | |||
diff --git a/src/gns/test_gns_ipv6_lookup.sh b/src/cli/gns/test_gns_ipv6_lookup.sh index 31e662f68..31e662f68 100755 --- a/src/gns/test_gns_ipv6_lookup.sh +++ b/src/cli/gns/test_gns_ipv6_lookup.sh | |||
diff --git a/src/gns/test_gns_lookup.sh b/src/cli/gns/test_gns_lookup.sh index 92dfae28b..92dfae28b 100755 --- a/src/gns/test_gns_lookup.sh +++ b/src/cli/gns/test_gns_lookup.sh | |||
diff --git a/src/gns/test_gns_multiple_record_lookup.sh b/src/cli/gns/test_gns_multiple_record_lookup.sh index 2d00945d6..2d00945d6 100755 --- a/src/gns/test_gns_multiple_record_lookup.sh +++ b/src/cli/gns/test_gns_multiple_record_lookup.sh | |||
diff --git a/src/gns/test_gns_mx_lookup.sh b/src/cli/gns/test_gns_mx_lookup.sh index 6f2b8192d..6f2b8192d 100755 --- a/src/gns/test_gns_mx_lookup.sh +++ b/src/cli/gns/test_gns_mx_lookup.sh | |||
diff --git a/src/gns/test_gns_quickupdate.sh b/src/cli/gns/test_gns_quickupdate.sh index eac69103d..eac69103d 100755 --- a/src/gns/test_gns_quickupdate.sh +++ b/src/cli/gns/test_gns_quickupdate.sh | |||
diff --git a/src/gns/test_gns_redirect_lookup.sh b/src/cli/gns/test_gns_redirect_lookup.sh index 90729713d..90729713d 100755 --- a/src/gns/test_gns_redirect_lookup.sh +++ b/src/cli/gns/test_gns_redirect_lookup.sh | |||
diff --git a/src/gns/test_gns_rel_expiration.sh b/src/cli/gns/test_gns_rel_expiration.sh index a240cfd0f..a240cfd0f 100755 --- a/src/gns/test_gns_rel_expiration.sh +++ b/src/cli/gns/test_gns_rel_expiration.sh | |||
diff --git a/src/gns/test_gns_revocation.sh b/src/cli/gns/test_gns_revocation.sh index 2253adcb4..2253adcb4 100755 --- a/src/gns/test_gns_revocation.sh +++ b/src/cli/gns/test_gns_revocation.sh | |||
diff --git a/src/gns/test_gns_soa_lookup.sh b/src/cli/gns/test_gns_soa_lookup.sh index a697782bb..a697782bb 100755 --- a/src/gns/test_gns_soa_lookup.sh +++ b/src/cli/gns/test_gns_soa_lookup.sh | |||
diff --git a/src/gns/test_gns_txt_lookup.sh b/src/cli/gns/test_gns_txt_lookup.sh index 4e36e8ad8..4e36e8ad8 100755 --- a/src/gns/test_gns_txt_lookup.sh +++ b/src/cli/gns/test_gns_txt_lookup.sh | |||
diff --git a/src/gns/test_gns_zkey_lookup.sh b/src/cli/gns/test_gns_zkey_lookup.sh index 3d4aefc7c..3d4aefc7c 100755 --- a/src/gns/test_gns_zkey_lookup.sh +++ b/src/cli/gns/test_gns_zkey_lookup.sh | |||
diff --git a/src/contrib/service/abd/Makefile.am b/src/contrib/service/abd/Makefile.am index d08a6a4a7..f199d72ed 100644 --- a/src/contrib/service/abd/Makefile.am +++ b/src/contrib/service/abd/Makefile.am | |||
@@ -65,7 +65,7 @@ gnunet_service_abd_SOURCES = \ | |||
65 | gnunet_service_abd_LDADD = \ | 65 | gnunet_service_abd_LDADD = \ |
66 | libgnunetabd.la \ | 66 | libgnunetabd.la \ |
67 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 67 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
68 | $(top_builddir)/src/gns/libgnunetgns.la \ | 68 | $(top_builddir)/src/service/gns/libgnunetgns.la \ |
69 | $(top_builddir)/src/service/namestore/libgnunetnamestore.la \ | 69 | $(top_builddir)/src/service/namestore/libgnunetnamestore.la \ |
70 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 70 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
71 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ | 71 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am index 720d543ca..b573208e6 100644 --- a/src/conversation/Makefile.am +++ b/src/conversation/Makefile.am | |||
@@ -69,7 +69,7 @@ libgnunetconversation_la_SOURCES = \ | |||
69 | conversation_api_call.c \ | 69 | conversation_api_call.c \ |
70 | conversation.h | 70 | conversation.h |
71 | libgnunetconversation_la_LIBADD = \ | 71 | libgnunetconversation_la_LIBADD = \ |
72 | $(top_builddir)/src/gns/libgnunetgns.la \ | 72 | $(top_builddir)/src/service/gns/libgnunetgns.la \ |
73 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 73 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
74 | $(top_builddir)/src/service/namestore/libgnunetnamestore.la \ | 74 | $(top_builddir)/src/service/namestore/libgnunetnamestore.la \ |
75 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 75 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
@@ -196,7 +196,7 @@ gnunet_conversation_LDADD = \ | |||
196 | libgnunetmicrophone.la \ | 196 | libgnunetmicrophone.la \ |
197 | libgnunetspeaker.la \ | 197 | libgnunetspeaker.la \ |
198 | libgnunetconversation.la \ | 198 | libgnunetconversation.la \ |
199 | $(top_builddir)/src/gns/libgnunetgns.la \ | 199 | $(top_builddir)/src/service/gns/libgnunetgns.la \ |
200 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 200 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
201 | $(top_builddir)/src/service/namestore/libgnunetnamestore.la \ | 201 | $(top_builddir)/src/service/namestore/libgnunetnamestore.la \ |
202 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 202 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
diff --git a/src/plugin/Makefile.am b/src/plugin/Makefile.am index 01a48de85..5b1464d89 100644 --- a/src/plugin/Makefile.am +++ b/src/plugin/Makefile.am | |||
@@ -4,4 +4,5 @@ SUBDIRS = \ | |||
4 | dhtu \ | 4 | dhtu \ |
5 | namecache \ | 5 | namecache \ |
6 | namestore \ | 6 | namestore \ |
7 | revocation | 7 | revocation \ |
8 | gns | ||
diff --git a/src/plugin/gns/Makefile.am b/src/plugin/gns/Makefile.am new file mode 100644 index 000000000..ebbb9aa51 --- /dev/null +++ b/src/plugin/gns/Makefile.am | |||
@@ -0,0 +1,61 @@ | |||
1 | # This Makefile.am is in the public domain | ||
2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include | ||
3 | |||
4 | if HAVE_LIBIDN | ||
5 | LIBIDN= -lidn | ||
6 | else | ||
7 | LIBIDN= | ||
8 | endif | ||
9 | |||
10 | if HAVE_LIBIDN2 | ||
11 | LIBIDN2= -lidn2 | ||
12 | else | ||
13 | LIBIDN2= | ||
14 | endif | ||
15 | |||
16 | USE_VPN = $(top_builddir)/src/service/vpn/libgnunetvpn.la | ||
17 | |||
18 | if USE_COVERAGE | ||
19 | AM_CFLAGS = --coverage -O0 | ||
20 | endif | ||
21 | |||
22 | pkgcfgdir = $(pkgdatadir)/config.d/ | ||
23 | |||
24 | libexecdir= $(pkglibdir)/libexec/ | ||
25 | |||
26 | plugindir = $(libdir)/gnunet | ||
27 | |||
28 | plugin_LTLIBRARIES = \ | ||
29 | libgnunet_plugin_block_gns.la \ | ||
30 | libgnunet_plugin_gnsrecord_gns.la | ||
31 | |||
32 | |||
33 | libgnunet_plugin_gnsrecord_gns_la_SOURCES = \ | ||
34 | plugin_gnsrecord_gns.c | ||
35 | libgnunet_plugin_gnsrecord_gns_la_LIBADD = \ | ||
36 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | ||
37 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | ||
38 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | ||
39 | $(LTLIBINTL) | ||
40 | libgnunet_plugin_gnsrecord_gns_la_LDFLAGS = \ | ||
41 | $(GN_PLUGIN_LDFLAGS) | ||
42 | |||
43 | |||
44 | libgnunet_plugin_block_gns_la_SOURCES = \ | ||
45 | plugin_block_gns.c | ||
46 | libgnunet_plugin_block_gns_la_LIBADD = \ | ||
47 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | ||
48 | $(top_builddir)/src/lib/block/libgnunetblock.la \ | ||
49 | $(top_builddir)/src/lib/block/libgnunetblockgroup.la \ | ||
50 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | ||
51 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la | ||
52 | libgnunet_plugin_block_gns_la_LDFLAGS = \ | ||
53 | $(GN_LIBINTL) \ | ||
54 | $(GN_PLUGIN_LDFLAGS) | ||
55 | |||
56 | if ENABLE_TEST_RUN | ||
57 | if HAVE_SQLITE | ||
58 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; | ||
59 | TESTS = $(check_SCRIPTS) | ||
60 | endif | ||
61 | endif | ||
diff --git a/src/gns/plugin_block_gns.c b/src/plugin/gns/plugin_block_gns.c index 75e182092..75e182092 100644 --- a/src/gns/plugin_block_gns.c +++ b/src/plugin/gns/plugin_block_gns.c | |||
diff --git a/src/gns/plugin_gnsrecord_gns.c b/src/plugin/gns/plugin_gnsrecord_gns.c index 65587172d..65587172d 100644 --- a/src/gns/plugin_gnsrecord_gns.c +++ b/src/plugin/gns/plugin_gnsrecord_gns.c | |||
diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am index 406aad081..e5603d662 100644 --- a/src/reclaim/Makefile.am +++ b/src/reclaim/Makefile.am | |||
@@ -80,7 +80,7 @@ libgnunet_plugin_rest_openid_connect_la_LIBADD = \ | |||
80 | libgnunetreclaim.la \ | 80 | libgnunetreclaim.la \ |
81 | $(top_builddir)/src/service/rest/libgnunetrest.la \ | 81 | $(top_builddir)/src/service/rest/libgnunetrest.la \ |
82 | $(top_builddir)/src/service/namestore/libgnunetnamestore.la \ | 82 | $(top_builddir)/src/service/namestore/libgnunetnamestore.la \ |
83 | $(top_builddir)/src/gns/libgnunetgns.la \ | 83 | $(top_builddir)/src/service/gns/libgnunetgns.la \ |
84 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 84 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
85 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \ | 85 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \ |
86 | $(LTLIBINTL) -ljansson -ljose $(MHD_LIBS) \ | 86 | $(LTLIBINTL) -ljansson -ljose $(MHD_LIBS) \ |
@@ -126,7 +126,7 @@ gnunet_service_reclaim_LDADD = \ | |||
126 | $(top_builddir)/src/service/namestore/libgnunetnamestore.la \ | 126 | $(top_builddir)/src/service/namestore/libgnunetnamestore.la \ |
127 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ | 127 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
128 | libgnunetreclaim.la \ | 128 | libgnunetreclaim.la \ |
129 | $(top_builddir)/src/gns/libgnunetgns.la \ | 129 | $(top_builddir)/src/service/gns/libgnunetgns.la \ |
130 | $(GN_LIBINTL) | 130 | $(GN_LIBINTL) |
131 | 131 | ||
132 | libgnunetreclaim_la_SOURCES = \ | 132 | libgnunetreclaim_la_SOURCES = \ |
@@ -151,7 +151,7 @@ libgnunetdid_la_SOURCES = \ | |||
151 | did_core.c | 151 | did_core.c |
152 | libgnunetdid_la_LIBADD = \ | 152 | libgnunetdid_la_LIBADD = \ |
153 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 153 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
154 | $(top_builddir)/src/gns/libgnunetgns.la \ | 154 | $(top_builddir)/src/service/gns/libgnunetgns.la \ |
155 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 155 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
156 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 156 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
157 | $(top_builddir)/src/service/namestore/libgnunetnamestore.la \ | 157 | $(top_builddir)/src/service/namestore/libgnunetnamestore.la \ |
@@ -216,7 +216,7 @@ gnunet_did_SOURCES = \ | |||
216 | gnunet-did.c | 216 | gnunet-did.c |
217 | gnunet_did_LDADD = \ | 217 | gnunet_did_LDADD = \ |
218 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 218 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
219 | $(top_builddir)/src/gns/libgnunetgns.la \ | 219 | $(top_builddir)/src/service/gns/libgnunetgns.la \ |
220 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 220 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
221 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 221 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
222 | $(top_builddir)/src/service/namestore/libgnunetnamestore.la \ | 222 | $(top_builddir)/src/service/namestore/libgnunetnamestore.la \ |
@@ -228,7 +228,7 @@ test_did_helper_SOURCES = \ | |||
228 | test_did_helper.c | 228 | test_did_helper.c |
229 | test_did_helper_LDADD = \ | 229 | test_did_helper_LDADD = \ |
230 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 230 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
231 | $(top_builddir)/src/gns/libgnunetgns.la \ | 231 | $(top_builddir)/src/service/gns/libgnunetgns.la \ |
232 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 232 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
233 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 233 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
234 | $(top_builddir)/src/service/namestore/libgnunetnamestore.la \ | 234 | $(top_builddir)/src/service/namestore/libgnunetnamestore.la \ |
diff --git a/src/rest-plugin/Makefile.am b/src/rest-plugin/Makefile.am index fb74b9f2e..4b1b71bb7 100644 --- a/src/rest-plugin/Makefile.am +++ b/src/rest-plugin/Makefile.am | |||
@@ -1,3 +1,4 @@ | |||
1 | SUBDIRS = \ | 1 | SUBDIRS = \ |
2 | rest \ | 2 | rest \ |
3 | identity | 3 | identity \ |
4 | gns | ||
diff --git a/src/rest-plugin/gns/Makefile.am b/src/rest-plugin/gns/Makefile.am new file mode 100644 index 000000000..48b278df6 --- /dev/null +++ b/src/rest-plugin/gns/Makefile.am | |||
@@ -0,0 +1,61 @@ | |||
1 | # This Makefile.am is in the public domain | ||
2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include | ||
3 | |||
4 | if HAVE_LIBIDN | ||
5 | LIBIDN= -lidn | ||
6 | else | ||
7 | LIBIDN= | ||
8 | endif | ||
9 | |||
10 | if HAVE_LIBIDN2 | ||
11 | LIBIDN2= -lidn2 | ||
12 | else | ||
13 | LIBIDN2= | ||
14 | endif | ||
15 | |||
16 | USE_VPN = $(top_builddir)/src/service/vpn/libgnunetvpn.la | ||
17 | |||
18 | if USE_COVERAGE | ||
19 | AM_CFLAGS = --coverage -O0 | ||
20 | endif | ||
21 | |||
22 | pkgcfgdir = $(pkgdatadir)/config.d/ | ||
23 | |||
24 | libexecdir= $(pkglibdir)/libexec/ | ||
25 | |||
26 | plugindir = $(libdir)/gnunet | ||
27 | |||
28 | REST_PLUGIN = libgnunet_plugin_rest_gns.la | ||
29 | |||
30 | plugin_LTLIBRARIES = \ | ||
31 | $(REST_PLUGIN) | ||
32 | |||
33 | |||
34 | libgnunet_plugin_rest_gns_la_SOURCES = \ | ||
35 | plugin_rest_gns.c | ||
36 | libgnunet_plugin_rest_gns_la_LIBADD = \ | ||
37 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | ||
38 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecordjson.la \ | ||
39 | $(top_builddir)/src/service/gns/libgnunetgns.la \ | ||
40 | $(top_builddir)/src/service/rest/libgnunetrest.la \ | ||
41 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | ||
42 | $(top_builddir)/src/lib/json/libgnunetjson.la \ | ||
43 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \ | ||
44 | $(LTLIBINTL) -ljansson $(MHD_LIBS) | ||
45 | libgnunet_plugin_rest_gns_la_LDFLAGS = \ | ||
46 | $(GN_PLUGIN_LDFLAGS) | ||
47 | libgnunet_plugin_rest_gns_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) | ||
48 | |||
49 | |||
50 | check_SCRIPTS = \ | ||
51 | test_plugin_rest_gns.sh | ||
52 | |||
53 | EXTRA_DIST = \ | ||
54 | test_plugin_rest_gns.sh | ||
55 | |||
56 | if ENABLE_TEST_RUN | ||
57 | if HAVE_SQLITE | ||
58 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; | ||
59 | TESTS = $(check_SCRIPTS) | ||
60 | endif | ||
61 | endif | ||
diff --git a/src/gns/plugin_rest_gns.c b/src/rest-plugin/gns/plugin_rest_gns.c index 659b77493..659b77493 100644 --- a/src/gns/plugin_rest_gns.c +++ b/src/rest-plugin/gns/plugin_rest_gns.c | |||
diff --git a/src/gns/test_plugin_rest_gns.sh b/src/rest-plugin/gns/test_plugin_rest_gns.sh index 3bcfb5a08..3bcfb5a08 100755 --- a/src/gns/test_plugin_rest_gns.sh +++ b/src/rest-plugin/gns/test_plugin_rest_gns.sh | |||
diff --git a/src/service/Makefile.am b/src/service/Makefile.am index a8738997f..34ae7945f 100644 --- a/src/service/Makefile.am +++ b/src/service/Makefile.am | |||
@@ -24,5 +24,7 @@ SUBDIRS = \ | |||
24 | setu \ | 24 | setu \ |
25 | regex \ | 25 | regex \ |
26 | revocation \ | 26 | revocation \ |
27 | vpn | 27 | vpn \ |
28 | gns \ | ||
29 | zonemaster | ||
28 | 30 | ||
diff --git a/src/gns/.gitignore b/src/service/gns/.gitignore index 3bbb2eb3d..3bbb2eb3d 100644 --- a/src/gns/.gitignore +++ b/src/service/gns/.gitignore | |||
diff --git a/src/gns/Makefile.am b/src/service/gns/Makefile.am index 6907df0ed..a169b43a6 100644 --- a/src/gns/Makefile.am +++ b/src/service/gns/Makefile.am | |||
@@ -7,9 +7,6 @@ endif | |||
7 | 7 | ||
8 | SUBDIRS = . $(NSS_SUBDIR) | 8 | SUBDIRS = . $(NSS_SUBDIR) |
9 | 9 | ||
10 | pkgdata_DATA = \ | ||
11 | gnunet-gns-proxy-ca.template | ||
12 | |||
13 | if HAVE_LIBIDN | 10 | if HAVE_LIBIDN |
14 | LIBIDN= -lidn | 11 | LIBIDN= -lidn |
15 | else | 12 | else |
@@ -46,9 +43,6 @@ libexec_PROGRAMS = \ | |||
46 | gnunet-service-gns \ | 43 | gnunet-service-gns \ |
47 | gnunet-dns2gns | 44 | gnunet-dns2gns |
48 | 45 | ||
49 | bin_PROGRAMS = \ | ||
50 | gnunet-gns | ||
51 | |||
52 | noinst_PROGRAMS = \ | 46 | noinst_PROGRAMS = \ |
53 | gnunet-gns-benchmark | 47 | gnunet-gns-benchmark |
54 | 48 | ||
@@ -60,64 +54,6 @@ if HAVE_GNUTLS | |||
60 | libexec_PROGRAMS += gnunet-gns-proxy | 54 | libexec_PROGRAMS += gnunet-gns-proxy |
61 | endif | 55 | endif |
62 | 56 | ||
63 | REST_PLUGIN = libgnunet_plugin_rest_gns.la | ||
64 | |||
65 | plugin_LTLIBRARIES = \ | ||
66 | libgnunet_plugin_block_gns.la \ | ||
67 | libgnunet_plugin_gnsrecord_gns.la \ | ||
68 | $(REST_PLUGIN) | ||
69 | |||
70 | |||
71 | bin_SCRIPTS = \ | ||
72 | gnunet-gns-proxy-setup-ca | ||
73 | |||
74 | gnunet-gns-proxy-setup-ca: gnunet-gns-proxy-setup-ca.in Makefile | ||
75 | $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/gnunet-gns-proxy-setup-ca.in > gnunet-gns-proxy-setup-ca | ||
76 | @chmod +x gnunet-gns-proxy-setup-ca | ||
77 | |||
78 | test_gnunet_gns.sh: test_gnunet_gns.sh.in Makefile | ||
79 | $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/test_gnunet_gns.sh.in > test_gnunet_gns.sh | ||
80 | @chmod +x test_gnunet_gns.sh | ||
81 | |||
82 | CLEANFILES = test_gnunet_gns.sh | ||
83 | |||
84 | libgnunet_plugin_rest_gns_la_SOURCES = \ | ||
85 | plugin_rest_gns.c | ||
86 | libgnunet_plugin_rest_gns_la_LIBADD = \ | ||
87 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | ||
88 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecordjson.la \ | ||
89 | libgnunetgns.la \ | ||
90 | $(top_builddir)/src/service/rest/libgnunetrest.la \ | ||
91 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | ||
92 | $(top_builddir)/src/lib/json/libgnunetjson.la \ | ||
93 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \ | ||
94 | $(LTLIBINTL) -ljansson $(MHD_LIBS) | ||
95 | libgnunet_plugin_rest_gns_la_LDFLAGS = \ | ||
96 | $(GN_PLUGIN_LDFLAGS) | ||
97 | libgnunet_plugin_rest_gns_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) | ||
98 | |||
99 | |||
100 | libgnunet_plugin_gnsrecord_gns_la_SOURCES = \ | ||
101 | plugin_gnsrecord_gns.c | ||
102 | libgnunet_plugin_gnsrecord_gns_la_LIBADD = \ | ||
103 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | ||
104 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | ||
105 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | ||
106 | $(LTLIBINTL) | ||
107 | libgnunet_plugin_gnsrecord_gns_la_LDFLAGS = \ | ||
108 | $(GN_PLUGIN_LDFLAGS) | ||
109 | |||
110 | |||
111 | gnunet_gns_SOURCES = \ | ||
112 | gnunet-gns.c | ||
113 | gnunet_gns_LDADD = \ | ||
114 | libgnunetgns.la \ | ||
115 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | ||
116 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | ||
117 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | ||
118 | $(LIBIDN) $(LIBIDN2) \ | ||
119 | $(GN_LIBINTL) | ||
120 | |||
121 | gnunet_gns_benchmark_SOURCES = \ | 57 | gnunet_gns_benchmark_SOURCES = \ |
122 | gnunet-gns-benchmark.c | 58 | gnunet-gns-benchmark.c |
123 | gnunet_gns_benchmark_LDADD = \ | 59 | gnunet_gns_benchmark_LDADD = \ |
@@ -222,81 +158,19 @@ libgnunetgns_la_LDFLAGS = \ | |||
222 | $(GN_LIB_LDFLAGS) | 158 | $(GN_LIB_LDFLAGS) |
223 | 159 | ||
224 | 160 | ||
225 | libgnunet_plugin_block_gns_la_SOURCES = \ | ||
226 | plugin_block_gns.c | ||
227 | libgnunet_plugin_block_gns_la_LIBADD = \ | ||
228 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | ||
229 | $(top_builddir)/src/lib/block/libgnunetblock.la \ | ||
230 | $(top_builddir)/src/lib/block/libgnunetblockgroup.la \ | ||
231 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | ||
232 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la | ||
233 | libgnunet_plugin_block_gns_la_LDFLAGS = \ | ||
234 | $(GN_LIBINTL) \ | ||
235 | $(GN_PLUGIN_LDFLAGS) | ||
236 | |||
237 | if HAVE_GNUTLS | 161 | if HAVE_GNUTLS |
238 | check_PROGRAMS = \ | 162 | check_PROGRAMS = \ |
239 | test_gns_proxy | 163 | test_gns_proxy |
240 | endif | 164 | endif |
241 | 165 | ||
242 | check_SCRIPTS = \ | ||
243 | test_gns_lookup.sh \ | ||
244 | test_gns_config_lookup.sh \ | ||
245 | test_gns_ipv6_lookup.sh\ | ||
246 | test_gns_txt_lookup.sh\ | ||
247 | test_gns_caa_lookup.sh\ | ||
248 | test_gns_mx_lookup.sh \ | ||
249 | test_gns_gns2dns_lookup.sh \ | ||
250 | test_gns_gns2dns_zkey_lookup.sh \ | ||
251 | test_gns_gns2dns_cname_lookup.sh \ | ||
252 | test_gns_dht_lookup.sh\ | ||
253 | test_gns_delegated_lookup.sh \ | ||
254 | test_gns_at_lookup.sh\ | ||
255 | test_gns_zkey_lookup.sh\ | ||
256 | test_gns_rel_expiration.sh\ | ||
257 | test_gns_soa_lookup.sh\ | ||
258 | test_gns_revocation.sh\ | ||
259 | test_gns_redirect_lookup.sh | ||
260 | |||
261 | if HAVE_GNUTLS_CURL | 166 | if HAVE_GNUTLS_CURL |
262 | check_SCRIPTS += \ | 167 | check_SCRIPTS = \ |
263 | test_proxy.sh | 168 | test_proxy.sh |
264 | endif | 169 | endif |
265 | check_SCRIPTS += \ | ||
266 | test_plugin_rest_gns.sh | ||
267 | 170 | ||
268 | EXTRA_DIST = \ | 171 | EXTRA_DIST = \ |
269 | test_gns_defaults.conf \ | ||
270 | test_gns_lookup.conf \ | ||
271 | test_gns_proxy.conf \ | 172 | test_gns_proxy.conf \ |
272 | test_gns_simple_lookup.conf \ | 173 | test_proxy.sh |
273 | openssl.cnf \ | ||
274 | gnunet-gns-proxy-setup-ca.in \ | ||
275 | zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey \ | ||
276 | zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey \ | ||
277 | zonefiles/test_zonekey \ | ||
278 | test_gns_lookup.sh \ | ||
279 | test_gns_config_lookup.sh \ | ||
280 | test_gns_ipv6_lookup.sh\ | ||
281 | test_gns_txt_lookup.sh\ | ||
282 | test_gns_caa_lookup.sh\ | ||
283 | test_gns_mx_lookup.sh \ | ||
284 | test_gns_gns2dns_lookup.sh \ | ||
285 | test_gns_gns2dns_zkey_lookup.sh \ | ||
286 | test_gns_gns2dns_cname_lookup.sh \ | ||
287 | test_gns_dht_lookup.sh\ | ||
288 | test_gns_delegated_lookup.sh \ | ||
289 | test_gns_at_lookup.sh\ | ||
290 | test_gns_zkey_lookup.sh\ | ||
291 | test_gns_rel_expiration.sh\ | ||
292 | test_gns_soa_lookup.sh\ | ||
293 | test_gns_revocation.sh\ | ||
294 | test_gns_redirect_lookup.sh\ | ||
295 | test_proxy.sh\ | ||
296 | test_plugin_rest_gns.sh\ | ||
297 | test_proxy.sh \ | ||
298 | $(pkgdata_DATA) \ | ||
299 | test_gnunet_gns.sh.in | ||
300 | 174 | ||
301 | if ENABLE_TEST_RUN | 175 | if ENABLE_TEST_RUN |
302 | if HAVE_SQLITE | 176 | if HAVE_SQLITE |
diff --git a/src/gns/gns.conf.in b/src/service/gns/gns.conf.in index d8a27ec22..d8a27ec22 100644 --- a/src/gns/gns.conf.in +++ b/src/service/gns/gns.conf.in | |||
diff --git a/src/gns/gns.h b/src/service/gns/gns.h index d882278f5..d882278f5 100644 --- a/src/gns/gns.h +++ b/src/service/gns/gns.h | |||
diff --git a/src/gns/gns_api.c b/src/service/gns/gns_api.c index 0dc7580f9..0dc7580f9 100644 --- a/src/gns/gns_api.c +++ b/src/service/gns/gns_api.c | |||
diff --git a/src/gns/gns_api.h b/src/service/gns/gns_api.h index 003955bdd..003955bdd 100644 --- a/src/gns/gns_api.h +++ b/src/service/gns/gns_api.h | |||
diff --git a/src/gns/gns_tld_api.c b/src/service/gns/gns_tld_api.c index 1ea87fd97..1ea87fd97 100644 --- a/src/gns/gns_tld_api.c +++ b/src/service/gns/gns_tld_api.c | |||
diff --git a/src/gns/gnunet-bcd.c b/src/service/gns/gnunet-bcd.c index 0f7fb6507..0f7fb6507 100644 --- a/src/gns/gnunet-bcd.c +++ b/src/service/gns/gnunet-bcd.c | |||
diff --git a/src/gns/gnunet-dns2gns.c b/src/service/gns/gnunet-dns2gns.c index 04d320c62..04d320c62 100644 --- a/src/gns/gnunet-dns2gns.c +++ b/src/service/gns/gnunet-dns2gns.c | |||
diff --git a/src/gns/gnunet-gns-benchmark.c b/src/service/gns/gnunet-gns-benchmark.c index b36a83f21..b36a83f21 100644 --- a/src/gns/gnunet-gns-benchmark.c +++ b/src/service/gns/gnunet-gns-benchmark.c | |||
diff --git a/src/gns/gnunet-gns-import.c b/src/service/gns/gnunet-gns-import.c index 5d4602682..5d4602682 100644 --- a/src/gns/gnunet-gns-import.c +++ b/src/service/gns/gnunet-gns-import.c | |||
diff --git a/src/gns/gnunet-gns-proxy.c b/src/service/gns/gnunet-gns-proxy.c index b38f0a425..b38f0a425 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/service/gns/gnunet-gns-proxy.c | |||
diff --git a/src/gns/gnunet-service-gns.c b/src/service/gns/gnunet-service-gns.c index aaf82a557..aaf82a557 100644 --- a/src/gns/gnunet-service-gns.c +++ b/src/service/gns/gnunet-service-gns.c | |||
diff --git a/src/gns/gnunet-service-gns.h b/src/service/gns/gnunet-service-gns.h index 13e28349c..13e28349c 100644 --- a/src/gns/gnunet-service-gns.h +++ b/src/service/gns/gnunet-service-gns.h | |||
diff --git a/src/gns/gnunet-service-gns_interceptor.c b/src/service/gns/gnunet-service-gns_interceptor.c index f49d60b94..f49d60b94 100644 --- a/src/gns/gnunet-service-gns_interceptor.c +++ b/src/service/gns/gnunet-service-gns_interceptor.c | |||
diff --git a/src/gns/gnunet-service-gns_interceptor.h b/src/service/gns/gnunet-service-gns_interceptor.h index 7f9733c2a..7f9733c2a 100644 --- a/src/gns/gnunet-service-gns_interceptor.h +++ b/src/service/gns/gnunet-service-gns_interceptor.h | |||
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/service/gns/gnunet-service-gns_resolver.c index aa0189b15..aa0189b15 100644 --- a/src/gns/gnunet-service-gns_resolver.c +++ b/src/service/gns/gnunet-service-gns_resolver.c | |||
diff --git a/src/gns/gnunet-service-gns_resolver.h b/src/service/gns/gnunet-service-gns_resolver.h index 908af58e7..908af58e7 100644 --- a/src/gns/gnunet-service-gns_resolver.h +++ b/src/service/gns/gnunet-service-gns_resolver.h | |||
diff --git a/src/gns/gnunet_w32nsp_lib.h b/src/service/gns/gnunet_w32nsp_lib.h index 9d19ff2aa..9d19ff2aa 100644 --- a/src/gns/gnunet_w32nsp_lib.h +++ b/src/service/gns/gnunet_w32nsp_lib.h | |||
diff --git a/src/gns/meson.build b/src/service/gns/meson.build index b82694026..b82694026 100644 --- a/src/gns/meson.build +++ b/src/service/gns/meson.build | |||
diff --git a/src/gns/nss/Makefile.am b/src/service/gns/nss/Makefile.am index af0a8a2e2..af0a8a2e2 100644 --- a/src/gns/nss/Makefile.am +++ b/src/service/gns/nss/Makefile.am | |||
diff --git a/src/gns/nss/map-file b/src/service/gns/nss/map-file index 476d0ac3e..476d0ac3e 100644 --- a/src/gns/nss/map-file +++ b/src/service/gns/nss/map-file | |||
diff --git a/src/gns/nss/meson.build b/src/service/gns/nss/meson.build index 7fd00ceb1..7fd00ceb1 100644 --- a/src/gns/nss/meson.build +++ b/src/service/gns/nss/meson.build | |||
diff --git a/src/gns/nss/nss_gns.c b/src/service/gns/nss/nss_gns.c index b05cfff55..b05cfff55 100644 --- a/src/gns/nss/nss_gns.c +++ b/src/service/gns/nss/nss_gns.c | |||
diff --git a/src/gns/nss/nss_gns_query.c b/src/service/gns/nss/nss_gns_query.c index 96e8e10da..96e8e10da 100644 --- a/src/gns/nss/nss_gns_query.c +++ b/src/service/gns/nss/nss_gns_query.c | |||
diff --git a/src/gns/nss/nss_gns_query.h b/src/service/gns/nss/nss_gns_query.h index 43bf21646..43bf21646 100644 --- a/src/gns/nss/nss_gns_query.h +++ b/src/service/gns/nss/nss_gns_query.h | |||
diff --git a/src/gns/openssl.cnf b/src/service/gns/openssl.cnf index a2561b9b2..a2561b9b2 100644 --- a/src/gns/openssl.cnf +++ b/src/service/gns/openssl.cnf | |||
diff --git a/src/gns/test_dns2gns.conf b/src/service/gns/test_dns2gns.conf index f484d4114..f484d4114 100644 --- a/src/gns/test_dns2gns.conf +++ b/src/service/gns/test_dns2gns.conf | |||
diff --git a/src/gns/test_gns_defaults.conf b/src/service/gns/test_gns_defaults.conf index 80a2f3c44..80a2f3c44 100644 --- a/src/gns/test_gns_defaults.conf +++ b/src/service/gns/test_gns_defaults.conf | |||
diff --git a/src/gns/test_gns_lookup.conf b/src/service/gns/test_gns_lookup.conf index 322af0784..322af0784 100644 --- a/src/gns/test_gns_lookup.conf +++ b/src/service/gns/test_gns_lookup.conf | |||
diff --git a/src/gns/test_gns_lookup_peer1.conf b/src/service/gns/test_gns_lookup_peer1.conf index 69e2f0973..69e2f0973 100644 --- a/src/gns/test_gns_lookup_peer1.conf +++ b/src/service/gns/test_gns_lookup_peer1.conf | |||
diff --git a/src/gns/test_gns_lookup_peer2.conf b/src/service/gns/test_gns_lookup_peer2.conf index 3de81d7f3..3de81d7f3 100644 --- a/src/gns/test_gns_lookup_peer2.conf +++ b/src/service/gns/test_gns_lookup_peer2.conf | |||
diff --git a/src/gns/test_gns_proxy.c b/src/service/gns/test_gns_proxy.c index e09db5787..e09db5787 100644 --- a/src/gns/test_gns_proxy.c +++ b/src/service/gns/test_gns_proxy.c | |||
diff --git a/src/gns/test_gns_proxy.conf b/src/service/gns/test_gns_proxy.conf index 3dfeacafe..3dfeacafe 100644 --- a/src/gns/test_gns_proxy.conf +++ b/src/service/gns/test_gns_proxy.conf | |||
diff --git a/src/gns/test_gns_simple_lookup.conf b/src/service/gns/test_gns_simple_lookup.conf index 374731377..374731377 100644 --- a/src/gns/test_gns_simple_lookup.conf +++ b/src/service/gns/test_gns_simple_lookup.conf | |||
diff --git a/src/gns/test_gnunet_gns.sh.in b/src/service/gns/test_gnunet_gns.sh.in index d0c07b4e4..d0c07b4e4 100755 --- a/src/gns/test_gnunet_gns.sh.in +++ b/src/service/gns/test_gnunet_gns.sh.in | |||
diff --git a/src/gns/test_proxy.sh b/src/service/gns/test_proxy.sh index bb63a436e..bb63a436e 100755 --- a/src/gns/test_proxy.sh +++ b/src/service/gns/test_proxy.sh | |||
diff --git a/src/gns/tlds.conf b/src/service/gns/tlds.conf index a600a3d66..a600a3d66 100644 --- a/src/gns/tlds.conf +++ b/src/service/gns/tlds.conf | |||
diff --git a/src/gns/w32resolver.h b/src/service/gns/w32resolver.h index c404e37d3..c404e37d3 100644 --- a/src/gns/w32resolver.h +++ b/src/service/gns/w32resolver.h | |||
diff --git a/src/gns/zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey b/src/service/gns/zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey index 895946037..895946037 100644 --- a/src/gns/zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey +++ b/src/service/gns/zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey | |||
Binary files differ | |||
diff --git a/src/gns/zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey b/src/service/gns/zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey index 3ef49f0ac..3ef49f0ac 100644 --- a/src/gns/zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey +++ b/src/service/gns/zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey | |||
Binary files differ | |||
diff --git a/src/gns/zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey b/src/service/gns/zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey index 89e0b3a0a..89e0b3a0a 100644 --- a/src/gns/zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey +++ b/src/service/gns/zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey | |||
Binary files differ | |||
diff --git a/src/gns/zonefiles/test_zonekey b/src/service/gns/zonefiles/test_zonekey index 870c56315..870c56315 100644 --- a/src/gns/zonefiles/test_zonekey +++ b/src/service/gns/zonefiles/test_zonekey | |||
Binary files differ | |||
diff --git a/src/service/testing/.gitignore b/src/service/testing/.gitignore index d75315c79..a1e77a8e4 100644 --- a/src/service/testing/.gitignore +++ b/src/service/testing/.gitignore | |||
@@ -1,3 +1,4 @@ | |||
1 | test_testing_start_with_config | ||
1 | list-keys | 2 | list-keys |
2 | gnunet-testing | 3 | gnunet-testing |
3 | test_testing_peerstartup | 4 | test_testing_peerstartup |
diff --git a/src/zonemaster/.gitignore b/src/service/zonemaster/.gitignore index cde57fa0a..cde57fa0a 100644 --- a/src/zonemaster/.gitignore +++ b/src/service/zonemaster/.gitignore | |||
diff --git a/src/zonemaster/Makefile.am b/src/service/zonemaster/Makefile.am index 5a96afa83..5a96afa83 100644 --- a/src/zonemaster/Makefile.am +++ b/src/service/zonemaster/Makefile.am | |||
diff --git a/src/zonemaster/gnunet-service-zonemaster.c b/src/service/zonemaster/gnunet-service-zonemaster.c index 7c763576d..7c763576d 100644 --- a/src/zonemaster/gnunet-service-zonemaster.c +++ b/src/service/zonemaster/gnunet-service-zonemaster.c | |||
diff --git a/src/zonemaster/meson.build b/src/service/zonemaster/meson.build index 44c67edf2..44c67edf2 100644 --- a/src/zonemaster/meson.build +++ b/src/service/zonemaster/meson.build | |||
diff --git a/src/zonemaster/zonemaster.conf.in b/src/service/zonemaster/zonemaster.conf.in index 549394d6c..549394d6c 100644 --- a/src/zonemaster/zonemaster.conf.in +++ b/src/service/zonemaster/zonemaster.conf.in | |||