[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] 02/03: BUILD: Move messenger to service
|
From: |
gnunet |
|
Subject: |
[gnunet] 02/03: BUILD: Move messenger to service |
|
Date: |
Thu, 19 Oct 2023 12:53:51 +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 7ef64b65a42cdb65ef2e36649ff84fcf4bb00c66
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Thu Oct 19 12:53:29 2023 +0200
BUILD: Move messenger to service
---
configure.ac | 5 +-
po/POTFILES.in | 68 +++++++++++-----------
src/Makefile.am | 3 +-
src/cli/Makefile.am | 3 +-
src/cli/messenger/.gitignore | 1 +
src/cli/messenger/Makefile.am | 24 ++++++++
src/{ => cli}/messenger/gnunet-messenger.c | 0
src/service/Makefile.am | 3 +-
src/{ => service}/messenger/.gitignore | 0
src/{ => service}/messenger/Makefile.am | 11 ----
.../messenger/gnunet-service-messenger.c | 0
.../messenger/gnunet-service-messenger.h | 0
.../messenger/gnunet-service-messenger_basement.c | 0
.../messenger/gnunet-service-messenger_basement.h | 0
.../messenger/gnunet-service-messenger_ego_store.c | 0
.../messenger/gnunet-service-messenger_ego_store.h | 0
.../messenger/gnunet-service-messenger_handle.c | 0
.../messenger/gnunet-service-messenger_handle.h | 0
.../gnunet-service-messenger_list_handles.c | 0
.../gnunet-service-messenger_list_handles.h | 0
.../gnunet-service-messenger_list_messages.c | 0
.../gnunet-service-messenger_list_messages.h | 0
.../messenger/gnunet-service-messenger_member.c | 0
.../messenger/gnunet-service-messenger_member.h | 0
.../gnunet-service-messenger_member_session.c | 0
.../gnunet-service-messenger_member_session.h | 0
.../gnunet-service-messenger_member_store.c | 0
.../gnunet-service-messenger_member_store.h | 0
.../gnunet-service-messenger_message_handle.c | 0
.../gnunet-service-messenger_message_handle.h | 0
.../gnunet-service-messenger_message_kind.c | 0
.../gnunet-service-messenger_message_kind.h | 0
.../gnunet-service-messenger_message_recv.c | 0
.../gnunet-service-messenger_message_recv.h | 0
.../gnunet-service-messenger_message_send.c | 0
.../gnunet-service-messenger_message_send.h | 0
.../gnunet-service-messenger_message_state.c | 0
.../gnunet-service-messenger_message_state.h | 0
.../gnunet-service-messenger_message_store.c | 0
.../gnunet-service-messenger_message_store.h | 0
.../messenger/gnunet-service-messenger_operation.c | 0
.../messenger/gnunet-service-messenger_operation.h | 0
.../gnunet-service-messenger_operation_store.c | 0
.../gnunet-service-messenger_operation_store.h | 0
.../messenger/gnunet-service-messenger_room.c | 0
.../messenger/gnunet-service-messenger_room.h | 0
.../messenger/gnunet-service-messenger_service.c | 0
.../messenger/gnunet-service-messenger_service.h | 0
.../messenger/gnunet-service-messenger_tunnel.c | 0
.../messenger/gnunet-service-messenger_tunnel.h | 0
src/{ => service}/messenger/meson.build | 0
src/{ => service}/messenger/messenger.conf.in | 0
src/{ => service}/messenger/messenger_api.c | 0
.../messenger/messenger_api_contact.c | 0
.../messenger/messenger_api_contact.h | 0
.../messenger/messenger_api_contact_store.c | 0
.../messenger/messenger_api_contact_store.h | 0
src/{ => service}/messenger/messenger_api_ego.h | 0
src/{ => service}/messenger/messenger_api_handle.c | 0
src/{ => service}/messenger/messenger_api_handle.h | 0
.../messenger/messenger_api_list_tunnels.c | 0
.../messenger/messenger_api_list_tunnels.h | 0
.../messenger/messenger_api_message.c | 0
.../messenger/messenger_api_message.h | 0
src/{ => service}/messenger/messenger_api_room.c | 0
src/{ => service}/messenger/messenger_api_room.h | 0
src/{ => service}/messenger/messenger_api_util.c | 0
src/{ => service}/messenger/messenger_api_util.h | 0
.../messenger/plugin_gnsrecord_messenger.c | 0
src/{ => service}/messenger/test_messenger.c | 0
.../messenger/test_messenger_anonymous.c | 0
.../messenger/test_messenger_api.conf | 0
.../messenger/testing_messenger_barrier.c | 0
.../messenger/testing_messenger_barrier.h | 0
.../messenger/testing_messenger_setup.c | 0
.../messenger/testing_messenger_setup.h | 0
76 files changed, 67 insertions(+), 51 deletions(-)
diff --git a/configure.ac b/configure.ac
index 62179b93a..ab92e7f22 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1270,6 +1270,8 @@ src/service/gns/nss/Makefile
src/service/hostlist/Makefile
src/service/identity/Makefile
src/service/identity/identity.conf
+src/service/messenger/Makefile
+src/service/messenger/messenger.conf
src/service/namecache/Makefile
src/service/namecache/namecache.conf
src/service/namestore/Makefile
@@ -1317,6 +1319,7 @@ src/cli/datastore/Makefile
src/cli/dht/Makefile
src/cli/fs/Makefile
src/cli/gns/Makefile
+src/cli/messenger/Makefile
src/cli/namecache/Makefile
src/cli/namestore/Makefile
src/cli/nat/Makefile
@@ -1349,8 +1352,6 @@ src/contrib/cli/template/Makefile
src/lib/hello/Makefile
src/include/Makefile
src/include/gnunet_config.h
-src/messenger/Makefile
-src/messenger/messenger.conf
pkgconfig/Makefile
pkgconfig/gnunetarm.pc
pkgconfig/gnunetblock.pc
diff --git a/po/POTFILES.in b/po/POTFILES.in
index dda139f3e..7593ec73d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -15,6 +15,7 @@ src/cli/fs/gnunet-search.c
src/cli/fs/gnunet-unindex.c
src/cli/gns/gnunet-gns.c
src/cli/identity/gnunet-identity.c
+src/cli/messenger/gnunet-messenger.c
src/cli/namecache/gnunet-namecache.c
src/cli/namestore/gnunet-namestore-dbtool.c
src/cli/namestore/gnunet-namestore-zonefile.c
@@ -204,38 +205,6 @@ src/lib/util/strings.c
src/lib/util/time.c
src/lib/util/tun.c
src/lib/util/uri.c
-src/messenger/gnunet-messenger.c
-src/messenger/gnunet-service-messenger.c
-src/messenger/gnunet-service-messenger_basement.c
-src/messenger/gnunet-service-messenger_ego_store.c
-src/messenger/gnunet-service-messenger_handle.c
-src/messenger/gnunet-service-messenger_list_handles.c
-src/messenger/gnunet-service-messenger_list_messages.c
-src/messenger/gnunet-service-messenger_member.c
-src/messenger/gnunet-service-messenger_member_session.c
-src/messenger/gnunet-service-messenger_member_store.c
-src/messenger/gnunet-service-messenger_message_handle.c
-src/messenger/gnunet-service-messenger_message_kind.c
-src/messenger/gnunet-service-messenger_message_recv.c
-src/messenger/gnunet-service-messenger_message_send.c
-src/messenger/gnunet-service-messenger_message_state.c
-src/messenger/gnunet-service-messenger_message_store.c
-src/messenger/gnunet-service-messenger_operation.c
-src/messenger/gnunet-service-messenger_operation_store.c
-src/messenger/gnunet-service-messenger_room.c
-src/messenger/gnunet-service-messenger_service.c
-src/messenger/gnunet-service-messenger_tunnel.c
-src/messenger/messenger_api.c
-src/messenger/messenger_api_contact.c
-src/messenger/messenger_api_contact_store.c
-src/messenger/messenger_api_handle.c
-src/messenger/messenger_api_list_tunnels.c
-src/messenger/messenger_api_message.c
-src/messenger/messenger_api_room.c
-src/messenger/messenger_api_util.c
-src/messenger/plugin_gnsrecord_messenger.c
-src/messenger/testing_messenger_barrier.c
-src/messenger/testing_messenger_setup.c
src/plugin/block/plugin_block_template.c
src/plugin/block/plugin_block_test.c
src/plugin/dhtu/plugin_dhtu_gnunet.c
@@ -259,6 +228,8 @@ src/plugin/reclaim/plugin_reclaim_credential_pabc.c
src/plugin/revocation/plugin_block_revocation.c
src/rest-plugin/gns/plugin_rest_gns.c
src/rest-plugin/identity/plugin_rest_identity.c
+src/rest-plugin/reclaim/json_reclaim.c
+src/rest-plugin/reclaim/oidc_helper.c
src/rest-plugin/reclaim/plugin_rest_openid_connect.c
src/rest-plugin/reclaim/plugin_rest_pabc.c
src/rest-plugin/reclaim/plugin_rest_reclaim.c
@@ -372,6 +343,37 @@ src/service/identity/gnunet-service-identity.c
src/service/identity/identity_api.c
src/service/identity/identity_api_lookup.c
src/service/identity/identity_api_suffix_lookup.c
+src/service/messenger/gnunet-service-messenger.c
+src/service/messenger/gnunet-service-messenger_basement.c
+src/service/messenger/gnunet-service-messenger_ego_store.c
+src/service/messenger/gnunet-service-messenger_handle.c
+src/service/messenger/gnunet-service-messenger_list_handles.c
+src/service/messenger/gnunet-service-messenger_list_messages.c
+src/service/messenger/gnunet-service-messenger_member.c
+src/service/messenger/gnunet-service-messenger_member_session.c
+src/service/messenger/gnunet-service-messenger_member_store.c
+src/service/messenger/gnunet-service-messenger_message_handle.c
+src/service/messenger/gnunet-service-messenger_message_kind.c
+src/service/messenger/gnunet-service-messenger_message_recv.c
+src/service/messenger/gnunet-service-messenger_message_send.c
+src/service/messenger/gnunet-service-messenger_message_state.c
+src/service/messenger/gnunet-service-messenger_message_store.c
+src/service/messenger/gnunet-service-messenger_operation.c
+src/service/messenger/gnunet-service-messenger_operation_store.c
+src/service/messenger/gnunet-service-messenger_room.c
+src/service/messenger/gnunet-service-messenger_service.c
+src/service/messenger/gnunet-service-messenger_tunnel.c
+src/service/messenger/messenger_api.c
+src/service/messenger/messenger_api_contact.c
+src/service/messenger/messenger_api_contact_store.c
+src/service/messenger/messenger_api_handle.c
+src/service/messenger/messenger_api_list_tunnels.c
+src/service/messenger/messenger_api_message.c
+src/service/messenger/messenger_api_room.c
+src/service/messenger/messenger_api_util.c
+src/service/messenger/plugin_gnsrecord_messenger.c
+src/service/messenger/testing_messenger_barrier.c
+src/service/messenger/testing_messenger_setup.c
src/service/namecache/gnunet-service-namecache.c
src/service/namecache/namecache_api.c
src/service/namestore/gnunet-namestore-fcfsd.c
@@ -407,8 +409,6 @@ src/service/reclaim/did_helper.c
src/service/reclaim/did_misc.c
src/service/reclaim/gnunet-service-reclaim.c
src/service/reclaim/gnunet-service-reclaim_tickets.c
-src/service/reclaim/json_reclaim.c
-src/service/reclaim/oidc_helper.c
src/service/reclaim/pabc_helper.c
src/service/reclaim/reclaim_api.c
src/service/reclaim/reclaim_attribute.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 081b83190..2b1e94c50 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,5 +9,4 @@ SUBDIRS = \
plugin \
rest-plugin \
cli \
- contrib \
- messenger
+ contrib
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index 9b30c22ae..06fdfb629 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -15,4 +15,5 @@ SUBDIRS = \
gns \
fs \
cadet \
- reclaim
+ reclaim \
+ messenger
diff --git a/src/cli/messenger/.gitignore b/src/cli/messenger/.gitignore
new file mode 100644
index 000000000..1c1447be8
--- /dev/null
+++ b/src/cli/messenger/.gitignore
@@ -0,0 +1 @@
+gnunet-messenger
diff --git a/src/cli/messenger/Makefile.am b/src/cli/messenger/Makefile.am
new file mode 100644
index 000000000..bb5e9c388
--- /dev/null
+++ b/src/cli/messenger/Makefile.am
@@ -0,0 +1,24 @@
+# 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/
+
+AM_CLFAGS = -g
+
+bin_PROGRAMS = \
+ gnunet-messenger
+
+gnunet_messenger_SOURCES = \
+ gnunet-messenger.c
+gnunet_messenger_LDADD = \
+ $(top_builddir)/src/service/messenger/libgnunetmessenger.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la
+gnunet_messenger_LDFLAGS = \
+ $(GN_LIBINTL)
diff --git a/src/messenger/gnunet-messenger.c
b/src/cli/messenger/gnunet-messenger.c
similarity index 100%
rename from src/messenger/gnunet-messenger.c
rename to src/cli/messenger/gnunet-messenger.c
diff --git a/src/service/Makefile.am b/src/service/Makefile.am
index 2eee658f8..8e661e432 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -30,5 +30,6 @@ SUBDIRS = \
fs \
exit \
pt \
- reclaim
+ reclaim \
+ messenger
diff --git a/src/messenger/.gitignore b/src/service/messenger/.gitignore
similarity index 100%
rename from src/messenger/.gitignore
rename to src/service/messenger/.gitignore
diff --git a/src/messenger/Makefile.am b/src/service/messenger/Makefile.am
similarity index 94%
rename from src/messenger/Makefile.am
rename to src/service/messenger/Makefile.am
index e02414541..d778d6e0c 100644
--- a/src/messenger/Makefile.am
+++ b/src/service/messenger/Makefile.am
@@ -34,9 +34,6 @@ libexec_PROGRAMS = \
gnunet-service-messenger \
$(EXP_LIBEXEC)
-bin_PROGRAMS = \
- gnunet-messenger
-
lib_LTLIBRARIES = \
libgnunetmessenger.la \
$(EXP_LIB)
@@ -61,14 +58,6 @@ libgnunetmessenger_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) \
-version-info 0:0:0
-gnunet_messenger_SOURCES = \
- gnunet-messenger.c
-gnunet_messenger_LDADD = \
- libgnunetmessenger.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-gnunet_messenger_LDFLAGS = \
- $(GN_LIBINTL)
-
gnunet_service_messenger_SOURCES = \
gnunet-service-messenger.c gnunet-service-messenger.h \
gnunet-service-messenger_service.c gnunet-service-messenger_service.h \
diff --git a/src/messenger/gnunet-service-messenger.c
b/src/service/messenger/gnunet-service-messenger.c
similarity index 100%
rename from src/messenger/gnunet-service-messenger.c
rename to src/service/messenger/gnunet-service-messenger.c
diff --git a/src/messenger/gnunet-service-messenger.h
b/src/service/messenger/gnunet-service-messenger.h
similarity index 100%
rename from src/messenger/gnunet-service-messenger.h
rename to src/service/messenger/gnunet-service-messenger.h
diff --git a/src/messenger/gnunet-service-messenger_basement.c
b/src/service/messenger/gnunet-service-messenger_basement.c
similarity index 100%
rename from src/messenger/gnunet-service-messenger_basement.c
rename to src/service/messenger/gnunet-service-messenger_basement.c
diff --git a/src/messenger/gnunet-service-messenger_basement.h
b/src/service/messenger/gnunet-service-messenger_basement.h
similarity index 100%
rename from src/messenger/gnunet-service-messenger_basement.h
rename to src/service/messenger/gnunet-service-messenger_basement.h
diff --git a/src/messenger/gnunet-service-messenger_ego_store.c
b/src/service/messenger/gnunet-service-messenger_ego_store.c
similarity index 100%
rename from src/messenger/gnunet-service-messenger_ego_store.c
rename to src/service/messenger/gnunet-service-messenger_ego_store.c
diff --git a/src/messenger/gnunet-service-messenger_ego_store.h
b/src/service/messenger/gnunet-service-messenger_ego_store.h
similarity index 100%
rename from src/messenger/gnunet-service-messenger_ego_store.h
rename to src/service/messenger/gnunet-service-messenger_ego_store.h
diff --git a/src/messenger/gnunet-service-messenger_handle.c
b/src/service/messenger/gnunet-service-messenger_handle.c
similarity index 100%
rename from src/messenger/gnunet-service-messenger_handle.c
rename to src/service/messenger/gnunet-service-messenger_handle.c
diff --git a/src/messenger/gnunet-service-messenger_handle.h
b/src/service/messenger/gnunet-service-messenger_handle.h
similarity index 100%
rename from src/messenger/gnunet-service-messenger_handle.h
rename to src/service/messenger/gnunet-service-messenger_handle.h
diff --git a/src/messenger/gnunet-service-messenger_list_handles.c
b/src/service/messenger/gnunet-service-messenger_list_handles.c
similarity index 100%
rename from src/messenger/gnunet-service-messenger_list_handles.c
rename to src/service/messenger/gnunet-service-messenger_list_handles.c
diff --git a/src/messenger/gnunet-service-messenger_list_handles.h
b/src/service/messenger/gnunet-service-messenger_list_handles.h
similarity index 100%
rename from src/messenger/gnunet-service-messenger_list_handles.h
rename to src/service/messenger/gnunet-service-messenger_list_handles.h
diff --git a/src/messenger/gnunet-service-messenger_list_messages.c
b/src/service/messenger/gnunet-service-messenger_list_messages.c
similarity index 100%
rename from src/messenger/gnunet-service-messenger_list_messages.c
rename to src/service/messenger/gnunet-service-messenger_list_messages.c
diff --git a/src/messenger/gnunet-service-messenger_list_messages.h
b/src/service/messenger/gnunet-service-messenger_list_messages.h
similarity index 100%
rename from src/messenger/gnunet-service-messenger_list_messages.h
rename to src/service/messenger/gnunet-service-messenger_list_messages.h
diff --git a/src/messenger/gnunet-service-messenger_member.c
b/src/service/messenger/gnunet-service-messenger_member.c
similarity index 100%
rename from src/messenger/gnunet-service-messenger_member.c
rename to src/service/messenger/gnunet-service-messenger_member.c
diff --git a/src/messenger/gnunet-service-messenger_member.h
b/src/service/messenger/gnunet-service-messenger_member.h
similarity index 100%
rename from src/messenger/gnunet-service-messenger_member.h
rename to src/service/messenger/gnunet-service-messenger_member.h
diff --git a/src/messenger/gnunet-service-messenger_member_session.c
b/src/service/messenger/gnunet-service-messenger_member_session.c
similarity index 100%
rename from src/messenger/gnunet-service-messenger_member_session.c
rename to src/service/messenger/gnunet-service-messenger_member_session.c
diff --git a/src/messenger/gnunet-service-messenger_member_session.h
b/src/service/messenger/gnunet-service-messenger_member_session.h
similarity index 100%
rename from src/messenger/gnunet-service-messenger_member_session.h
rename to src/service/messenger/gnunet-service-messenger_member_session.h
diff --git a/src/messenger/gnunet-service-messenger_member_store.c
b/src/service/messenger/gnunet-service-messenger_member_store.c
similarity index 100%
rename from src/messenger/gnunet-service-messenger_member_store.c
rename to src/service/messenger/gnunet-service-messenger_member_store.c
diff --git a/src/messenger/gnunet-service-messenger_member_store.h
b/src/service/messenger/gnunet-service-messenger_member_store.h
similarity index 100%
rename from src/messenger/gnunet-service-messenger_member_store.h
rename to src/service/messenger/gnunet-service-messenger_member_store.h
diff --git a/src/messenger/gnunet-service-messenger_message_handle.c
b/src/service/messenger/gnunet-service-messenger_message_handle.c
similarity index 100%
rename from src/messenger/gnunet-service-messenger_message_handle.c
rename to src/service/messenger/gnunet-service-messenger_message_handle.c
diff --git a/src/messenger/gnunet-service-messenger_message_handle.h
b/src/service/messenger/gnunet-service-messenger_message_handle.h
similarity index 100%
rename from src/messenger/gnunet-service-messenger_message_handle.h
rename to src/service/messenger/gnunet-service-messenger_message_handle.h
diff --git a/src/messenger/gnunet-service-messenger_message_kind.c
b/src/service/messenger/gnunet-service-messenger_message_kind.c
similarity index 100%
rename from src/messenger/gnunet-service-messenger_message_kind.c
rename to src/service/messenger/gnunet-service-messenger_message_kind.c
diff --git a/src/messenger/gnunet-service-messenger_message_kind.h
b/src/service/messenger/gnunet-service-messenger_message_kind.h
similarity index 100%
rename from src/messenger/gnunet-service-messenger_message_kind.h
rename to src/service/messenger/gnunet-service-messenger_message_kind.h
diff --git a/src/messenger/gnunet-service-messenger_message_recv.c
b/src/service/messenger/gnunet-service-messenger_message_recv.c
similarity index 100%
rename from src/messenger/gnunet-service-messenger_message_recv.c
rename to src/service/messenger/gnunet-service-messenger_message_recv.c
diff --git a/src/messenger/gnunet-service-messenger_message_recv.h
b/src/service/messenger/gnunet-service-messenger_message_recv.h
similarity index 100%
rename from src/messenger/gnunet-service-messenger_message_recv.h
rename to src/service/messenger/gnunet-service-messenger_message_recv.h
diff --git a/src/messenger/gnunet-service-messenger_message_send.c
b/src/service/messenger/gnunet-service-messenger_message_send.c
similarity index 100%
rename from src/messenger/gnunet-service-messenger_message_send.c
rename to src/service/messenger/gnunet-service-messenger_message_send.c
diff --git a/src/messenger/gnunet-service-messenger_message_send.h
b/src/service/messenger/gnunet-service-messenger_message_send.h
similarity index 100%
rename from src/messenger/gnunet-service-messenger_message_send.h
rename to src/service/messenger/gnunet-service-messenger_message_send.h
diff --git a/src/messenger/gnunet-service-messenger_message_state.c
b/src/service/messenger/gnunet-service-messenger_message_state.c
similarity index 100%
rename from src/messenger/gnunet-service-messenger_message_state.c
rename to src/service/messenger/gnunet-service-messenger_message_state.c
diff --git a/src/messenger/gnunet-service-messenger_message_state.h
b/src/service/messenger/gnunet-service-messenger_message_state.h
similarity index 100%
rename from src/messenger/gnunet-service-messenger_message_state.h
rename to src/service/messenger/gnunet-service-messenger_message_state.h
diff --git a/src/messenger/gnunet-service-messenger_message_store.c
b/src/service/messenger/gnunet-service-messenger_message_store.c
similarity index 100%
rename from src/messenger/gnunet-service-messenger_message_store.c
rename to src/service/messenger/gnunet-service-messenger_message_store.c
diff --git a/src/messenger/gnunet-service-messenger_message_store.h
b/src/service/messenger/gnunet-service-messenger_message_store.h
similarity index 100%
rename from src/messenger/gnunet-service-messenger_message_store.h
rename to src/service/messenger/gnunet-service-messenger_message_store.h
diff --git a/src/messenger/gnunet-service-messenger_operation.c
b/src/service/messenger/gnunet-service-messenger_operation.c
similarity index 100%
rename from src/messenger/gnunet-service-messenger_operation.c
rename to src/service/messenger/gnunet-service-messenger_operation.c
diff --git a/src/messenger/gnunet-service-messenger_operation.h
b/src/service/messenger/gnunet-service-messenger_operation.h
similarity index 100%
rename from src/messenger/gnunet-service-messenger_operation.h
rename to src/service/messenger/gnunet-service-messenger_operation.h
diff --git a/src/messenger/gnunet-service-messenger_operation_store.c
b/src/service/messenger/gnunet-service-messenger_operation_store.c
similarity index 100%
rename from src/messenger/gnunet-service-messenger_operation_store.c
rename to src/service/messenger/gnunet-service-messenger_operation_store.c
diff --git a/src/messenger/gnunet-service-messenger_operation_store.h
b/src/service/messenger/gnunet-service-messenger_operation_store.h
similarity index 100%
rename from src/messenger/gnunet-service-messenger_operation_store.h
rename to src/service/messenger/gnunet-service-messenger_operation_store.h
diff --git a/src/messenger/gnunet-service-messenger_room.c
b/src/service/messenger/gnunet-service-messenger_room.c
similarity index 100%
rename from src/messenger/gnunet-service-messenger_room.c
rename to src/service/messenger/gnunet-service-messenger_room.c
diff --git a/src/messenger/gnunet-service-messenger_room.h
b/src/service/messenger/gnunet-service-messenger_room.h
similarity index 100%
rename from src/messenger/gnunet-service-messenger_room.h
rename to src/service/messenger/gnunet-service-messenger_room.h
diff --git a/src/messenger/gnunet-service-messenger_service.c
b/src/service/messenger/gnunet-service-messenger_service.c
similarity index 100%
rename from src/messenger/gnunet-service-messenger_service.c
rename to src/service/messenger/gnunet-service-messenger_service.c
diff --git a/src/messenger/gnunet-service-messenger_service.h
b/src/service/messenger/gnunet-service-messenger_service.h
similarity index 100%
rename from src/messenger/gnunet-service-messenger_service.h
rename to src/service/messenger/gnunet-service-messenger_service.h
diff --git a/src/messenger/gnunet-service-messenger_tunnel.c
b/src/service/messenger/gnunet-service-messenger_tunnel.c
similarity index 100%
rename from src/messenger/gnunet-service-messenger_tunnel.c
rename to src/service/messenger/gnunet-service-messenger_tunnel.c
diff --git a/src/messenger/gnunet-service-messenger_tunnel.h
b/src/service/messenger/gnunet-service-messenger_tunnel.h
similarity index 100%
rename from src/messenger/gnunet-service-messenger_tunnel.h
rename to src/service/messenger/gnunet-service-messenger_tunnel.h
diff --git a/src/messenger/meson.build b/src/service/messenger/meson.build
similarity index 100%
rename from src/messenger/meson.build
rename to src/service/messenger/meson.build
diff --git a/src/messenger/messenger.conf.in
b/src/service/messenger/messenger.conf.in
similarity index 100%
rename from src/messenger/messenger.conf.in
rename to src/service/messenger/messenger.conf.in
diff --git a/src/messenger/messenger_api.c
b/src/service/messenger/messenger_api.c
similarity index 100%
rename from src/messenger/messenger_api.c
rename to src/service/messenger/messenger_api.c
diff --git a/src/messenger/messenger_api_contact.c
b/src/service/messenger/messenger_api_contact.c
similarity index 100%
rename from src/messenger/messenger_api_contact.c
rename to src/service/messenger/messenger_api_contact.c
diff --git a/src/messenger/messenger_api_contact.h
b/src/service/messenger/messenger_api_contact.h
similarity index 100%
rename from src/messenger/messenger_api_contact.h
rename to src/service/messenger/messenger_api_contact.h
diff --git a/src/messenger/messenger_api_contact_store.c
b/src/service/messenger/messenger_api_contact_store.c
similarity index 100%
rename from src/messenger/messenger_api_contact_store.c
rename to src/service/messenger/messenger_api_contact_store.c
diff --git a/src/messenger/messenger_api_contact_store.h
b/src/service/messenger/messenger_api_contact_store.h
similarity index 100%
rename from src/messenger/messenger_api_contact_store.h
rename to src/service/messenger/messenger_api_contact_store.h
diff --git a/src/messenger/messenger_api_ego.h
b/src/service/messenger/messenger_api_ego.h
similarity index 100%
rename from src/messenger/messenger_api_ego.h
rename to src/service/messenger/messenger_api_ego.h
diff --git a/src/messenger/messenger_api_handle.c
b/src/service/messenger/messenger_api_handle.c
similarity index 100%
rename from src/messenger/messenger_api_handle.c
rename to src/service/messenger/messenger_api_handle.c
diff --git a/src/messenger/messenger_api_handle.h
b/src/service/messenger/messenger_api_handle.h
similarity index 100%
rename from src/messenger/messenger_api_handle.h
rename to src/service/messenger/messenger_api_handle.h
diff --git a/src/messenger/messenger_api_list_tunnels.c
b/src/service/messenger/messenger_api_list_tunnels.c
similarity index 100%
rename from src/messenger/messenger_api_list_tunnels.c
rename to src/service/messenger/messenger_api_list_tunnels.c
diff --git a/src/messenger/messenger_api_list_tunnels.h
b/src/service/messenger/messenger_api_list_tunnels.h
similarity index 100%
rename from src/messenger/messenger_api_list_tunnels.h
rename to src/service/messenger/messenger_api_list_tunnels.h
diff --git a/src/messenger/messenger_api_message.c
b/src/service/messenger/messenger_api_message.c
similarity index 100%
rename from src/messenger/messenger_api_message.c
rename to src/service/messenger/messenger_api_message.c
diff --git a/src/messenger/messenger_api_message.h
b/src/service/messenger/messenger_api_message.h
similarity index 100%
rename from src/messenger/messenger_api_message.h
rename to src/service/messenger/messenger_api_message.h
diff --git a/src/messenger/messenger_api_room.c
b/src/service/messenger/messenger_api_room.c
similarity index 100%
rename from src/messenger/messenger_api_room.c
rename to src/service/messenger/messenger_api_room.c
diff --git a/src/messenger/messenger_api_room.h
b/src/service/messenger/messenger_api_room.h
similarity index 100%
rename from src/messenger/messenger_api_room.h
rename to src/service/messenger/messenger_api_room.h
diff --git a/src/messenger/messenger_api_util.c
b/src/service/messenger/messenger_api_util.c
similarity index 100%
rename from src/messenger/messenger_api_util.c
rename to src/service/messenger/messenger_api_util.c
diff --git a/src/messenger/messenger_api_util.h
b/src/service/messenger/messenger_api_util.h
similarity index 100%
rename from src/messenger/messenger_api_util.h
rename to src/service/messenger/messenger_api_util.h
diff --git a/src/messenger/plugin_gnsrecord_messenger.c
b/src/service/messenger/plugin_gnsrecord_messenger.c
similarity index 100%
rename from src/messenger/plugin_gnsrecord_messenger.c
rename to src/service/messenger/plugin_gnsrecord_messenger.c
diff --git a/src/messenger/test_messenger.c
b/src/service/messenger/test_messenger.c
similarity index 100%
rename from src/messenger/test_messenger.c
rename to src/service/messenger/test_messenger.c
diff --git a/src/messenger/test_messenger_anonymous.c
b/src/service/messenger/test_messenger_anonymous.c
similarity index 100%
rename from src/messenger/test_messenger_anonymous.c
rename to src/service/messenger/test_messenger_anonymous.c
diff --git a/src/messenger/test_messenger_api.conf
b/src/service/messenger/test_messenger_api.conf
similarity index 100%
rename from src/messenger/test_messenger_api.conf
rename to src/service/messenger/test_messenger_api.conf
diff --git a/src/messenger/testing_messenger_barrier.c
b/src/service/messenger/testing_messenger_barrier.c
similarity index 100%
rename from src/messenger/testing_messenger_barrier.c
rename to src/service/messenger/testing_messenger_barrier.c
diff --git a/src/messenger/testing_messenger_barrier.h
b/src/service/messenger/testing_messenger_barrier.h
similarity index 100%
rename from src/messenger/testing_messenger_barrier.h
rename to src/service/messenger/testing_messenger_barrier.h
diff --git a/src/messenger/testing_messenger_setup.c
b/src/service/messenger/testing_messenger_setup.c
similarity index 100%
rename from src/messenger/testing_messenger_setup.c
rename to src/service/messenger/testing_messenger_setup.c
diff --git a/src/messenger/testing_messenger_setup.h
b/src/service/messenger/testing_messenger_setup.h
similarity index 100%
rename from src/messenger/testing_messenger_setup.h
rename to src/service/messenger/testing_messenger_setup.h
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.