[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated (2d7660887 -> 773211a4d)
|
From: |
gnunet |
|
Subject: |
[gnunet] branch master updated (2d7660887 -> 773211a4d) |
|
Date: |
Wed, 18 Oct 2023 20:35:53 +0200 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a change to branch master
in repository gnunet.
from 2d7660887 Merge branch 'master' of git+ssh://git.gnunet.org/gnunet
new 11949e419 BUILD: Move cadet to service/cli
new 498cb28b1 BUILD: Move dht/datastore to service/cli
new 773211a4d -remove hello folder again
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
configure.ac | 17 +-
po/POTFILES.in | 92 ++---
src/Makefile.am | 4 -
src/cli/Makefile.am | 5 +-
src/cli/cadet/.gitignore | 1 +
src/cli/{core => cadet}/Makefile.am | 26 +-
src/{ => cli}/cadet/gnunet-cadet.c | 2 +-
src/cli/datastore/.gitignore | 1 +
src/cli/{core => datastore}/Makefile.am | 20 +-
src/{ => cli}/datastore/gnunet-datastore.c | 0
src/cli/dht/.gitignore | 5 +
src/cli/dht/Makefile.am | 52 +++
src/{ => cli}/dht/gnunet-dht-get.c | 0
src/{ => cli}/dht/gnunet-dht-hello.c | 0
src/{ => cli}/dht/gnunet-dht-monitor.c | 0
src/{ => cli}/dht/gnunet-dht-put.c | 0
src/contrib/service/rps/Makefile.am | 2 +-
src/conversation/Makefile.am | 2 +-
src/exit/Makefile.am | 4 +-
src/fs/Makefile.am | 8 +-
src/gns/Makefile.am | 2 +-
src/hello/gnunet-hello.c | 427 ---------------------
src/messenger/Makefile.am | 4 +-
src/pt/Makefile.am | 4 +-
src/regex/Makefile.am | 16 +-
src/scalarproduct/Makefile.am | 8 +-
src/service/Makefile.am | 6 +-
src/{ => service}/cadet/.gitignore | 0
src/{ => service}/cadet/Makefile.am | 13 +-
src/{ => service}/cadet/TODO | 0
src/{ => service}/cadet/cadet.conf.in | 0
src/{ => service}/cadet/cadet.h | 0
src/{ => service}/cadet/cadet_api.c | 0
src/{ => service}/cadet/cadet_api_drop_message.c | 0
src/{ => service}/cadet/cadet_api_get_channel.c | 0
src/{ => service}/cadet/cadet_api_get_path.c | 0
src/{ => service}/cadet/cadet_api_helper.c | 0
src/{ => service}/cadet/cadet_api_list_peers.c | 0
src/{ => service}/cadet/cadet_api_list_tunnels.c | 0
src/{ => service}/cadet/cadet_protocol.h | 0
src/{ => service}/cadet/cadet_test_lib.c | 0
src/{ => service}/cadet/cadet_test_lib.h | 0
src/{ => service}/cadet/desirability_table.c | 0
src/{ => service}/cadet/gnunet-service-cadet.c | 0
src/{ => service}/cadet/gnunet-service-cadet.h | 0
.../cadet/gnunet-service-cadet_channel.c | 0
.../cadet/gnunet-service-cadet_channel.h | 0
.../cadet/gnunet-service-cadet_connection.c | 0
.../cadet/gnunet-service-cadet_connection.h | 0
.../cadet/gnunet-service-cadet_core.c | 0
.../cadet/gnunet-service-cadet_core.h | 0
src/{ => service}/cadet/gnunet-service-cadet_dht.c | 0
src/{ => service}/cadet/gnunet-service-cadet_dht.h | 0
.../cadet/gnunet-service-cadet_hello.c | 0
.../cadet/gnunet-service-cadet_hello.h | 0
.../cadet/gnunet-service-cadet_paths.c | 0
.../cadet/gnunet-service-cadet_paths.h | 0
.../cadet/gnunet-service-cadet_peer.c | 0
.../cadet/gnunet-service-cadet_peer.h | 0
.../cadet/gnunet-service-cadet_tunnels.c | 0
.../cadet/gnunet-service-cadet_tunnels.h | 0
src/{ => service}/cadet/loopcheck.sh | 0
src/{ => service}/cadet/meson.build | 0
src/{ => service}/cadet/profiler.conf | 0
src/{ => service}/cadet/run_profiler.sh | 0
src/{ => service}/cadet/small.dat | 0
src/{ => service}/cadet/test_cadet.conf | 0
src/{ => service}/cadet/test_cadet_local_mq.c | 0
src/{ => service}/cadet/valgrind-cadet.supp | 0
src/{ => service}/datacache/.gitignore | 0
src/{ => service}/datacache/Makefile.am | 0
src/{ => service}/datacache/datacache-0001.sql | 0
src/{ => service}/datacache/datacache-drop.sql | 0
src/{ => service}/datacache/datacache.c | 0
src/{ => service}/datacache/datacache.conf | 0
src/{ => service}/datacache/meson.build | 0
.../datacache/plugin_datacache_heap.c | 0
.../datacache/plugin_datacache_postgres.c | 0
.../datacache/plugin_datacache_sqlite.c | 0
.../datacache/plugin_datacache_template.c | 0
src/{ => service}/datacache/test_datacache.c | 0
.../datacache/test_datacache_data_heap.conf | 0
.../datacache/test_datacache_data_postgres.conf | 0
.../datacache/test_datacache_data_sqlite.conf | 0
src/{ => service}/datacache/test_datacache_quota.c | 0
src/{ => service}/datastore/.gitignore | 1 -
src/{ => service}/datastore/Makefile.am | 11 -
src/{ => service}/datastore/datastore-0001.sql | 0
src/{ => service}/datastore/datastore-drop.sql | 0
src/{ => service}/datastore/datastore.conf.in | 0
src/{ => service}/datastore/datastore.h | 0
src/{ => service}/datastore/datastore_api.c | 0
.../datastore/gnunet-service-datastore.c | 0
src/{ => service}/datastore/meson.build | 0
src/{ => service}/datastore/perf_datastore_api.c | 0
.../datastore/perf_plugin_datastore.c | 0
.../datastore/perf_plugin_datastore_data_heap.conf | 0
.../perf_plugin_datastore_data_postgres.conf | 0
.../perf_plugin_datastore_data_sqlite.conf | 0
.../datastore/plugin_datastore_heap.c | 0
.../datastore/plugin_datastore_postgres.c | 0
.../datastore/plugin_datastore_sqlite.c | 0
.../datastore/plugin_datastore_template.c | 0
src/{ => service}/datastore/selectrandom.sql | 0
src/{ => service}/datastore/test_datastore_api.c | 0
.../datastore/test_datastore_api_data_heap.conf | 0
.../test_datastore_api_data_postgres.conf | 0
.../datastore/test_datastore_api_data_sqlite.conf | 0
.../datastore/test_datastore_api_management.c | 0
src/{ => service}/datastore/test_defaults.conf | 0
.../datastore/test_plugin_datastore.c | 0
.../datastore/test_plugin_datastore_data_heap.conf | 0
.../test_plugin_datastore_data_postgres.conf | 0
.../test_plugin_datastore_data_sqlite.conf | 0
src/{ => service}/dht/.gitignore | 5 -
src/{ => service}/dht/Makefile.am | 40 +-
src/{ => service}/dht/dht.conf.in | 0
src/{ => service}/dht/dht.h | 0
src/{ => service}/dht/dht_api.c | 0
src/{ => service}/dht/dht_test_lib.c | 0
src/{ => service}/dht/dht_test_lib.h | 0
src/{ => service}/dht/dhtu_testbed_connect.sh | 0
src/{ => service}/dht/dhtu_testbed_deploy.conf | 0
src/{ => service}/dht/dhtu_testbed_deploy.sh | 0
src/{ => service}/dht/gnunet-service-dht.c | 0
src/{ => service}/dht/gnunet-service-dht.h | 0
src/{ => service}/dht/gnunet-service-dht_clients.c | 0
.../dht/gnunet-service-dht_datacache.c | 0
.../dht/gnunet-service-dht_datacache.h | 0
.../dht/gnunet-service-dht_neighbours.c | 0
.../dht/gnunet-service-dht_neighbours.h | 0
src/{ => service}/dht/gnunet-service-dht_routing.c | 0
src/{ => service}/dht/gnunet-service-dht_routing.h | 0
src/{ => service}/dht/gnunet_dht_profiler.c | 0
src/{ => service}/dht/meson.build | 0
src/{ => service}/dht/plugin_block_dht.c | 0
src/{ => service}/dht/test_dht_2dtorus.conf | 0
src/{ => service}/dht/test_dht_api.c | 0
src/{ => service}/dht/test_dht_api_data.conf | 0
src/{ => service}/dht/test_dht_api_peer1.conf | 0
src/{ => service}/dht/test_dht_line.conf | 0
src/{ => service}/dht/test_dht_monitor.c | 0
src/{ => service}/dht/test_dht_monitor.conf | 0
src/{ => service}/dht/test_dht_multipeer.conf | 0
.../dht/test_dht_multipeer_topology.dat | 0
src/{ => service}/dht/test_dht_tools.conf | 0
src/{ => service}/dht/test_dht_tools.py.in | 0
src/{ => service}/dht/test_dht_tools.sh | 0
src/{ => service}/dht/test_dht_topo.c | 0
src/set/Makefile.am | 2 +-
src/seti/Makefile.am | 2 +-
src/setu/Makefile.am | 2 +-
src/vpn/Makefile.am | 2 +-
src/zonemaster/Makefile.am | 2 +-
154 files changed, 182 insertions(+), 606 deletions(-)
create mode 100644 src/cli/cadet/.gitignore
copy src/cli/{core => cadet}/Makefile.am (65%)
rename src/{ => cli}/cadet/gnunet-cadet.c (99%)
create mode 100644 src/cli/datastore/.gitignore
copy src/cli/{core => datastore}/Makefile.am (54%)
rename src/{ => cli}/datastore/gnunet-datastore.c (100%)
create mode 100644 src/cli/dht/.gitignore
create mode 100644 src/cli/dht/Makefile.am
rename src/{ => cli}/dht/gnunet-dht-get.c (100%)
rename src/{ => cli}/dht/gnunet-dht-hello.c (100%)
rename src/{ => cli}/dht/gnunet-dht-monitor.c (100%)
rename src/{ => cli}/dht/gnunet-dht-put.c (100%)
delete mode 100644 src/hello/gnunet-hello.c
rename src/{ => service}/cadet/.gitignore (100%)
rename src/{ => service}/cadet/Makefile.am (90%)
rename src/{ => service}/cadet/TODO (100%)
rename src/{ => service}/cadet/cadet.conf.in (100%)
rename src/{ => service}/cadet/cadet.h (100%)
rename src/{ => service}/cadet/cadet_api.c (100%)
rename src/{ => service}/cadet/cadet_api_drop_message.c (100%)
rename src/{ => service}/cadet/cadet_api_get_channel.c (100%)
rename src/{ => service}/cadet/cadet_api_get_path.c (100%)
rename src/{ => service}/cadet/cadet_api_helper.c (100%)
rename src/{ => service}/cadet/cadet_api_list_peers.c (100%)
rename src/{ => service}/cadet/cadet_api_list_tunnels.c (100%)
rename src/{ => service}/cadet/cadet_protocol.h (100%)
rename src/{ => service}/cadet/cadet_test_lib.c (100%)
rename src/{ => service}/cadet/cadet_test_lib.h (100%)
rename src/{ => service}/cadet/desirability_table.c (100%)
rename src/{ => service}/cadet/gnunet-service-cadet.c (100%)
rename src/{ => service}/cadet/gnunet-service-cadet.h (100%)
rename src/{ => service}/cadet/gnunet-service-cadet_channel.c (100%)
rename src/{ => service}/cadet/gnunet-service-cadet_channel.h (100%)
rename src/{ => service}/cadet/gnunet-service-cadet_connection.c (100%)
rename src/{ => service}/cadet/gnunet-service-cadet_connection.h (100%)
rename src/{ => service}/cadet/gnunet-service-cadet_core.c (100%)
rename src/{ => service}/cadet/gnunet-service-cadet_core.h (100%)
rename src/{ => service}/cadet/gnunet-service-cadet_dht.c (100%)
rename src/{ => service}/cadet/gnunet-service-cadet_dht.h (100%)
rename src/{ => service}/cadet/gnunet-service-cadet_hello.c (100%)
rename src/{ => service}/cadet/gnunet-service-cadet_hello.h (100%)
rename src/{ => service}/cadet/gnunet-service-cadet_paths.c (100%)
rename src/{ => service}/cadet/gnunet-service-cadet_paths.h (100%)
rename src/{ => service}/cadet/gnunet-service-cadet_peer.c (100%)
rename src/{ => service}/cadet/gnunet-service-cadet_peer.h (100%)
rename src/{ => service}/cadet/gnunet-service-cadet_tunnels.c (100%)
rename src/{ => service}/cadet/gnunet-service-cadet_tunnels.h (100%)
rename src/{ => service}/cadet/loopcheck.sh (100%)
rename src/{ => service}/cadet/meson.build (100%)
rename src/{ => service}/cadet/profiler.conf (100%)
rename src/{ => service}/cadet/run_profiler.sh (100%)
rename src/{ => service}/cadet/small.dat (100%)
rename src/{ => service}/cadet/test_cadet.conf (100%)
rename src/{ => service}/cadet/test_cadet_local_mq.c (100%)
rename src/{ => service}/cadet/valgrind-cadet.supp (100%)
rename src/{ => service}/datacache/.gitignore (100%)
rename src/{ => service}/datacache/Makefile.am (100%)
rename src/{ => service}/datacache/datacache-0001.sql (100%)
rename src/{ => service}/datacache/datacache-drop.sql (100%)
rename src/{ => service}/datacache/datacache.c (100%)
rename src/{ => service}/datacache/datacache.conf (100%)
rename src/{ => service}/datacache/meson.build (100%)
rename src/{ => service}/datacache/plugin_datacache_heap.c (100%)
rename src/{ => service}/datacache/plugin_datacache_postgres.c (100%)
rename src/{ => service}/datacache/plugin_datacache_sqlite.c (100%)
rename src/{ => service}/datacache/plugin_datacache_template.c (100%)
rename src/{ => service}/datacache/test_datacache.c (100%)
rename src/{ => service}/datacache/test_datacache_data_heap.conf (100%)
rename src/{ => service}/datacache/test_datacache_data_postgres.conf (100%)
rename src/{ => service}/datacache/test_datacache_data_sqlite.conf (100%)
rename src/{ => service}/datacache/test_datacache_quota.c (100%)
rename src/{ => service}/datastore/.gitignore (96%)
rename src/{ => service}/datastore/Makefile.am (97%)
rename src/{ => service}/datastore/datastore-0001.sql (100%)
rename src/{ => service}/datastore/datastore-drop.sql (100%)
rename src/{ => service}/datastore/datastore.conf.in (100%)
rename src/{ => service}/datastore/datastore.h (100%)
rename src/{ => service}/datastore/datastore_api.c (100%)
rename src/{ => service}/datastore/gnunet-service-datastore.c (100%)
rename src/{ => service}/datastore/meson.build (100%)
rename src/{ => service}/datastore/perf_datastore_api.c (100%)
rename src/{ => service}/datastore/perf_plugin_datastore.c (100%)
rename src/{ => service}/datastore/perf_plugin_datastore_data_heap.conf (100%)
rename src/{ => service}/datastore/perf_plugin_datastore_data_postgres.conf
(100%)
rename src/{ => service}/datastore/perf_plugin_datastore_data_sqlite.conf
(100%)
rename src/{ => service}/datastore/plugin_datastore_heap.c (100%)
rename src/{ => service}/datastore/plugin_datastore_postgres.c (100%)
rename src/{ => service}/datastore/plugin_datastore_sqlite.c (100%)
rename src/{ => service}/datastore/plugin_datastore_template.c (100%)
rename src/{ => service}/datastore/selectrandom.sql (100%)
rename src/{ => service}/datastore/test_datastore_api.c (100%)
rename src/{ => service}/datastore/test_datastore_api_data_heap.conf (100%)
rename src/{ => service}/datastore/test_datastore_api_data_postgres.conf (100%)
rename src/{ => service}/datastore/test_datastore_api_data_sqlite.conf (100%)
rename src/{ => service}/datastore/test_datastore_api_management.c (100%)
rename src/{ => service}/datastore/test_defaults.conf (100%)
rename src/{ => service}/datastore/test_plugin_datastore.c (100%)
rename src/{ => service}/datastore/test_plugin_datastore_data_heap.conf (100%)
rename src/{ => service}/datastore/test_plugin_datastore_data_postgres.conf
(100%)
rename src/{ => service}/datastore/test_plugin_datastore_data_sqlite.conf
(100%)
rename src/{ => service}/dht/.gitignore (60%)
rename src/{ => service}/dht/Makefile.am (72%)
rename src/{ => service}/dht/dht.conf.in (100%)
rename src/{ => service}/dht/dht.h (100%)
rename src/{ => service}/dht/dht_api.c (100%)
rename src/{ => service}/dht/dht_test_lib.c (100%)
rename src/{ => service}/dht/dht_test_lib.h (100%)
rename src/{ => service}/dht/dhtu_testbed_connect.sh (100%)
rename src/{ => service}/dht/dhtu_testbed_deploy.conf (100%)
rename src/{ => service}/dht/dhtu_testbed_deploy.sh (100%)
rename src/{ => service}/dht/gnunet-service-dht.c (100%)
rename src/{ => service}/dht/gnunet-service-dht.h (100%)
rename src/{ => service}/dht/gnunet-service-dht_clients.c (100%)
rename src/{ => service}/dht/gnunet-service-dht_datacache.c (100%)
rename src/{ => service}/dht/gnunet-service-dht_datacache.h (100%)
rename src/{ => service}/dht/gnunet-service-dht_neighbours.c (100%)
rename src/{ => service}/dht/gnunet-service-dht_neighbours.h (100%)
rename src/{ => service}/dht/gnunet-service-dht_routing.c (100%)
rename src/{ => service}/dht/gnunet-service-dht_routing.h (100%)
rename src/{ => service}/dht/gnunet_dht_profiler.c (100%)
rename src/{ => service}/dht/meson.build (100%)
rename src/{ => service}/dht/plugin_block_dht.c (100%)
rename src/{ => service}/dht/test_dht_2dtorus.conf (100%)
rename src/{ => service}/dht/test_dht_api.c (100%)
rename src/{ => service}/dht/test_dht_api_data.conf (100%)
rename src/{ => service}/dht/test_dht_api_peer1.conf (100%)
rename src/{ => service}/dht/test_dht_line.conf (100%)
rename src/{ => service}/dht/test_dht_monitor.c (100%)
rename src/{ => service}/dht/test_dht_monitor.conf (100%)
rename src/{ => service}/dht/test_dht_multipeer.conf (100%)
rename src/{ => service}/dht/test_dht_multipeer_topology.dat (100%)
rename src/{ => service}/dht/test_dht_tools.conf (100%)
rename src/{ => service}/dht/test_dht_tools.py.in (100%)
rename src/{ => service}/dht/test_dht_tools.sh (100%)
rename src/{ => service}/dht/test_dht_topo.c (100%)
diff --git a/configure.ac b/configure.ac
index 1f6724a83..cdcad80da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1244,8 +1244,15 @@ src/plugin/gnsrecord/Makefile
src/service/Makefile
src/service/arm/Makefile
src/service/arm/arm.conf
+src/service/cadet/Makefile
+src/service/cadet/cadet.conf
src/service/core/Makefile
src/service/core/core.conf
+src/service/datacache/Makefile
+src/service/datastore/Makefile
+src/service/datastore/datastore.conf
+src/service/dht/Makefile
+src/service/dht/dht.conf
src/service/identity/Makefile
src/service/identity/identity.conf
src/service/nat/Makefile
@@ -1266,7 +1273,10 @@ src/rest-plugin/identity/Makefile
src/rest-plugin/rest/Makefile
src/cli/Makefile
src/cli/arm/Makefile
+src/cli/cadet/Makefile
src/cli/core/Makefile
+src/cli/datastore/Makefile
+src/cli/dht/Makefile
src/cli/nat/Makefile
src/cli/nse/Makefile
src/cli/statistics/Makefile
@@ -1278,17 +1288,10 @@ src/contrib/service/abd/abd.conf
src/contrib/service/auction/Makefile
src/contrib/service/rps/Makefile
src/contrib/service/rps/rps.conf
-src/cadet/Makefile
-src/cadet/cadet.conf
src/consensus/Makefile
src/consensus/consensus.conf
src/conversation/Makefile
src/conversation/conversation.conf
-src/datacache/Makefile
-src/datastore/Makefile
-src/datastore/datastore.conf
-src/dht/Makefile
-src/dht/dht.conf
src/dns/Makefile
src/dns/dns.conf
src/exit/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 847b756c2..c4d20c4ba 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,27 +1,15 @@
-src/cadet/cadet_api.c
-src/cadet/cadet_api_drop_message.c
-src/cadet/cadet_api_get_channel.c
-src/cadet/cadet_api_get_path.c
-src/cadet/cadet_api_helper.c
-src/cadet/cadet_api_list_peers.c
-src/cadet/cadet_api_list_tunnels.c
-src/cadet/cadet_test_lib.c
-src/cadet/desirability_table.c
-src/cadet/gnunet-cadet.c
-src/cadet/gnunet-service-cadet.c
-src/cadet/gnunet-service-cadet_channel.c
-src/cadet/gnunet-service-cadet_connection.c
-src/cadet/gnunet-service-cadet_core.c
-src/cadet/gnunet-service-cadet_dht.c
-src/cadet/gnunet-service-cadet_hello.c
-src/cadet/gnunet-service-cadet_paths.c
-src/cadet/gnunet-service-cadet_peer.c
-src/cadet/gnunet-service-cadet_tunnels.c
src/cli/arm/gnunet-arm.c
+src/cli/cadet/gnunet-cadet.c
src/cli/core/gnunet-core.c
+src/cli/datastore/gnunet-datastore.c
+src/cli/dht/gnunet-dht-get.c
+src/cli/dht/gnunet-dht-hello.c
+src/cli/dht/gnunet-dht-monitor.c
+src/cli/dht/gnunet-dht-put.c
src/cli/identity/gnunet-identity.c
src/cli/nat/gnunet-nat.c
src/cli/nse/gnunet-nse.c
+src/cli/statistics/gnunet-statistics.c
src/cli/util/gnunet-base32.c
src/cli/util/gnunet-config-diff.c
src/cli/util/gnunet-config.c
@@ -70,31 +58,6 @@ src/conversation/gnunet_gst_test.c
src/conversation/microphone.c
src/conversation/plugin_gnsrecord_conversation.c
src/conversation/speaker.c
-src/datacache/datacache.c
-src/datacache/plugin_datacache_heap.c
-src/datacache/plugin_datacache_postgres.c
-src/datacache/plugin_datacache_sqlite.c
-src/datacache/plugin_datacache_template.c
-src/datastore/datastore_api.c
-src/datastore/gnunet-datastore.c
-src/datastore/gnunet-service-datastore.c
-src/datastore/plugin_datastore_heap.c
-src/datastore/plugin_datastore_postgres.c
-src/datastore/plugin_datastore_sqlite.c
-src/datastore/plugin_datastore_template.c
-src/dht/dht_api.c
-src/dht/dht_test_lib.c
-src/dht/gnunet-dht-get.c
-src/dht/gnunet-dht-hello.c
-src/dht/gnunet-dht-monitor.c
-src/dht/gnunet-dht-put.c
-src/dht/gnunet-service-dht.c
-src/dht/gnunet-service-dht_clients.c
-src/dht/gnunet-service-dht_datacache.c
-src/dht/gnunet-service-dht_neighbours.c
-src/dht/gnunet-service-dht_routing.c
-src/dht/gnunet_dht_profiler.c
-src/dht/plugin_block_dht.c
src/dns/dns_api.c
src/dns/gnunet-dns-monitor.c
src/dns/gnunet-dns-redirector.c
@@ -160,6 +123,7 @@ src/gns/nss/nss_gns_query.c
src/gns/plugin_block_gns.c
src/gns/plugin_gnsrecord_gns.c
src/gns/plugin_rest_gns.c
+src/hello/gnunet-hello.c
src/hostlist/gnunet-daemon-hostlist.c
src/hostlist/gnunet-daemon-hostlist_client.c
src/hostlist/gnunet-daemon-hostlist_server.c
@@ -174,6 +138,7 @@ src/lib/gnsrecord/gnsrecord_serialization.c
src/lib/gnsrecord/gnunet-gnsrecord-tvg.c
src/lib/gnsrecord/json_gnsrecord.c
src/lib/hello/address.c
+src/lib/hello/gnunet-hello.c
src/lib/hello/hello-ng.c
src/lib/hello/hello-uri.c
src/lib/hello/hello.c
@@ -385,6 +350,24 @@ src/service/arm/arm_api.c
src/service/arm/arm_monitor_api.c
src/service/arm/gnunet-service-arm.c
src/service/arm/mockup-service.c
+src/service/cadet/cadet_api.c
+src/service/cadet/cadet_api_drop_message.c
+src/service/cadet/cadet_api_get_channel.c
+src/service/cadet/cadet_api_get_path.c
+src/service/cadet/cadet_api_helper.c
+src/service/cadet/cadet_api_list_peers.c
+src/service/cadet/cadet_api_list_tunnels.c
+src/service/cadet/cadet_test_lib.c
+src/service/cadet/desirability_table.c
+src/service/cadet/gnunet-service-cadet.c
+src/service/cadet/gnunet-service-cadet_channel.c
+src/service/cadet/gnunet-service-cadet_connection.c
+src/service/cadet/gnunet-service-cadet_core.c
+src/service/cadet/gnunet-service-cadet_dht.c
+src/service/cadet/gnunet-service-cadet_hello.c
+src/service/cadet/gnunet-service-cadet_paths.c
+src/service/cadet/gnunet-service-cadet_peer.c
+src/service/cadet/gnunet-service-cadet_tunnels.c
src/service/core/core_api.c
src/service/core/core_api_cmd_connecting_peers.c
src/service/core/core_api_monitor_peers.c
@@ -392,6 +375,26 @@ src/service/core/gnunet-service-core.c
src/service/core/gnunet-service-core_kx.c
src/service/core/gnunet-service-core_sessions.c
src/service/core/gnunet-service-core_typemap.c
+src/service/datacache/datacache.c
+src/service/datacache/plugin_datacache_heap.c
+src/service/datacache/plugin_datacache_postgres.c
+src/service/datacache/plugin_datacache_sqlite.c
+src/service/datacache/plugin_datacache_template.c
+src/service/datastore/datastore_api.c
+src/service/datastore/gnunet-service-datastore.c
+src/service/datastore/plugin_datastore_heap.c
+src/service/datastore/plugin_datastore_postgres.c
+src/service/datastore/plugin_datastore_sqlite.c
+src/service/datastore/plugin_datastore_template.c
+src/service/dht/dht_api.c
+src/service/dht/dht_test_lib.c
+src/service/dht/gnunet-service-dht.c
+src/service/dht/gnunet-service-dht_clients.c
+src/service/dht/gnunet-service-dht_datacache.c
+src/service/dht/gnunet-service-dht_neighbours.c
+src/service/dht/gnunet-service-dht_routing.c
+src/service/dht/gnunet_dht_profiler.c
+src/service/dht/plugin_block_dht.c
src/service/identity/gnunet-service-identity.c
src/service/identity/identity_api.c
src/service/identity/identity_api_lookup.c
@@ -417,7 +420,6 @@ src/service/peerstore/plugin_peerstore_sqlite.c
src/service/rest/gnunet-rest-server.c
src/service/rest/rest.c
src/service/statistics/gnunet-service-statistics.c
-src/service/statistics/gnunet-statistics.c
src/service/statistics/statistics_api.c
src/service/testing/gnunet-cmds-helper.c
src/service/testing/gnunet-testing.c
diff --git a/src/Makefile.am b/src/Makefile.am
index c7d7b562a..1fc0748c7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,18 +17,14 @@ SUBDIRS = \
rest-plugin \
cli \
contrib \
- datacache \
- datastore \
template \
nat-auto \
- dht \
hostlist \
topology \
regex \
dns \
namecache \
namestore \
- cadet \
set \
seti \
setu \
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index aac883508..cc716dda4 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -4,4 +4,7 @@ SUBDIRS = \
statistics \
core \
nat \
- nse
+ nse \
+ datastore \
+ dht \
+ cadet
diff --git a/src/cli/cadet/.gitignore b/src/cli/cadet/.gitignore
new file mode 100644
index 000000000..bcd7158aa
--- /dev/null
+++ b/src/cli/cadet/.gitignore
@@ -0,0 +1 @@
+gnunet-cadet
diff --git a/src/cli/core/Makefile.am b/src/cli/cadet/Makefile.am
similarity index 65%
copy from src/cli/core/Makefile.am
copy to src/cli/cadet/Makefile.am
index 97abf0db2..fc9caa12c 100644
--- a/src/cli/core/Makefile.am
+++ b/src/cli/cadet/Makefile.am
@@ -1,24 +1,26 @@
# This Makefile.am is in the public domain
AM_CPPFLAGS = -I$(top_srcdir)/src/include
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-plugindir = $(libdir)/gnunet
-
-libexecdir= $(pkglibdir)/libexec/
-
if USE_COVERAGE
AM_CFLAGS = --coverage -O0
XLIB = -lgcov
endif
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+plugindir = $(libdir)/gnunet
+
+AM_CLFAGS = -g
+
bin_PROGRAMS = \
- gnunet-core
+ gnunet-cadet
-gnunet_core_SOURCES = \
- gnunet-core.c
-gnunet_core_LDADD = \
- $(top_builddir)/src/service/core/libgnunetcore.la \
+gnunet_cadet_SOURCES = \
+ gnunet-cadet.c
+gnunet_cadet_LDADD = \
+ $(top_builddir)/src/service/cadet/libgnunetcadet.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
-gnunet_core_LDFLAGS = \
+gnunet_cadet_LDFLAGS = \
$(GN_LIBINTL)
diff --git a/src/cadet/gnunet-cadet.c b/src/cli/cadet/gnunet-cadet.c
similarity index 99%
rename from src/cadet/gnunet-cadet.c
rename to src/cli/cadet/gnunet-cadet.c
index 9b7538ae7..c77fb914c 100644
--- a/src/cadet/gnunet-cadet.c
+++ b/src/cli/cadet/gnunet-cadet.c
@@ -27,7 +27,7 @@
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_cadet_service.h"
-#include "cadet.h"
+#include "../../service/cadet/cadet.h" // FIXME Smell: this should not be
shared like this.
#define STREAM_BUFFER_SIZE 1024 // Pakets
diff --git a/src/cli/datastore/.gitignore b/src/cli/datastore/.gitignore
new file mode 100644
index 000000000..ddb105175
--- /dev/null
+++ b/src/cli/datastore/.gitignore
@@ -0,0 +1 @@
+gnunet-datastore
diff --git a/src/cli/core/Makefile.am b/src/cli/datastore/Makefile.am
similarity index 54%
copy from src/cli/core/Makefile.am
copy to src/cli/datastore/Makefile.am
index 97abf0db2..91098db96 100644
--- a/src/cli/core/Makefile.am
+++ b/src/cli/datastore/Makefile.am
@@ -1,24 +1,24 @@
# This Makefile.am is in the public domain
AM_CPPFLAGS = -I$(top_srcdir)/src/include
-pkgcfgdir= $(pkgdatadir)/config.d/
-
plugindir = $(libdir)/gnunet
+pkgcfgdir= $(pkgdatadir)/config.d/
+
libexecdir= $(pkglibdir)/libexec/
if USE_COVERAGE
AM_CFLAGS = --coverage -O0
- XLIB = -lgcov
+ XLIBS = -lgcov
endif
+
bin_PROGRAMS = \
- gnunet-core
+ gnunet-datastore
-gnunet_core_SOURCES = \
- gnunet-core.c
-gnunet_core_LDADD = \
- $(top_builddir)/src/service/core/libgnunetcore.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-gnunet_core_LDFLAGS = \
+gnunet_datastore_SOURCES = \
+ gnunet-datastore.c
+gnunet_datastore_LDADD = \
+ $(top_builddir)/src/service/datastore/libgnunetdatastore.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
$(GN_LIBINTL)
diff --git a/src/datastore/gnunet-datastore.c
b/src/cli/datastore/gnunet-datastore.c
similarity index 100%
rename from src/datastore/gnunet-datastore.c
rename to src/cli/datastore/gnunet-datastore.c
diff --git a/src/cli/dht/.gitignore b/src/cli/dht/.gitignore
new file mode 100644
index 000000000..3b6564ef0
--- /dev/null
+++ b/src/cli/dht/.gitignore
@@ -0,0 +1,5 @@
+gnunet-dht-get
+gnunet-dht-monitor
+gnunet-dht-profiler
+gnunet-dht-put
+gnunet-dht-hello
diff --git a/src/cli/dht/Makefile.am b/src/cli/dht/Makefile.am
new file mode 100644
index 000000000..f026b5270
--- /dev/null
+++ b/src/cli/dht/Makefile.am
@@ -0,0 +1,52 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+plugindir = $(libdir)/gnunet
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+if USE_COVERAGE
+ AM_CFLAGS = --coverage -O0
+ XLIB = -lgcov
+endif
+
+bin_PROGRAMS = \
+ gnunet-dht-monitor \
+ gnunet-dht-get \
+ gnunet-dht-put \
+ gnunet-dht-hello
+
+gnunet_dht_get_SOURCES = \
+ gnunet-dht-get.c
+gnunet_dht_get_LDADD = \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la
+gnunet_dht_get_LDFLAGS = \
+ $(GN_LIBINTL)
+
+gnunet_dht_hello_SOURCES = \
+ gnunet-dht-hello.c
+gnunet_dht_hello_LDADD = \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la
+gnunet_dht_hello_LDFLAGS = \
+ $(GN_LIBINTL)
+
+gnunet_dht_put_SOURCES = \
+ gnunet-dht-put.c
+gnunet_dht_put_LDADD = \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la
+gnunet_dht_put_LDFLAGS = \
+ $(GN_LIBINTL)
+
+gnunet_dht_monitor_SOURCES = \
+ gnunet-dht-monitor.c
+gnunet_dht_monitor_LDADD = \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la
+gnunet_dht_monitor_LDFLAGS = \
+ $(GN_LIBINTL)
+
diff --git a/src/dht/gnunet-dht-get.c b/src/cli/dht/gnunet-dht-get.c
similarity index 100%
rename from src/dht/gnunet-dht-get.c
rename to src/cli/dht/gnunet-dht-get.c
diff --git a/src/dht/gnunet-dht-hello.c b/src/cli/dht/gnunet-dht-hello.c
similarity index 100%
rename from src/dht/gnunet-dht-hello.c
rename to src/cli/dht/gnunet-dht-hello.c
diff --git a/src/dht/gnunet-dht-monitor.c b/src/cli/dht/gnunet-dht-monitor.c
similarity index 100%
rename from src/dht/gnunet-dht-monitor.c
rename to src/cli/dht/gnunet-dht-monitor.c
diff --git a/src/dht/gnunet-dht-put.c b/src/cli/dht/gnunet-dht-put.c
similarity index 100%
rename from src/dht/gnunet-dht-put.c
rename to src/cli/dht/gnunet-dht-put.c
diff --git a/src/contrib/service/rps/Makefile.am
b/src/contrib/service/rps/Makefile.am
index 34532d67c..28aa3e050 100644
--- a/src/contrib/service/rps/Makefile.am
+++ b/src/contrib/service/rps/Makefile.am
@@ -62,7 +62,7 @@ gnunet_service_rps_LDADD = \
libgnunetrps.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
- $(top_builddir)/src/cadet/libgnunetcadet.la \
+ $(top_builddir)/src/service/cadet/libgnunetcadet.la \
$(top_builddir)/src/service/nse/libgnunetnse.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/service/core/libgnunetcore.la \
diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am
index 366c4a199..4fca1ee79 100644
--- a/src/conversation/Makefile.am
+++ b/src/conversation/Makefile.am
@@ -183,7 +183,7 @@ gnunet_service_conversation_LDADD = \
libgnunetconversation.la \
libgnunetspeaker.la \
libgnunetmicrophone.la \
- $(top_builddir)/src/cadet/libgnunetcadet.la \
+ $(top_builddir)/src/service/cadet/libgnunetcadet.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(INTLLIBS)
diff --git a/src/exit/Makefile.am b/src/exit/Makefile.am
index c2dba0927..65ea493dc 100644
--- a/src/exit/Makefile.am
+++ b/src/exit/Makefile.am
@@ -30,9 +30,9 @@ gnunet_helper_exit_SOURCES = \
gnunet_daemon_exit_SOURCES = \
gnunet-daemon-exit.c exit.h
gnunet_daemon_exit_LDADD = \
- $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/cadet/libgnunetcadet.la \
+ $(top_builddir)/src/service/cadet/libgnunetcadet.la \
$(top_builddir)/src/regex/libgnunetregex.la \
$(GN_LIBINTL)
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 8616c0474..38d75c0dc 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -42,7 +42,7 @@ libgnunetfs_la_SOURCES = \
meta_data.c
libgnunetfs_la_LIBADD = \
- $(top_builddir)/src/datastore/libgnunetdatastore.la \
+ $(top_builddir)/src/service/datastore/libgnunetdatastore.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(GN_LIBINTL) $(XLIB) $(LIBGCRYPT_LIBS) -lunistring
@@ -173,11 +173,11 @@ gnunet_service_fs_SOURCES = \
gnunet-service-fs_cadet_server.c
gnunet_service_fs_LDADD = \
libgnunetfs.la \
- $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
$(top_builddir)/src/lib/block/libgnunetblock.la \
- $(top_builddir)/src/datastore/libgnunetdatastore.la \
+ $(top_builddir)/src/service/datastore/libgnunetdatastore.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/cadet/libgnunetcadet.la \
+ $(top_builddir)/src/service/cadet/libgnunetcadet.la \
$(top_builddir)/src/service/core/libgnunetcore.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index d739f8131..c42e5e6d4 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -204,7 +204,7 @@ gnunet_service_gns_LDADD = \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/dns/libgnunetdns.la \
- $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
$(top_builddir)/src/namecache/libgnunetnamecache.la \
$(LIBIDN) $(LIBIDN2) \
$(GN_LIBINTL)
diff --git a/src/hello/gnunet-hello.c b/src/hello/gnunet-hello.c
deleted file mode 100644
index 7f43e77b9..000000000
--- a/src/hello/gnunet-hello.c
+++ /dev/null
@@ -1,427 +0,0 @@
-/*
- This file is part of GNUnet
- Copyright (C) 2012 GNUnet e.V.
-
- GNUnet is free software: you can redistribute it and/or modify it
- under the terms of the GNU Affero General Public License as published
- by the Free Software Foundation, either version 3 of the License,
- or (at your option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
- SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file hello/gnunet-hello.c
- * @brief change HELLO files to never expire
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include "gnunet_protocols.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_hello_uri_lib.h"
-#include "gnunet_transport_plugin.h"
-
-/**
- * Closure for #add_to_buf().
- */
-struct AddContext
-{
- /**
- * Where to add.
- */
- char *buf;
-
- /**
- * Maximum number of bytes left
- */
- size_t max;
-
- /**
- * Number of bytes added so far.
- */
- size_t ret;
-
- struct GNUNET_HELLO_Builder *builder;
-};
-
-/**
- * Entry in doubly-linked list of all of our plugins.
- */
-struct TransportPlugin
-{
- /**
- * This is a doubly-linked list.
- */
- struct TransportPlugin *next;
-
- /**
- * This is a doubly-linked list.
- */
- struct TransportPlugin *prev;
-
- /**
- * API of the transport as returned by the plugin's
- * initialization function.
- */
- struct GNUNET_TRANSPORT_PluginFunctions *api;
-
- /**
- * Short name for the plugin (e.g. "tcp").
- */
- char *short_name;
-
- /**
- * Name of the library (e.g. "gnunet_plugin_transport_tcp").
- */
- char *lib_name;
-
- /**
- * Environment this transport service is using
- * for this plugin.
- */
- struct GNUNET_TRANSPORT_PluginEnvironment env;
-};
-
-static int address_count;
-
-/**
- * Our private key.
- */
-static struct GNUNET_CRYPTO_EddsaPrivateKey *my_private_key;
-
-/**
- * Local peer own ID.
- */
-struct GNUNET_PeerIdentity my_full_id;
-
-/**
- * The file with hello in old style which we like to replace with the new one.
- */
-static char *hello_file;
-
-/**
- * Head of DLL of all loaded plugins.
- */
-static struct TransportPlugin *plugins_head;
-
-/**
- * Head of DLL of all loaded plugins.
- */
-static struct TransportPlugin *plugins_tail;
-
-static void
-plugins_load (const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
- struct TransportPlugin *plug;
- struct TransportPlugin *next;
- char *libname;
- char *plugs;
- char *pos;
-
- if (NULL != plugins_head)
- return; /* already loaded */
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (cfg, "TRANSPORT", "PLUGINS",
- &plugs))
- return;
- fprintf (stdout,"Starting transport plugins `%s'\n",
- plugs);
- for (pos = strtok (plugs, " "); pos != NULL; pos = strtok (NULL, " "))
- {
- fprintf (stdout,"Loading `%s' transport plugin\n",
- pos);
- GNUNET_asprintf (&libname, "libgnunet_plugin_transport_%s", pos);
- plug = GNUNET_new (struct TransportPlugin);
- plug->short_name = GNUNET_strdup (pos);
- plug->lib_name = libname;
- plug->env.cfg = cfg;
- plug->env.cls = plug->short_name;
- GNUNET_CONTAINER_DLL_insert (plugins_head, plugins_tail, plug);
- }
- GNUNET_free (plugs);
- next = plugins_head;
- while (next != NULL)
- {
- plug = next;
- next = plug->next;
- plug->api = GNUNET_PLUGIN_load (plug->lib_name, &plug->env);
- if (plug->api == NULL)
- {
- fprintf (stdout,"Failed to load transport plugin for `%s'\n",
- plug->lib_name);
- GNUNET_CONTAINER_DLL_remove (plugins_head, plugins_tail, plug);
- GNUNET_free (plug->short_name);
- GNUNET_free (plug->lib_name);
- GNUNET_free (plug);
- }
- }
-}
-
-
-static int
-add_to_builder (void *cls,
- const struct GNUNET_HELLO_Address *address,
- struct GNUNET_TIME_Absolute expiration)
-{
- struct GNUNET_HELLO_Builder *builder= cls;
- struct TransportPlugin *pos = plugins_head;
- const char *addr;
- char *uri;
-
- while (NULL != pos)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "short_name: %s transport_name: %s\n",
- pos->short_name,
- address->transport_name);
- if (0 == strcmp (address->transport_name, pos->short_name))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "short_name: %s transport_name: %s are the same\n",
- pos->short_name,
- address->transport_name);
- addr = strchr (strchr (pos->api->address_to_string (pos, address,
address->address_length), '.')+1, '.') + 1;
- }
- pos = pos->next;
- }
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Hello address string: %s\n",
- addr);
- GNUNET_asprintf (&uri, "%s://%s", address->transport_name, addr);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Hello address uri string: %s\n",
- uri);
- GNUNET_HELLO_builder_add_address (builder,
- uri);
-}
-
-
-/**
- * Add the given address with infinite expiration to the buffer.
- *
- * @param cls closure
- * @param address address to add
- * @param expiration old expiration
- * @return #GNUNET_OK keep iterating
- */
-static int
-add_to_buf (void *cls,
- const struct GNUNET_HELLO_Address *address,
- struct GNUNET_TIME_Absolute expiration)
-{
- struct AddContext *ac = cls;
- size_t ret;
-
- ret = GNUNET_HELLO_add_address (address,
- GNUNET_TIME_UNIT_FOREVER_ABS,
- ac->buf,
- ac->max);
-
- ac->buf += ret;
- ac->max -= ret;
- ac->ret += ret;
- address_count++;
- return GNUNET_OK;
-}
-
-
-/**
- * Add addresses from the address list to the HELLO.
- *
- * @param cls the HELLO with the addresses to add
- * @param max maximum space available
- * @param buf where to add the addresses
- * @return number of bytes added, 0 to terminate
- */
-static ssize_t
-add_from_hello (void *cls, size_t max, void *buf)
-{
- struct GNUNET_HELLO_Message **orig = cls;
- struct AddContext ac;
-
- if (NULL == *orig)
- return GNUNET_SYSERR; /* already done */
- ac.buf = buf;
- ac.max = max;
- ac.ret = 0;
- GNUNET_assert (
- NULL ==
- GNUNET_HELLO_iterate_addresses (*orig, GNUNET_NO, &add_to_buf, &ac));
- *orig = NULL;
- return ac.ret;
-}
-
-
-/**
- * Main function that will be run without the scheduler.
- *
- * @param cls closure
- * @param args remaining command-line arguments
- * @param cfgfile name of the configuration file used (for saving, can be
NULL!)
- * @param c configuration
- */
-static void
-run (void *cls,
- char *const *args,
- const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *c)
-{
- struct GNUNET_DISK_FileHandle *fh;
- struct GNUNET_HELLO_Message *orig;
- struct GNUNET_HELLO_Message *result;
- struct GNUNET_PeerIdentity pid;
- uint64_t fsize;
- ssize_t size_written;
- struct GNUNET_HELLO_Builder *builder;
- char *url;
- const struct GNUNET_MessageHeader *msg;
- struct GNUNET_MQ_Envelope *env;
-
- plugins_load (c);
- address_count = 0;
-
- my_private_key =
- GNUNET_CRYPTO_eddsa_key_create_from_configuration (c);
- GNUNET_CRYPTO_eddsa_key_get_public (my_private_key,
- &my_full_id.public_key);
- fprintf (stdout,"We are peer %s\n", GNUNET_i2s (&my_full_id));
-
- GNUNET_log_setup ("gnunet-hello", "DEBUG", NULL);
-
- if (GNUNET_OK !=
- GNUNET_DISK_file_size (hello_file, &fsize, GNUNET_YES, GNUNET_YES))
- {
- fprintf (stderr,
- _ ("Error accessing file `%s': %s\n"),
- hello_file,
- strerror (errno));
- return;
- }
- if (fsize > 65536)
- {
- fprintf (stderr, _ ("File `%s' is too big to be a HELLO\n"), hello_file);
- return;
- }
- if (fsize < sizeof(struct GNUNET_MessageHeader))
- {
- fprintf (stderr, _ ("File `%s' is too small to be a HELLO\n"), hello_file);
- return;
- }
- fh = GNUNET_DISK_file_open (hello_file,
- GNUNET_DISK_OPEN_READ,
- GNUNET_DISK_PERM_USER_READ);
- if (NULL == fh)
- {
- fprintf (stderr,
- _ ("Error opening file `%s': %s\n"),
- hello_file,
- strerror (errno));
- return;
- }
- {
- char buf[fsize] GNUNET_ALIGN;
-
- GNUNET_assert (fsize == GNUNET_DISK_file_read (fh, buf, fsize));
- GNUNET_assert (GNUNET_OK == GNUNET_DISK_file_close (fh));
- orig = (struct GNUNET_HELLO_Message *) buf;
- if ((fsize < GNUNET_HELLO_size (orig)) ||
- (GNUNET_OK != GNUNET_HELLO_get_id (orig, &pid)))
- {
- fprintf (stderr,
- _ ("Did not find well-formed HELLO in file `%s'\n"),
- hello_file);
- return;
- }
- {
- char *pids;
-
- pids = GNUNET_CRYPTO_eddsa_public_key_to_string (&my_full_id.public_key);
- fprintf (stdout, "Processing HELLO for peer `%s'\n", pids);
- GNUNET_free (pids);
- }
- /* result = GNUNET_HELLO_create (&pid.public_key, */
- /* &add_from_hello, */
- /* &orig, */
- /* GNUNET_HELLO_is_friend_only (orig)); */
-
- builder = GNUNET_HELLO_builder_new (&my_full_id);
- GNUNET_assert (
- NULL ==
- GNUNET_HELLO_iterate_addresses ((const struct GNUNET_HELLO_Message *)
orig, GNUNET_NO, &add_to_builder, builder));
- url = GNUNET_HELLO_builder_to_url (builder, my_private_key);
- fprintf (stdout,"url: %s\n", url);
- env = GNUNET_HELLO_builder_to_env (builder,
- my_private_key,
- GNUNET_TIME_UNIT_FOREVER_REL);
- msg = GNUNET_MQ_env_get_msg (env);
- //GNUNET_assert (NULL != result);
- GNUNET_assert (NULL != msg);
- fh =
- GNUNET_DISK_file_open (hello_file,
- GNUNET_DISK_OPEN_WRITE |
GNUNET_DISK_OPEN_TRUNCATE,
- GNUNET_DISK_PERM_USER_READ
- | GNUNET_DISK_PERM_USER_WRITE);
- if (NULL == fh)
- {
- fprintf (stderr,
- _ ("Error opening file `%s': %s\n"),
- hello_file,
- strerror (errno));
- GNUNET_free (result);
- return;
- }
- //fsize = GNUNET_HELLO_size (result);
- size_written = GNUNET_DISK_file_write (fh, msg, ntohs (msg->size));
- if (ntohs (msg->size) != size_written)
- {
- fprintf (stderr,
- _ ("Error writing HELLO to file `%s': %s expected size %u size
written %u\n"),
- hello_file,
- strerror (errno));
- (void) GNUNET_DISK_file_close (fh);
- return;
- }
- GNUNET_assert (GNUNET_OK == GNUNET_DISK_file_close (fh));
- }
- fprintf (stderr,
- _ ("Modified %u addresses, wrote %u bytes\n"),
- address_count,
- (unsigned int) ntohs (msg->size));
- GNUNET_HELLO_builder_free (builder);
-}
-
-
-int
-main (int argc, char *argv[])
-{
- struct GNUNET_GETOPT_CommandLineOption options[] =
- { GNUNET_GETOPT_option_string ('h',
- "hello-file",
- "HELLO_FILE",
- gettext_noop ("Hello file to read"),
- &hello_file),
- GNUNET_GETOPT_OPTION_END };
- int ret;
-
- ret = (GNUNET_OK ==
- GNUNET_PROGRAM_run2 (argc,
- argv,
- "gnunet-peerinfo",
- gettext_noop ("Print information about peers."),
- options,
- &run,
- NULL,
- GNUNET_YES));
- return ret;
-}
-
-
-/* end of gnunet-hello.c */
diff --git a/src/messenger/Makefile.am b/src/messenger/Makefile.am
index 60b2314ac..e02414541 100644
--- a/src/messenger/Makefile.am
+++ b/src/messenger/Makefile.am
@@ -53,7 +53,7 @@ libgnunetmessenger_la_SOURCES = \
messenger_api_room.c messenger_api_room.h
libgnunetmessenger_la_LIBADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/cadet/libgnunetcadet.la \
+ $(top_builddir)/src/service/cadet/libgnunetcadet.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(XLIB) \
$(LTLIBINTL)
@@ -93,7 +93,7 @@ gnunet_service_messenger_SOURCES = \
gnunet_service_messenger_LDADD = \
libgnunetmessenger.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/cadet/libgnunetcadet.la \
+ $(top_builddir)/src/service/cadet/libgnunetcadet.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(GN_LIBINTL)
diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am
index 8a171ec0e..659ede7f8 100644
--- a/src/pt/Makefile.am
+++ b/src/pt/Makefile.am
@@ -21,8 +21,8 @@ gnunet_daemon_pt_SOURCES = \
gnunet-daemon-pt.c
gnunet_daemon_pt_LDADD = \
$(top_builddir)/src/vpn/libgnunetvpn.la \
- $(top_builddir)/src/cadet/libgnunetcadet.la \
- $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/service/cadet/libgnunetcadet.la \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
$(top_builddir)/src/dns/libgnunetdns.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
diff --git a/src/regex/Makefile.am b/src/regex/Makefile.am
index 57f48db44..14cdb054b 100644
--- a/src/regex/Makefile.am
+++ b/src/regex/Makefile.am
@@ -32,7 +32,7 @@ gnunet_service_regex_SOURCES = \
$(REGEX_INTERNAL) gnunet-service-regex.c
gnunet_service_regex_LDADD = -lm \
libgnunetregexblock.la \
- $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(GN_LIBINTL)
@@ -88,7 +88,7 @@ libgnunet_plugin_block_regex_la_LDFLAGS = \
#gnunet_regex_simulation_profiler_LDADD = \
# libgnunetregexblock.la \
# $(top_builddir)/src/lib/util/libgnunetutil.la \
-# $(top_builddir)/src/dht/libgnunetdht.la \
+# $(top_builddir)/src/service/dht/libgnunetdht.la \
# $(top_builddir)/src/lib/block/libgnunetblock.la \
# $(top_builddir)/src/service/statistics/libgnunetstatistics.la
#endif
@@ -99,7 +99,7 @@ noinst_PROGRAMS = $(noinst_mysql_progs) \
perf_regex_SOURCES = \
$(REGEX_INTERNAL_TEST) perf-regex.c
perf_regex_LDADD = -lm \
- $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
libgnunetregexblock.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la
@@ -109,7 +109,7 @@ perf_regex_LDFLAGS = \
gnunet_daemon_regexprofiler_SOURCES = \
$(REGEX_INTERNAL_TEST) gnunet-daemon-regexprofiler.c
gnunet_daemon_regexprofiler_LDADD = -lm \
- $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
libgnunetregexblock.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
@@ -132,7 +132,7 @@ endif
test_regex_eval_api_SOURCES = \
$(REGEX_INTERNAL_TEST) test_regex_eval_api.c
test_regex_eval_api_LDADD = -lm \
- $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
libgnunetregexblock.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
@@ -155,14 +155,14 @@ test_regex_iterate_api_SOURCES = \
$(REGEX_INTERNAL) test_regex_iterate_api.c
test_regex_iterate_api_LDADD = -lm \
libgnunetregexblock.la \
- $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_regex_proofs_SOURCES = \
$(REGEX_INTERNAL_TEST) test_regex_proofs.c
test_regex_proofs_LDADD = -lm \
- $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
libgnunetregexblock.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
@@ -170,7 +170,7 @@ test_regex_proofs_LDADD = -lm \
test_regex_graph_api_SOURCES = \
$(REGEX_INTERNAL_TEST) test_regex_graph_api.c
test_regex_graph_api_LDADD = -lm \
- $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
libgnunetregexblock.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
diff --git a/src/scalarproduct/Makefile.am b/src/scalarproduct/Makefile.am
index 9ad63b309..77a17ec20 100644
--- a/src/scalarproduct/Makefile.am
+++ b/src/scalarproduct/Makefile.am
@@ -38,7 +38,7 @@ gnunet_service_scalarproduct_alice_SOURCES = \
gnunet-service-scalarproduct_alice.c
gnunet_service_scalarproduct_alice_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/cadet/libgnunetcadet.la \
+ $(top_builddir)/src/service/cadet/libgnunetcadet.la \
$(top_builddir)/src/seti/libgnunetseti.la \
$(LIBGCRYPT_LIBS) \
-lgcrypt \
@@ -49,7 +49,7 @@ gnunet_service_scalarproduct_bob_SOURCES = \
gnunet-service-scalarproduct_bob.c
gnunet_service_scalarproduct_bob_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/cadet/libgnunetcadet.la \
+ $(top_builddir)/src/service/cadet/libgnunetcadet.la \
$(top_builddir)/src/seti/libgnunetseti.la \
$(LIBGCRYPT_LIBS) \
-lgcrypt \
@@ -60,7 +60,7 @@ gnunet_service_scalarproduct_ecc_alice_SOURCES = \
gnunet-service-scalarproduct-ecc_alice.c
gnunet_service_scalarproduct_ecc_alice_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/cadet/libgnunetcadet.la \
+ $(top_builddir)/src/service/cadet/libgnunetcadet.la \
$(top_builddir)/src/seti/libgnunetseti.la \
$(LIBGCRYPT_LIBS) \
-lsodium \
@@ -72,7 +72,7 @@ gnunet_service_scalarproduct_ecc_bob_SOURCES = \
gnunet-service-scalarproduct-ecc_bob.c
gnunet_service_scalarproduct_ecc_bob_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/cadet/libgnunetcadet.la \
+ $(top_builddir)/src/service/cadet/libgnunetcadet.la \
$(top_builddir)/src/seti/libgnunetseti.la \
$(LIBGCRYPT_LIBS) \
-lsodium \
diff --git a/src/service/Makefile.am b/src/service/Makefile.am
index 5c92e730e..aa87eb34a 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -9,4 +9,8 @@ SUBDIRS = \
core \
nse \
identity \
- rest
+ rest \
+ datacache \
+ datastore \
+ dht \
+ cadet
diff --git a/src/cadet/.gitignore b/src/service/cadet/.gitignore
similarity index 100%
rename from src/cadet/.gitignore
rename to src/service/cadet/.gitignore
diff --git a/src/cadet/Makefile.am b/src/service/cadet/Makefile.am
similarity index 90%
rename from src/cadet/Makefile.am
rename to src/service/cadet/Makefile.am
index 217c4847e..0046ffc70 100644
--- a/src/cadet/Makefile.am
+++ b/src/service/cadet/Makefile.am
@@ -20,9 +20,6 @@ AM_CLFAGS = -g
libexec_PROGRAMS = \
gnunet-service-cadet
-bin_PROGRAMS = \
- gnunet-cadet
-
lib_LTLIBRARIES = \
libgnunetcadet.la
@@ -42,14 +39,6 @@ libgnunetcadet_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) \
-version-info 7:0:0
-gnunet_cadet_SOURCES = \
- gnunet-cadet.c
-gnunet_cadet_LDADD = \
- libgnunetcadet.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-gnunet_cadet_LDFLAGS = \
- $(GN_LIBINTL)
-
gnunet_service_cadet_SOURCES = \
gnunet-service-cadet.c gnunet-service-cadet.h \
gnunet-service-cadet_channel.c gnunet-service-cadet_channel.h \
@@ -63,7 +52,7 @@ gnunet_service_cadet_SOURCES = \
gnunet_service_cadet_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/service/core/libgnunetcore.la \
- $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/service/transport/libgnunettransportapplication.la \
$(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
diff --git a/src/cadet/TODO b/src/service/cadet/TODO
similarity index 100%
rename from src/cadet/TODO
rename to src/service/cadet/TODO
diff --git a/src/cadet/cadet.conf.in b/src/service/cadet/cadet.conf.in
similarity index 100%
rename from src/cadet/cadet.conf.in
rename to src/service/cadet/cadet.conf.in
diff --git a/src/cadet/cadet.h b/src/service/cadet/cadet.h
similarity index 100%
rename from src/cadet/cadet.h
rename to src/service/cadet/cadet.h
diff --git a/src/cadet/cadet_api.c b/src/service/cadet/cadet_api.c
similarity index 100%
rename from src/cadet/cadet_api.c
rename to src/service/cadet/cadet_api.c
diff --git a/src/cadet/cadet_api_drop_message.c
b/src/service/cadet/cadet_api_drop_message.c
similarity index 100%
rename from src/cadet/cadet_api_drop_message.c
rename to src/service/cadet/cadet_api_drop_message.c
diff --git a/src/cadet/cadet_api_get_channel.c
b/src/service/cadet/cadet_api_get_channel.c
similarity index 100%
rename from src/cadet/cadet_api_get_channel.c
rename to src/service/cadet/cadet_api_get_channel.c
diff --git a/src/cadet/cadet_api_get_path.c
b/src/service/cadet/cadet_api_get_path.c
similarity index 100%
rename from src/cadet/cadet_api_get_path.c
rename to src/service/cadet/cadet_api_get_path.c
diff --git a/src/cadet/cadet_api_helper.c b/src/service/cadet/cadet_api_helper.c
similarity index 100%
rename from src/cadet/cadet_api_helper.c
rename to src/service/cadet/cadet_api_helper.c
diff --git a/src/cadet/cadet_api_list_peers.c
b/src/service/cadet/cadet_api_list_peers.c
similarity index 100%
rename from src/cadet/cadet_api_list_peers.c
rename to src/service/cadet/cadet_api_list_peers.c
diff --git a/src/cadet/cadet_api_list_tunnels.c
b/src/service/cadet/cadet_api_list_tunnels.c
similarity index 100%
rename from src/cadet/cadet_api_list_tunnels.c
rename to src/service/cadet/cadet_api_list_tunnels.c
diff --git a/src/cadet/cadet_protocol.h b/src/service/cadet/cadet_protocol.h
similarity index 100%
rename from src/cadet/cadet_protocol.h
rename to src/service/cadet/cadet_protocol.h
diff --git a/src/cadet/cadet_test_lib.c b/src/service/cadet/cadet_test_lib.c
similarity index 100%
rename from src/cadet/cadet_test_lib.c
rename to src/service/cadet/cadet_test_lib.c
diff --git a/src/cadet/cadet_test_lib.h b/src/service/cadet/cadet_test_lib.h
similarity index 100%
rename from src/cadet/cadet_test_lib.h
rename to src/service/cadet/cadet_test_lib.h
diff --git a/src/cadet/desirability_table.c
b/src/service/cadet/desirability_table.c
similarity index 100%
rename from src/cadet/desirability_table.c
rename to src/service/cadet/desirability_table.c
diff --git a/src/cadet/gnunet-service-cadet.c
b/src/service/cadet/gnunet-service-cadet.c
similarity index 100%
rename from src/cadet/gnunet-service-cadet.c
rename to src/service/cadet/gnunet-service-cadet.c
diff --git a/src/cadet/gnunet-service-cadet.h
b/src/service/cadet/gnunet-service-cadet.h
similarity index 100%
rename from src/cadet/gnunet-service-cadet.h
rename to src/service/cadet/gnunet-service-cadet.h
diff --git a/src/cadet/gnunet-service-cadet_channel.c
b/src/service/cadet/gnunet-service-cadet_channel.c
similarity index 100%
rename from src/cadet/gnunet-service-cadet_channel.c
rename to src/service/cadet/gnunet-service-cadet_channel.c
diff --git a/src/cadet/gnunet-service-cadet_channel.h
b/src/service/cadet/gnunet-service-cadet_channel.h
similarity index 100%
rename from src/cadet/gnunet-service-cadet_channel.h
rename to src/service/cadet/gnunet-service-cadet_channel.h
diff --git a/src/cadet/gnunet-service-cadet_connection.c
b/src/service/cadet/gnunet-service-cadet_connection.c
similarity index 100%
rename from src/cadet/gnunet-service-cadet_connection.c
rename to src/service/cadet/gnunet-service-cadet_connection.c
diff --git a/src/cadet/gnunet-service-cadet_connection.h
b/src/service/cadet/gnunet-service-cadet_connection.h
similarity index 100%
rename from src/cadet/gnunet-service-cadet_connection.h
rename to src/service/cadet/gnunet-service-cadet_connection.h
diff --git a/src/cadet/gnunet-service-cadet_core.c
b/src/service/cadet/gnunet-service-cadet_core.c
similarity index 100%
rename from src/cadet/gnunet-service-cadet_core.c
rename to src/service/cadet/gnunet-service-cadet_core.c
diff --git a/src/cadet/gnunet-service-cadet_core.h
b/src/service/cadet/gnunet-service-cadet_core.h
similarity index 100%
rename from src/cadet/gnunet-service-cadet_core.h
rename to src/service/cadet/gnunet-service-cadet_core.h
diff --git a/src/cadet/gnunet-service-cadet_dht.c
b/src/service/cadet/gnunet-service-cadet_dht.c
similarity index 100%
rename from src/cadet/gnunet-service-cadet_dht.c
rename to src/service/cadet/gnunet-service-cadet_dht.c
diff --git a/src/cadet/gnunet-service-cadet_dht.h
b/src/service/cadet/gnunet-service-cadet_dht.h
similarity index 100%
rename from src/cadet/gnunet-service-cadet_dht.h
rename to src/service/cadet/gnunet-service-cadet_dht.h
diff --git a/src/cadet/gnunet-service-cadet_hello.c
b/src/service/cadet/gnunet-service-cadet_hello.c
similarity index 100%
rename from src/cadet/gnunet-service-cadet_hello.c
rename to src/service/cadet/gnunet-service-cadet_hello.c
diff --git a/src/cadet/gnunet-service-cadet_hello.h
b/src/service/cadet/gnunet-service-cadet_hello.h
similarity index 100%
rename from src/cadet/gnunet-service-cadet_hello.h
rename to src/service/cadet/gnunet-service-cadet_hello.h
diff --git a/src/cadet/gnunet-service-cadet_paths.c
b/src/service/cadet/gnunet-service-cadet_paths.c
similarity index 100%
rename from src/cadet/gnunet-service-cadet_paths.c
rename to src/service/cadet/gnunet-service-cadet_paths.c
diff --git a/src/cadet/gnunet-service-cadet_paths.h
b/src/service/cadet/gnunet-service-cadet_paths.h
similarity index 100%
rename from src/cadet/gnunet-service-cadet_paths.h
rename to src/service/cadet/gnunet-service-cadet_paths.h
diff --git a/src/cadet/gnunet-service-cadet_peer.c
b/src/service/cadet/gnunet-service-cadet_peer.c
similarity index 100%
rename from src/cadet/gnunet-service-cadet_peer.c
rename to src/service/cadet/gnunet-service-cadet_peer.c
diff --git a/src/cadet/gnunet-service-cadet_peer.h
b/src/service/cadet/gnunet-service-cadet_peer.h
similarity index 100%
rename from src/cadet/gnunet-service-cadet_peer.h
rename to src/service/cadet/gnunet-service-cadet_peer.h
diff --git a/src/cadet/gnunet-service-cadet_tunnels.c
b/src/service/cadet/gnunet-service-cadet_tunnels.c
similarity index 100%
rename from src/cadet/gnunet-service-cadet_tunnels.c
rename to src/service/cadet/gnunet-service-cadet_tunnels.c
diff --git a/src/cadet/gnunet-service-cadet_tunnels.h
b/src/service/cadet/gnunet-service-cadet_tunnels.h
similarity index 100%
rename from src/cadet/gnunet-service-cadet_tunnels.h
rename to src/service/cadet/gnunet-service-cadet_tunnels.h
diff --git a/src/cadet/loopcheck.sh b/src/service/cadet/loopcheck.sh
similarity index 100%
rename from src/cadet/loopcheck.sh
rename to src/service/cadet/loopcheck.sh
diff --git a/src/cadet/meson.build b/src/service/cadet/meson.build
similarity index 100%
rename from src/cadet/meson.build
rename to src/service/cadet/meson.build
diff --git a/src/cadet/profiler.conf b/src/service/cadet/profiler.conf
similarity index 100%
rename from src/cadet/profiler.conf
rename to src/service/cadet/profiler.conf
diff --git a/src/cadet/run_profiler.sh b/src/service/cadet/run_profiler.sh
similarity index 100%
rename from src/cadet/run_profiler.sh
rename to src/service/cadet/run_profiler.sh
diff --git a/src/cadet/small.dat b/src/service/cadet/small.dat
similarity index 100%
rename from src/cadet/small.dat
rename to src/service/cadet/small.dat
diff --git a/src/cadet/test_cadet.conf b/src/service/cadet/test_cadet.conf
similarity index 100%
rename from src/cadet/test_cadet.conf
rename to src/service/cadet/test_cadet.conf
diff --git a/src/cadet/test_cadet_local_mq.c
b/src/service/cadet/test_cadet_local_mq.c
similarity index 100%
rename from src/cadet/test_cadet_local_mq.c
rename to src/service/cadet/test_cadet_local_mq.c
diff --git a/src/cadet/valgrind-cadet.supp
b/src/service/cadet/valgrind-cadet.supp
similarity index 100%
rename from src/cadet/valgrind-cadet.supp
rename to src/service/cadet/valgrind-cadet.supp
diff --git a/src/datacache/.gitignore b/src/service/datacache/.gitignore
similarity index 100%
rename from src/datacache/.gitignore
rename to src/service/datacache/.gitignore
diff --git a/src/datacache/Makefile.am b/src/service/datacache/Makefile.am
similarity index 100%
rename from src/datacache/Makefile.am
rename to src/service/datacache/Makefile.am
diff --git a/src/datacache/datacache-0001.sql
b/src/service/datacache/datacache-0001.sql
similarity index 100%
rename from src/datacache/datacache-0001.sql
rename to src/service/datacache/datacache-0001.sql
diff --git a/src/datacache/datacache-drop.sql
b/src/service/datacache/datacache-drop.sql
similarity index 100%
rename from src/datacache/datacache-drop.sql
rename to src/service/datacache/datacache-drop.sql
diff --git a/src/datacache/datacache.c b/src/service/datacache/datacache.c
similarity index 100%
rename from src/datacache/datacache.c
rename to src/service/datacache/datacache.c
diff --git a/src/datacache/datacache.conf b/src/service/datacache/datacache.conf
similarity index 100%
rename from src/datacache/datacache.conf
rename to src/service/datacache/datacache.conf
diff --git a/src/datacache/meson.build b/src/service/datacache/meson.build
similarity index 100%
rename from src/datacache/meson.build
rename to src/service/datacache/meson.build
diff --git a/src/datacache/plugin_datacache_heap.c
b/src/service/datacache/plugin_datacache_heap.c
similarity index 100%
rename from src/datacache/plugin_datacache_heap.c
rename to src/service/datacache/plugin_datacache_heap.c
diff --git a/src/datacache/plugin_datacache_postgres.c
b/src/service/datacache/plugin_datacache_postgres.c
similarity index 100%
rename from src/datacache/plugin_datacache_postgres.c
rename to src/service/datacache/plugin_datacache_postgres.c
diff --git a/src/datacache/plugin_datacache_sqlite.c
b/src/service/datacache/plugin_datacache_sqlite.c
similarity index 100%
rename from src/datacache/plugin_datacache_sqlite.c
rename to src/service/datacache/plugin_datacache_sqlite.c
diff --git a/src/datacache/plugin_datacache_template.c
b/src/service/datacache/plugin_datacache_template.c
similarity index 100%
rename from src/datacache/plugin_datacache_template.c
rename to src/service/datacache/plugin_datacache_template.c
diff --git a/src/datacache/test_datacache.c
b/src/service/datacache/test_datacache.c
similarity index 100%
rename from src/datacache/test_datacache.c
rename to src/service/datacache/test_datacache.c
diff --git a/src/datacache/test_datacache_data_heap.conf
b/src/service/datacache/test_datacache_data_heap.conf
similarity index 100%
rename from src/datacache/test_datacache_data_heap.conf
rename to src/service/datacache/test_datacache_data_heap.conf
diff --git a/src/datacache/test_datacache_data_postgres.conf
b/src/service/datacache/test_datacache_data_postgres.conf
similarity index 100%
rename from src/datacache/test_datacache_data_postgres.conf
rename to src/service/datacache/test_datacache_data_postgres.conf
diff --git a/src/datacache/test_datacache_data_sqlite.conf
b/src/service/datacache/test_datacache_data_sqlite.conf
similarity index 100%
rename from src/datacache/test_datacache_data_sqlite.conf
rename to src/service/datacache/test_datacache_data_sqlite.conf
diff --git a/src/datacache/test_datacache_quota.c
b/src/service/datacache/test_datacache_quota.c
similarity index 100%
rename from src/datacache/test_datacache_quota.c
rename to src/service/datacache/test_datacache_quota.c
diff --git a/src/datastore/.gitignore b/src/service/datastore/.gitignore
similarity index 96%
rename from src/datastore/.gitignore
rename to src/service/datastore/.gitignore
index 51d3391b9..bd5c170ca 100644
--- a/src/datastore/.gitignore
+++ b/src/service/datastore/.gitignore
@@ -1,5 +1,4 @@
gnunet-service-datastore
-gnunet-datastore
perf_datastore_api_heap
perf_plugin_datastore_heap
test_datastore_api_heap
diff --git a/src/datastore/Makefile.am b/src/service/datastore/Makefile.am
similarity index 97%
rename from src/datastore/Makefile.am
rename to src/service/datastore/Makefile.am
index 5a49b173d..9ae5004c6 100644
--- a/src/datastore/Makefile.am
+++ b/src/service/datastore/Makefile.am
@@ -35,9 +35,6 @@ libgnunetdatastore_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) \
-version-info 1:0:0
-bin_PROGRAMS = \
- gnunet-datastore
-
libexec_PROGRAMS = \
gnunet-service-datastore
@@ -48,14 +45,6 @@ gnunet_service_datastore_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(GN_LIBINTL)
-gnunet_datastore_SOURCES = \
- gnunet-datastore.c
-gnunet_datastore_LDADD = \
- libgnunetdatastore.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(GN_LIBINTL)
-
-
if HAVE_SQLITE
SQLITE_PLUGIN = libgnunet_plugin_datastore_sqlite.la
if HAVE_BENCHMARKS
diff --git a/src/datastore/datastore-0001.sql
b/src/service/datastore/datastore-0001.sql
similarity index 100%
rename from src/datastore/datastore-0001.sql
rename to src/service/datastore/datastore-0001.sql
diff --git a/src/datastore/datastore-drop.sql
b/src/service/datastore/datastore-drop.sql
similarity index 100%
rename from src/datastore/datastore-drop.sql
rename to src/service/datastore/datastore-drop.sql
diff --git a/src/datastore/datastore.conf.in
b/src/service/datastore/datastore.conf.in
similarity index 100%
rename from src/datastore/datastore.conf.in
rename to src/service/datastore/datastore.conf.in
diff --git a/src/datastore/datastore.h b/src/service/datastore/datastore.h
similarity index 100%
rename from src/datastore/datastore.h
rename to src/service/datastore/datastore.h
diff --git a/src/datastore/datastore_api.c
b/src/service/datastore/datastore_api.c
similarity index 100%
rename from src/datastore/datastore_api.c
rename to src/service/datastore/datastore_api.c
diff --git a/src/datastore/gnunet-service-datastore.c
b/src/service/datastore/gnunet-service-datastore.c
similarity index 100%
rename from src/datastore/gnunet-service-datastore.c
rename to src/service/datastore/gnunet-service-datastore.c
diff --git a/src/datastore/meson.build b/src/service/datastore/meson.build
similarity index 100%
rename from src/datastore/meson.build
rename to src/service/datastore/meson.build
diff --git a/src/datastore/perf_datastore_api.c
b/src/service/datastore/perf_datastore_api.c
similarity index 100%
rename from src/datastore/perf_datastore_api.c
rename to src/service/datastore/perf_datastore_api.c
diff --git a/src/datastore/perf_plugin_datastore.c
b/src/service/datastore/perf_plugin_datastore.c
similarity index 100%
rename from src/datastore/perf_plugin_datastore.c
rename to src/service/datastore/perf_plugin_datastore.c
diff --git a/src/datastore/perf_plugin_datastore_data_heap.conf
b/src/service/datastore/perf_plugin_datastore_data_heap.conf
similarity index 100%
rename from src/datastore/perf_plugin_datastore_data_heap.conf
rename to src/service/datastore/perf_plugin_datastore_data_heap.conf
diff --git a/src/datastore/perf_plugin_datastore_data_postgres.conf
b/src/service/datastore/perf_plugin_datastore_data_postgres.conf
similarity index 100%
rename from src/datastore/perf_plugin_datastore_data_postgres.conf
rename to src/service/datastore/perf_plugin_datastore_data_postgres.conf
diff --git a/src/datastore/perf_plugin_datastore_data_sqlite.conf
b/src/service/datastore/perf_plugin_datastore_data_sqlite.conf
similarity index 100%
rename from src/datastore/perf_plugin_datastore_data_sqlite.conf
rename to src/service/datastore/perf_plugin_datastore_data_sqlite.conf
diff --git a/src/datastore/plugin_datastore_heap.c
b/src/service/datastore/plugin_datastore_heap.c
similarity index 100%
rename from src/datastore/plugin_datastore_heap.c
rename to src/service/datastore/plugin_datastore_heap.c
diff --git a/src/datastore/plugin_datastore_postgres.c
b/src/service/datastore/plugin_datastore_postgres.c
similarity index 100%
rename from src/datastore/plugin_datastore_postgres.c
rename to src/service/datastore/plugin_datastore_postgres.c
diff --git a/src/datastore/plugin_datastore_sqlite.c
b/src/service/datastore/plugin_datastore_sqlite.c
similarity index 100%
rename from src/datastore/plugin_datastore_sqlite.c
rename to src/service/datastore/plugin_datastore_sqlite.c
diff --git a/src/datastore/plugin_datastore_template.c
b/src/service/datastore/plugin_datastore_template.c
similarity index 100%
rename from src/datastore/plugin_datastore_template.c
rename to src/service/datastore/plugin_datastore_template.c
diff --git a/src/datastore/selectrandom.sql
b/src/service/datastore/selectrandom.sql
similarity index 100%
rename from src/datastore/selectrandom.sql
rename to src/service/datastore/selectrandom.sql
diff --git a/src/datastore/test_datastore_api.c
b/src/service/datastore/test_datastore_api.c
similarity index 100%
rename from src/datastore/test_datastore_api.c
rename to src/service/datastore/test_datastore_api.c
diff --git a/src/datastore/test_datastore_api_data_heap.conf
b/src/service/datastore/test_datastore_api_data_heap.conf
similarity index 100%
rename from src/datastore/test_datastore_api_data_heap.conf
rename to src/service/datastore/test_datastore_api_data_heap.conf
diff --git a/src/datastore/test_datastore_api_data_postgres.conf
b/src/service/datastore/test_datastore_api_data_postgres.conf
similarity index 100%
rename from src/datastore/test_datastore_api_data_postgres.conf
rename to src/service/datastore/test_datastore_api_data_postgres.conf
diff --git a/src/datastore/test_datastore_api_data_sqlite.conf
b/src/service/datastore/test_datastore_api_data_sqlite.conf
similarity index 100%
rename from src/datastore/test_datastore_api_data_sqlite.conf
rename to src/service/datastore/test_datastore_api_data_sqlite.conf
diff --git a/src/datastore/test_datastore_api_management.c
b/src/service/datastore/test_datastore_api_management.c
similarity index 100%
rename from src/datastore/test_datastore_api_management.c
rename to src/service/datastore/test_datastore_api_management.c
diff --git a/src/datastore/test_defaults.conf
b/src/service/datastore/test_defaults.conf
similarity index 100%
rename from src/datastore/test_defaults.conf
rename to src/service/datastore/test_defaults.conf
diff --git a/src/datastore/test_plugin_datastore.c
b/src/service/datastore/test_plugin_datastore.c
similarity index 100%
rename from src/datastore/test_plugin_datastore.c
rename to src/service/datastore/test_plugin_datastore.c
diff --git a/src/datastore/test_plugin_datastore_data_heap.conf
b/src/service/datastore/test_plugin_datastore_data_heap.conf
similarity index 100%
rename from src/datastore/test_plugin_datastore_data_heap.conf
rename to src/service/datastore/test_plugin_datastore_data_heap.conf
diff --git a/src/datastore/test_plugin_datastore_data_postgres.conf
b/src/service/datastore/test_plugin_datastore_data_postgres.conf
similarity index 100%
rename from src/datastore/test_plugin_datastore_data_postgres.conf
rename to src/service/datastore/test_plugin_datastore_data_postgres.conf
diff --git a/src/datastore/test_plugin_datastore_data_sqlite.conf
b/src/service/datastore/test_plugin_datastore_data_sqlite.conf
similarity index 100%
rename from src/datastore/test_plugin_datastore_data_sqlite.conf
rename to src/service/datastore/test_plugin_datastore_data_sqlite.conf
diff --git a/src/dht/.gitignore b/src/service/dht/.gitignore
similarity index 60%
rename from src/dht/.gitignore
rename to src/service/dht/.gitignore
index bd8af1217..939cf3f5f 100644
--- a/src/dht/.gitignore
+++ b/src/service/dht/.gitignore
@@ -1,7 +1,3 @@
-gnunet-dht-get
-gnunet-dht-monitor
-gnunet-dht-profiler
-gnunet-dht-put
gnunet-service-dht
test_dht_2dtorus
test_dht_api
@@ -10,4 +6,3 @@ test_dht_monitor
test_dht_multipeer
test_dht_tools.py
test_dht_twopeer
-gnunet-dht-hello
diff --git a/src/dht/Makefile.am b/src/service/dht/Makefile.am
similarity index 72%
rename from src/dht/Makefile.am
rename to src/service/dht/Makefile.am
index 8449d4825..bf3d26235 100644
--- a/src/dht/Makefile.am
+++ b/src/service/dht/Makefile.am
@@ -47,12 +47,6 @@ libgnunet_plugin_block_dht_la_LDFLAGS = \
libexec_PROGRAMS = \
gnunet-service-dht
-bin_PROGRAMS = \
- gnunet-dht-monitor \
- gnunet-dht-get \
- gnunet-dht-put \
- gnunet-dht-hello
-
gnunet_service_dht_SOURCES = \
gnunet-service-dht.c gnunet-service-dht.h \
gnunet-service-dht_datacache.c gnunet-service-dht_datacache.h \
@@ -67,44 +61,12 @@ gnunet_service_dht_LDADD = \
$(top_builddir)/src/lib/hello/libgnunethello.la \
$(top_builddir)/src/lib/block/libgnunetblock.la \
$(top_builddir)/src/lib/block/libgnunetblockgroup.la \
- $(top_builddir)/src/datacache/libgnunetdatacache.la \
+ $(top_builddir)/src/service/datacache/libgnunetdatacache.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
-lm
gnunet_service_dht_LDFLAGS = \
$(GN_LIBINTL)
-gnunet_dht_get_SOURCES = \
- gnunet-dht-get.c
-gnunet_dht_get_LDADD = \
- libgnunetdht.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-gnunet_dht_get_LDFLAGS = \
- $(GN_LIBINTL)
-
-gnunet_dht_hello_SOURCES = \
- gnunet-dht-hello.c
-gnunet_dht_hello_LDADD = \
- libgnunetdht.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-gnunet_dht_hello_LDFLAGS = \
- $(GN_LIBINTL)
-
-gnunet_dht_put_SOURCES = \
- gnunet-dht-put.c
-gnunet_dht_put_LDADD = \
- libgnunetdht.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-gnunet_dht_put_LDFLAGS = \
- $(GN_LIBINTL)
-
-gnunet_dht_monitor_SOURCES = \
- gnunet-dht-monitor.c
-gnunet_dht_monitor_LDADD = \
- libgnunetdht.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-gnunet_dht_monitor_LDFLAGS = \
- $(GN_LIBINTL)
-
if ENABLE_TEST_RUN
AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset
XDG_CONFIG_HOME;
endif
diff --git a/src/dht/dht.conf.in b/src/service/dht/dht.conf.in
similarity index 100%
rename from src/dht/dht.conf.in
rename to src/service/dht/dht.conf.in
diff --git a/src/dht/dht.h b/src/service/dht/dht.h
similarity index 100%
rename from src/dht/dht.h
rename to src/service/dht/dht.h
diff --git a/src/dht/dht_api.c b/src/service/dht/dht_api.c
similarity index 100%
rename from src/dht/dht_api.c
rename to src/service/dht/dht_api.c
diff --git a/src/dht/dht_test_lib.c b/src/service/dht/dht_test_lib.c
similarity index 100%
rename from src/dht/dht_test_lib.c
rename to src/service/dht/dht_test_lib.c
diff --git a/src/dht/dht_test_lib.h b/src/service/dht/dht_test_lib.h
similarity index 100%
rename from src/dht/dht_test_lib.h
rename to src/service/dht/dht_test_lib.h
diff --git a/src/dht/dhtu_testbed_connect.sh
b/src/service/dht/dhtu_testbed_connect.sh
similarity index 100%
rename from src/dht/dhtu_testbed_connect.sh
rename to src/service/dht/dhtu_testbed_connect.sh
diff --git a/src/dht/dhtu_testbed_deploy.conf
b/src/service/dht/dhtu_testbed_deploy.conf
similarity index 100%
rename from src/dht/dhtu_testbed_deploy.conf
rename to src/service/dht/dhtu_testbed_deploy.conf
diff --git a/src/dht/dhtu_testbed_deploy.sh
b/src/service/dht/dhtu_testbed_deploy.sh
similarity index 100%
rename from src/dht/dhtu_testbed_deploy.sh
rename to src/service/dht/dhtu_testbed_deploy.sh
diff --git a/src/dht/gnunet-service-dht.c b/src/service/dht/gnunet-service-dht.c
similarity index 100%
rename from src/dht/gnunet-service-dht.c
rename to src/service/dht/gnunet-service-dht.c
diff --git a/src/dht/gnunet-service-dht.h b/src/service/dht/gnunet-service-dht.h
similarity index 100%
rename from src/dht/gnunet-service-dht.h
rename to src/service/dht/gnunet-service-dht.h
diff --git a/src/dht/gnunet-service-dht_clients.c
b/src/service/dht/gnunet-service-dht_clients.c
similarity index 100%
rename from src/dht/gnunet-service-dht_clients.c
rename to src/service/dht/gnunet-service-dht_clients.c
diff --git a/src/dht/gnunet-service-dht_datacache.c
b/src/service/dht/gnunet-service-dht_datacache.c
similarity index 100%
rename from src/dht/gnunet-service-dht_datacache.c
rename to src/service/dht/gnunet-service-dht_datacache.c
diff --git a/src/dht/gnunet-service-dht_datacache.h
b/src/service/dht/gnunet-service-dht_datacache.h
similarity index 100%
rename from src/dht/gnunet-service-dht_datacache.h
rename to src/service/dht/gnunet-service-dht_datacache.h
diff --git a/src/dht/gnunet-service-dht_neighbours.c
b/src/service/dht/gnunet-service-dht_neighbours.c
similarity index 100%
rename from src/dht/gnunet-service-dht_neighbours.c
rename to src/service/dht/gnunet-service-dht_neighbours.c
diff --git a/src/dht/gnunet-service-dht_neighbours.h
b/src/service/dht/gnunet-service-dht_neighbours.h
similarity index 100%
rename from src/dht/gnunet-service-dht_neighbours.h
rename to src/service/dht/gnunet-service-dht_neighbours.h
diff --git a/src/dht/gnunet-service-dht_routing.c
b/src/service/dht/gnunet-service-dht_routing.c
similarity index 100%
rename from src/dht/gnunet-service-dht_routing.c
rename to src/service/dht/gnunet-service-dht_routing.c
diff --git a/src/dht/gnunet-service-dht_routing.h
b/src/service/dht/gnunet-service-dht_routing.h
similarity index 100%
rename from src/dht/gnunet-service-dht_routing.h
rename to src/service/dht/gnunet-service-dht_routing.h
diff --git a/src/dht/gnunet_dht_profiler.c
b/src/service/dht/gnunet_dht_profiler.c
similarity index 100%
rename from src/dht/gnunet_dht_profiler.c
rename to src/service/dht/gnunet_dht_profiler.c
diff --git a/src/dht/meson.build b/src/service/dht/meson.build
similarity index 100%
rename from src/dht/meson.build
rename to src/service/dht/meson.build
diff --git a/src/dht/plugin_block_dht.c b/src/service/dht/plugin_block_dht.c
similarity index 100%
rename from src/dht/plugin_block_dht.c
rename to src/service/dht/plugin_block_dht.c
diff --git a/src/dht/test_dht_2dtorus.conf
b/src/service/dht/test_dht_2dtorus.conf
similarity index 100%
rename from src/dht/test_dht_2dtorus.conf
rename to src/service/dht/test_dht_2dtorus.conf
diff --git a/src/dht/test_dht_api.c b/src/service/dht/test_dht_api.c
similarity index 100%
rename from src/dht/test_dht_api.c
rename to src/service/dht/test_dht_api.c
diff --git a/src/dht/test_dht_api_data.conf
b/src/service/dht/test_dht_api_data.conf
similarity index 100%
rename from src/dht/test_dht_api_data.conf
rename to src/service/dht/test_dht_api_data.conf
diff --git a/src/dht/test_dht_api_peer1.conf
b/src/service/dht/test_dht_api_peer1.conf
similarity index 100%
rename from src/dht/test_dht_api_peer1.conf
rename to src/service/dht/test_dht_api_peer1.conf
diff --git a/src/dht/test_dht_line.conf b/src/service/dht/test_dht_line.conf
similarity index 100%
rename from src/dht/test_dht_line.conf
rename to src/service/dht/test_dht_line.conf
diff --git a/src/dht/test_dht_monitor.c b/src/service/dht/test_dht_monitor.c
similarity index 100%
rename from src/dht/test_dht_monitor.c
rename to src/service/dht/test_dht_monitor.c
diff --git a/src/dht/test_dht_monitor.conf
b/src/service/dht/test_dht_monitor.conf
similarity index 100%
rename from src/dht/test_dht_monitor.conf
rename to src/service/dht/test_dht_monitor.conf
diff --git a/src/dht/test_dht_multipeer.conf
b/src/service/dht/test_dht_multipeer.conf
similarity index 100%
rename from src/dht/test_dht_multipeer.conf
rename to src/service/dht/test_dht_multipeer.conf
diff --git a/src/dht/test_dht_multipeer_topology.dat
b/src/service/dht/test_dht_multipeer_topology.dat
similarity index 100%
rename from src/dht/test_dht_multipeer_topology.dat
rename to src/service/dht/test_dht_multipeer_topology.dat
diff --git a/src/dht/test_dht_tools.conf b/src/service/dht/test_dht_tools.conf
similarity index 100%
rename from src/dht/test_dht_tools.conf
rename to src/service/dht/test_dht_tools.conf
diff --git a/src/dht/test_dht_tools.py.in b/src/service/dht/test_dht_tools.py.in
similarity index 100%
rename from src/dht/test_dht_tools.py.in
rename to src/service/dht/test_dht_tools.py.in
diff --git a/src/dht/test_dht_tools.sh b/src/service/dht/test_dht_tools.sh
similarity index 100%
rename from src/dht/test_dht_tools.sh
rename to src/service/dht/test_dht_tools.sh
diff --git a/src/dht/test_dht_topo.c b/src/service/dht/test_dht_topo.c
similarity index 100%
rename from src/dht/test_dht_topo.c
rename to src/service/dht/test_dht_topo.c
diff --git a/src/set/Makefile.am b/src/set/Makefile.am
index 150da06e0..88d4d39ad 100644
--- a/src/set/Makefile.am
+++ b/src/set/Makefile.am
@@ -52,7 +52,7 @@ gnunet_service_set_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/service/core/libgnunetcore.la \
- $(top_builddir)/src/cadet/libgnunetcadet.la \
+ $(top_builddir)/src/service/cadet/libgnunetcadet.la \
$(top_builddir)/src/lib/block/libgnunetblock.la \
libgnunetset.la \
$(GN_LIBINTL)
diff --git a/src/seti/Makefile.am b/src/seti/Makefile.am
index 46e200516..c2d31df9c 100644
--- a/src/seti/Makefile.am
+++ b/src/seti/Makefile.am
@@ -40,7 +40,7 @@ gnunet_service_seti_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/service/core/libgnunetcore.la \
- $(top_builddir)/src/cadet/libgnunetcadet.la \
+ $(top_builddir)/src/service/cadet/libgnunetcadet.la \
$(top_builddir)/src/lib/block/libgnunetblock.la \
libgnunetseti.la \
$(GN_LIBINTL)
diff --git a/src/setu/Makefile.am b/src/setu/Makefile.am
index f826c9e2a..f7f8ed394 100644
--- a/src/setu/Makefile.am
+++ b/src/setu/Makefile.am
@@ -50,7 +50,7 @@ gnunet_service_setu_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/service/core/libgnunetcore.la \
- $(top_builddir)/src/cadet/libgnunetcadet.la \
+ $(top_builddir)/src/service/cadet/libgnunetcadet.la \
$(top_builddir)/src/lib/block/libgnunetblock.la \
libgnunetsetu.la \
$(GN_LIBINTL)
diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am
index 2f102a3fd..2f465731c 100644
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -41,7 +41,7 @@ gnunet_service_vpn_SOURCES = \
gnunet_service_vpn_LDADD = \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/cadet/libgnunetcadet.la \
+ $(top_builddir)/src/service/cadet/libgnunetcadet.la \
$(top_builddir)/src/regex/libgnunetregex.la \
$(GN_LIBINTL)
gnunet_service_vpn_CFLAGS = \
diff --git a/src/zonemaster/Makefile.am b/src/zonemaster/Makefile.am
index 5c10827b8..1c0d882d6 100644
--- a/src/zonemaster/Makefile.am
+++ b/src/zonemaster/Makefile.am
@@ -21,7 +21,7 @@ libexec_PROGRAMS = \
gnunet_service_zonemaster_SOURCES = \
gnunet-service-zonemaster.c
gnunet_service_zonemaster_LDADD = \
- $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la \
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [gnunet] branch master updated (2d7660887 -> 773211a4d),
gnunet <=