[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] 01/03: BUILD: Move cadet to service/cli
|
From: |
gnunet |
|
Subject: |
[gnunet] 01/03: BUILD: Move cadet to service/cli |
|
Date: |
Wed, 18 Oct 2023 20:35:54 +0200 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
commit 11949e419fd7230431646703ac0cf8e34f615673
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Wed Oct 18 20:02:10 2023 +0200
BUILD: Move cadet to service/cli
---
configure.ac | 5 +--
po/POTFILES.in | 42 +++++++++++-----------
src/Makefile.am | 1 -
src/cli/Makefile.am | 3 +-
src/cli/cadet/.gitignore | 1 +
src/cli/cadet/Makefile.am | 26 ++++++++++++++
src/{ => cli}/cadet/gnunet-cadet.c | 2 +-
src/contrib/service/rps/Makefile.am | 2 +-
src/conversation/Makefile.am | 2 +-
src/exit/Makefile.am | 2 +-
src/fs/Makefile.am | 2 +-
src/messenger/Makefile.am | 4 +--
src/pt/Makefile.am | 2 +-
src/scalarproduct/Makefile.am | 8 ++---
src/service/Makefile.am | 3 +-
src/{ => service}/cadet/.gitignore | 0
src/{ => service}/cadet/Makefile.am | 11 ------
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/set/Makefile.am | 2 +-
src/seti/Makefile.am | 2 +-
src/setu/Makefile.am | 2 +-
src/vpn/Makefile.am | 2 +-
61 files changed, 72 insertions(+), 52 deletions(-)
diff --git a/configure.ac b/configure.ac
index 1f6724a83..a1bc27098 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1244,6 +1244,8 @@ 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/identity/Makefile
@@ -1266,6 +1268,7 @@ 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/nat/Makefile
src/cli/nse/Makefile
@@ -1278,8 +1281,6 @@ 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
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 847b756c2..9cb0be8c0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,27 +1,10 @@
-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/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
@@ -160,6 +143,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 +158,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 +370,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
@@ -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..e31709946 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,7 +28,6 @@ SUBDIRS = \
dns \
namecache \
namestore \
- cadet \
set \
seti \
setu \
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index aac883508..a7cf2eb01 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -4,4 +4,5 @@ SUBDIRS = \
statistics \
core \
nat \
- nse
+ nse \
+ 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/cadet/Makefile.am b/src/cli/cadet/Makefile.am
new file mode 100644
index 000000000..fc9caa12c
--- /dev/null
+++ b/src/cli/cadet/Makefile.am
@@ -0,0 +1,26 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+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-cadet
+
+gnunet_cadet_SOURCES = \
+ gnunet-cadet.c
+gnunet_cadet_LDADD = \
+ $(top_builddir)/src/service/cadet/libgnunetcadet.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la
+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/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..9864055e8 100644
--- a/src/exit/Makefile.am
+++ b/src/exit/Makefile.am
@@ -33,6 +33,6 @@ gnunet_daemon_exit_LDADD = \
$(top_builddir)/src/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..e923955b5 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -177,7 +177,7 @@ gnunet_service_fs_LDADD = \
$(top_builddir)/src/lib/block/libgnunetblock.la \
$(top_builddir)/src/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/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..98578d7dd 100644
--- a/src/pt/Makefile.am
+++ b/src/pt/Makefile.am
@@ -21,7 +21,7 @@ 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/service/cadet/libgnunetcadet.la \
$(top_builddir)/src/dht/libgnunetdht.la \
$(top_builddir)/src/dns/libgnunetdns.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.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..6317053c1 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -9,4 +9,5 @@ SUBDIRS = \
core \
nse \
identity \
- rest
+ rest \
+ 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 92%
rename from src/cadet/Makefile.am
rename to src/service/cadet/Makefile.am
index 217c4847e..6983c1f2d 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 \
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/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 = \
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.