BUILD: Move messenger to service

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
index 9444fa12d..9444fa12d 100644
--- a/src/messenger/gnunet-messenger.c
+++ b/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
index ed78c5562..ed78c5562 100644
--- a/src/messenger/.gitignore
+++ b/src/service/messenger/.gitignore
diff --git a/src/messenger/Makefile.am b/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
index fedaa2f60..fedaa2f60 100644
--- a/src/messenger/gnunet-service-messenger.c
+++ b/src/service/messenger/gnunet-service-messenger.c
diff --git a/src/messenger/gnunet-service-messenger.h b/src/service/messenger/gnunet-service-messenger.h
index 1db5c651c..1db5c651c 100644
--- a/src/messenger/gnunet-service-messenger.h
+++ b/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
index ae0dcaa62..ae0dcaa62 100644
--- a/src/messenger/gnunet-service-messenger_basement.c
+++ b/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
index a097b482f..a097b482f 100644
--- a/src/messenger/gnunet-service-messenger_basement.h
+++ b/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
index a1ffdddab..a1ffdddab 100644
--- a/src/messenger/gnunet-service-messenger_ego_store.c
+++ b/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
index bf901bf5e..bf901bf5e 100644
--- a/src/messenger/gnunet-service-messenger_ego_store.h
+++ b/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
index 764331c4a..764331c4a 100644
--- a/src/messenger/gnunet-service-messenger_handle.c
+++ b/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
index edcd2ccd0..edcd2ccd0 100644
--- a/src/messenger/gnunet-service-messenger_handle.h
+++ b/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
index 0703c2de6..0703c2de6 100644
--- a/src/messenger/gnunet-service-messenger_list_handles.c
+++ b/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
index 8c066519e..8c066519e 100644
--- a/src/messenger/gnunet-service-messenger_list_handles.h
+++ b/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
index 5bab52806..5bab52806 100644
--- a/src/messenger/gnunet-service-messenger_list_messages.c
+++ b/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
index 5839f63ca..5839f63ca 100644
--- a/src/messenger/gnunet-service-messenger_list_messages.h
+++ b/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
index 96b26cfb9..96b26cfb9 100644
--- a/src/messenger/gnunet-service-messenger_member.c
+++ b/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
index c06be1df7..c06be1df7 100644
--- a/src/messenger/gnunet-service-messenger_member.h
+++ b/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
index 8ae1244c4..8ae1244c4 100644
--- a/src/messenger/gnunet-service-messenger_member_session.c
+++ b/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
index fad1ab041..fad1ab041 100644
--- a/src/messenger/gnunet-service-messenger_member_session.h
+++ b/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
index fc28babc4..fc28babc4 100644
--- a/src/messenger/gnunet-service-messenger_member_store.c
+++ b/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
index 337ddcf78..337ddcf78 100644
--- a/src/messenger/gnunet-service-messenger_member_store.h
+++ b/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
index 06b987657..06b987657 100644
--- a/src/messenger/gnunet-service-messenger_message_handle.c
+++ b/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
index 0a97cd840..0a97cd840 100644
--- a/src/messenger/gnunet-service-messenger_message_handle.h
+++ b/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
index d2923a5e3..d2923a5e3 100644
--- a/src/messenger/gnunet-service-messenger_message_kind.c
+++ b/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
index d50317844..d50317844 100644
--- a/src/messenger/gnunet-service-messenger_message_kind.h
+++ b/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
index ea309f893..ea309f893 100644
--- a/src/messenger/gnunet-service-messenger_message_recv.c
+++ b/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
index 8e5b02504..8e5b02504 100644
--- a/src/messenger/gnunet-service-messenger_message_recv.h
+++ b/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
index 09039758b..09039758b 100644
--- a/src/messenger/gnunet-service-messenger_message_send.c
+++ b/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
index 4f4c6cfc2..4f4c6cfc2 100644
--- a/src/messenger/gnunet-service-messenger_message_send.h
+++ b/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
index b2328588e..b2328588e 100644
--- a/src/messenger/gnunet-service-messenger_message_state.c
+++ b/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
index 10e6a2c46..10e6a2c46 100644
--- a/src/messenger/gnunet-service-messenger_message_state.h
+++ b/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
index 1f77de9ca..1f77de9ca 100644
--- a/src/messenger/gnunet-service-messenger_message_store.c
+++ b/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
index 262d10555..262d10555 100644
--- a/src/messenger/gnunet-service-messenger_message_store.h
+++ b/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
index 9c4201fdf..9c4201fdf 100644
--- a/src/messenger/gnunet-service-messenger_operation.c
+++ b/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
index b93282d24..b93282d24 100644
--- a/src/messenger/gnunet-service-messenger_operation.h
+++ b/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
index 6a639d69e..6a639d69e 100644
--- a/src/messenger/gnunet-service-messenger_operation_store.c
+++ b/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
index 16531758c..16531758c 100644
--- a/src/messenger/gnunet-service-messenger_operation_store.h
+++ b/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
index f2f841c20..f2f841c20 100644
--- a/src/messenger/gnunet-service-messenger_room.c
+++ b/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
index fb2a88aea..fb2a88aea 100644
--- a/src/messenger/gnunet-service-messenger_room.h
+++ b/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
index 8dfc258c1..8dfc258c1 100644
--- a/src/messenger/gnunet-service-messenger_service.c
+++ b/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
index 36df81141..36df81141 100644
--- a/src/messenger/gnunet-service-messenger_service.h
+++ b/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
index 8ad7fff1c..8ad7fff1c 100644
--- a/src/messenger/gnunet-service-messenger_tunnel.c
+++ b/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
index 2ffa2d04f..2ffa2d04f 100644
--- a/src/messenger/gnunet-service-messenger_tunnel.h
+++ b/src/service/messenger/gnunet-service-messenger_tunnel.h
diff --git a/src/messenger/meson.build b/src/service/messenger/meson.build
index c855b45e4..c855b45e4 100644
--- a/src/messenger/meson.build
+++ b/src/service/messenger/meson.build
diff --git a/src/messenger/messenger.conf.in b/src/service/messenger/messenger.conf.in
index ef0544681..ef0544681 100644
--- a/src/messenger/messenger.conf.in
+++ b/src/service/messenger/messenger.conf.in
diff --git a/src/messenger/messenger_api.c b/src/service/messenger/messenger_api.c
index 3604d0569..3604d0569 100644
--- a/src/messenger/messenger_api.c
+++ b/src/service/messenger/messenger_api.c
diff --git a/src/messenger/messenger_api_contact.c b/src/service/messenger/messenger_api_contact.c
index a11190c2c..a11190c2c 100644
--- a/src/messenger/messenger_api_contact.c
+++ b/src/service/messenger/messenger_api_contact.c
diff --git a/src/messenger/messenger_api_contact.h b/src/service/messenger/messenger_api_contact.h
index 4463aa746..4463aa746 100644
--- a/src/messenger/messenger_api_contact.h
+++ b/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
index b0e0d026b..b0e0d026b 100644
--- a/src/messenger/messenger_api_contact_store.c
+++ b/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
index e012e42c1..e012e42c1 100644
--- a/src/messenger/messenger_api_contact_store.h
+++ b/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
index 1d84c524f..1d84c524f 100644
--- a/src/messenger/messenger_api_ego.h
+++ b/src/service/messenger/messenger_api_ego.h
diff --git a/src/messenger/messenger_api_handle.c b/src/service/messenger/messenger_api_handle.c
index fddf73ad5..fddf73ad5 100644
--- a/src/messenger/messenger_api_handle.c
+++ b/src/service/messenger/messenger_api_handle.c
diff --git a/src/messenger/messenger_api_handle.h b/src/service/messenger/messenger_api_handle.h
index 09f44be8a..09f44be8a 100644
--- a/src/messenger/messenger_api_handle.h
+++ b/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
index a4126c286..a4126c286 100644
--- a/src/messenger/messenger_api_list_tunnels.c
+++ b/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
index d2ceeafc2..d2ceeafc2 100644
--- a/src/messenger/messenger_api_list_tunnels.h
+++ b/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
index 1f7e8dbf2..1f7e8dbf2 100644
--- a/src/messenger/messenger_api_message.c
+++ b/src/service/messenger/messenger_api_message.c
diff --git a/src/messenger/messenger_api_message.h b/src/service/messenger/messenger_api_message.h
index 0c2d4acf2..0c2d4acf2 100644
--- a/src/messenger/messenger_api_message.h
+++ b/src/service/messenger/messenger_api_message.h
diff --git a/src/messenger/messenger_api_room.c b/src/service/messenger/messenger_api_room.c
index c3e8bc957..c3e8bc957 100644
--- a/src/messenger/messenger_api_room.c
+++ b/src/service/messenger/messenger_api_room.c
diff --git a/src/messenger/messenger_api_room.h b/src/service/messenger/messenger_api_room.h
index d5ffc5c4b..d5ffc5c4b 100644
--- a/src/messenger/messenger_api_room.h
+++ b/src/service/messenger/messenger_api_room.h
diff --git a/src/messenger/messenger_api_util.c b/src/service/messenger/messenger_api_util.c
index 9d23e2262..9d23e2262 100644
--- a/src/messenger/messenger_api_util.c
+++ b/src/service/messenger/messenger_api_util.c
diff --git a/src/messenger/messenger_api_util.h b/src/service/messenger/messenger_api_util.h
index bad001da3..bad001da3 100644
--- a/src/messenger/messenger_api_util.h
+++ b/src/service/messenger/messenger_api_util.h
diff --git a/src/messenger/plugin_gnsrecord_messenger.c b/src/service/messenger/plugin_gnsrecord_messenger.c
index e09a0330d..e09a0330d 100644
--- a/src/messenger/plugin_gnsrecord_messenger.c
+++ b/src/service/messenger/plugin_gnsrecord_messenger.c
diff --git a/src/messenger/test_messenger.c b/src/service/messenger/test_messenger.c
index 660e6473c..660e6473c 100644
--- a/src/messenger/test_messenger.c
+++ b/src/service/messenger/test_messenger.c
diff --git a/src/messenger/test_messenger_anonymous.c b/src/service/messenger/test_messenger_anonymous.c
index 367d1c3b7..367d1c3b7 100644
--- a/src/messenger/test_messenger_anonymous.c
+++ b/src/service/messenger/test_messenger_anonymous.c
diff --git a/src/messenger/test_messenger_api.conf b/src/service/messenger/test_messenger_api.conf
index 968f56f6d..968f56f6d 100644
--- a/src/messenger/test_messenger_api.conf
+++ b/src/service/messenger/test_messenger_api.conf
diff --git a/src/messenger/testing_messenger_barrier.c b/src/service/messenger/testing_messenger_barrier.c
index 60d1fc0fe..60d1fc0fe 100644
--- a/src/messenger/testing_messenger_barrier.c
+++ b/src/service/messenger/testing_messenger_barrier.c
diff --git a/src/messenger/testing_messenger_barrier.h b/src/service/messenger/testing_messenger_barrier.h
index 5ea0fe137..5ea0fe137 100644
--- a/src/messenger/testing_messenger_barrier.h
+++ b/src/service/messenger/testing_messenger_barrier.h
diff --git a/src/messenger/testing_messenger_setup.c b/src/service/messenger/testing_messenger_setup.c
index 65cf12e73..65cf12e73 100644
--- a/src/messenger/testing_messenger_setup.c
+++ b/src/service/messenger/testing_messenger_setup.c
diff --git a/src/messenger/testing_messenger_setup.h b/src/service/messenger/testing_messenger_setup.h
index e5ae0c151..e5ae0c151 100644
--- a/src/messenger/testing_messenger_setup.h
+++ b/src/service/messenger/testing_messenger_setup.h