[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated (a2de07695 -> 3de5a3245)
|
From: |
gnunet |
|
Subject: |
[gnunet] branch master updated (a2de07695 -> 3de5a3245) |
|
Date: |
Thu, 19 Oct 2023 12:53:49 +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 a2de07695 -fix gns idn
new 39e327905 BUILD: Move reclaim to service
new 7ef64b65a BUILD: Move messenger to service
new 3de5a3245 BUILD: Add readme on new structure
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 | 10 +-
po/POTFILES.in | 104 ++++-----
src/Makefile.am | 4 +-
src/README | 13 ++
src/cli/Makefile.am | 4 +-
src/cli/messenger/.gitignore | 1 +
src/cli/{cadet => messenger}/Makefile.am | 16 +-
src/{ => cli}/messenger/gnunet-messenger.c | 0
src/cli/reclaim/.gitignore | 2 +
src/cli/reclaim/Makefile.am | 55 +++++
src/{ => cli}/reclaim/gnunet-did.c | 1 -
src/{ => cli}/reclaim/gnunet-reclaim.c | 0
src/{ => cli}/reclaim/test_reclaim.sh | 0
src/{ => cli}/reclaim/test_reclaim_attribute.sh | 0
src/{ => cli}/reclaim/test_reclaim_consume.sh | 0
src/{ => cli}/reclaim/test_reclaim_issue.sh | 0
src/{ => cli}/reclaim/test_reclaim_revoke.sh | 0
src/plugin/Makefile.am | 3 +-
src/plugin/reclaim/Makefile.am | 70 ++++++
.../reclaim/plugin_gnsrecord_reclaim.c | 0
.../reclaim/plugin_reclaim_attribute_basic.c | 0
.../reclaim/plugin_reclaim_credential_jwt.c | 0
.../reclaim/plugin_reclaim_credential_pabc.c | 0
src/reclaim/Makefile.am | 252 ---------------------
src/rest-plugin/Makefile.am | 3 +-
src/rest-plugin/reclaim/Makefile.am | 81 +++++++
src/{ => rest-plugin}/reclaim/json_reclaim.c | 0
src/{ => rest-plugin}/reclaim/json_reclaim.h | 0
src/{ => rest-plugin}/reclaim/oidc_helper.c | 0
src/{ => rest-plugin}/reclaim/oidc_helper.h | 0
.../reclaim/plugin_rest_openid_connect.c | 0
src/{ => rest-plugin}/reclaim/plugin_rest_pabc.c | 0
.../reclaim/plugin_rest_reclaim.c | 0
src/service/Makefile.am | 4 +-
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
src/{ => service}/reclaim/.gitignore | 0
src/service/reclaim/Makefile.am | 104 +++++++++
src/{ => service}/reclaim/did.h | 0
src/{ => service}/reclaim/did_core.c | 0
src/{ => service}/reclaim/did_core.h | 0
src/{ => service}/reclaim/did_helper.c | 0
src/{ => service}/reclaim/did_helper.h | 0
src/{ => service}/reclaim/did_misc.c | 0
src/{ => service}/reclaim/gnunet-service-reclaim.c | 0
.../reclaim/gnunet-service-reclaim_tickets.c | 0
.../reclaim/gnunet-service-reclaim_tickets.h | 0
src/{ => service}/reclaim/meson.build | 0
src/{ => service}/reclaim/pabc_helper.c | 0
src/{ => service}/reclaim/pabc_helper.h | 0
src/{ => service}/reclaim/reclaim.conf | 0
src/{ => service}/reclaim/reclaim.h | 0
src/{ => service}/reclaim/reclaim_api.c | 0
src/{ => service}/reclaim/reclaim_attribute.c | 0
src/{ => service}/reclaim/reclaim_attribute.h | 0
src/{ => service}/reclaim/reclaim_credential.c | 0
src/{ => service}/reclaim/reclaim_credential.h | 0
src/{ => service}/reclaim/test_did_helper.c | 0
src/{ => service}/reclaim/test_reclaim.conf | 0
src/{ => service}/reclaim/test_reclaim_attribute.c | 0
.../reclaim/test_reclaim_defaults.conf | 0
src/{ => service}/reclaim/test_w3c_ed25519_2020.c | 0
128 files changed, 403 insertions(+), 335 deletions(-)
create mode 100644 src/README
create mode 100644 src/cli/messenger/.gitignore
copy src/cli/{cadet => messenger}/Makefile.am (53%)
rename src/{ => cli}/messenger/gnunet-messenger.c (100%)
create mode 100644 src/cli/reclaim/.gitignore
create mode 100644 src/cli/reclaim/Makefile.am
rename src/{ => cli}/reclaim/gnunet-did.c (99%)
rename src/{ => cli}/reclaim/gnunet-reclaim.c (100%)
rename src/{ => cli}/reclaim/test_reclaim.sh (100%)
rename src/{ => cli}/reclaim/test_reclaim_attribute.sh (100%)
rename src/{ => cli}/reclaim/test_reclaim_consume.sh (100%)
rename src/{ => cli}/reclaim/test_reclaim_issue.sh (100%)
rename src/{ => cli}/reclaim/test_reclaim_revoke.sh (100%)
create mode 100644 src/plugin/reclaim/Makefile.am
rename src/{ => plugin}/reclaim/plugin_gnsrecord_reclaim.c (100%)
rename src/{ => plugin}/reclaim/plugin_reclaim_attribute_basic.c (100%)
rename src/{ => plugin}/reclaim/plugin_reclaim_credential_jwt.c (100%)
rename src/{ => plugin}/reclaim/plugin_reclaim_credential_pabc.c (100%)
delete mode 100644 src/reclaim/Makefile.am
create mode 100644 src/rest-plugin/reclaim/Makefile.am
rename src/{ => rest-plugin}/reclaim/json_reclaim.c (100%)
rename src/{ => rest-plugin}/reclaim/json_reclaim.h (100%)
rename src/{ => rest-plugin}/reclaim/oidc_helper.c (100%)
rename src/{ => rest-plugin}/reclaim/oidc_helper.h (100%)
rename src/{ => rest-plugin}/reclaim/plugin_rest_openid_connect.c (100%)
rename src/{ => rest-plugin}/reclaim/plugin_rest_pabc.c (100%)
rename src/{ => rest-plugin}/reclaim/plugin_rest_reclaim.c (100%)
rename src/{ => service}/messenger/.gitignore (100%)
rename src/{ => service}/messenger/Makefile.am (94%)
rename src/{ => service}/messenger/gnunet-service-messenger.c (100%)
rename src/{ => service}/messenger/gnunet-service-messenger.h (100%)
rename src/{ => service}/messenger/gnunet-service-messenger_basement.c (100%)
rename src/{ => service}/messenger/gnunet-service-messenger_basement.h (100%)
rename src/{ => service}/messenger/gnunet-service-messenger_ego_store.c (100%)
rename src/{ => service}/messenger/gnunet-service-messenger_ego_store.h (100%)
rename src/{ => service}/messenger/gnunet-service-messenger_handle.c (100%)
rename src/{ => service}/messenger/gnunet-service-messenger_handle.h (100%)
rename src/{ => service}/messenger/gnunet-service-messenger_list_handles.c
(100%)
rename src/{ => service}/messenger/gnunet-service-messenger_list_handles.h
(100%)
rename src/{ => service}/messenger/gnunet-service-messenger_list_messages.c
(100%)
rename src/{ => service}/messenger/gnunet-service-messenger_list_messages.h
(100%)
rename src/{ => service}/messenger/gnunet-service-messenger_member.c (100%)
rename src/{ => service}/messenger/gnunet-service-messenger_member.h (100%)
rename src/{ => service}/messenger/gnunet-service-messenger_member_session.c
(100%)
rename src/{ => service}/messenger/gnunet-service-messenger_member_session.h
(100%)
rename src/{ => service}/messenger/gnunet-service-messenger_member_store.c
(100%)
rename src/{ => service}/messenger/gnunet-service-messenger_member_store.h
(100%)
rename src/{ => service}/messenger/gnunet-service-messenger_message_handle.c
(100%)
rename src/{ => service}/messenger/gnunet-service-messenger_message_handle.h
(100%)
rename src/{ => service}/messenger/gnunet-service-messenger_message_kind.c
(100%)
rename src/{ => service}/messenger/gnunet-service-messenger_message_kind.h
(100%)
rename src/{ => service}/messenger/gnunet-service-messenger_message_recv.c
(100%)
rename src/{ => service}/messenger/gnunet-service-messenger_message_recv.h
(100%)
rename src/{ => service}/messenger/gnunet-service-messenger_message_send.c
(100%)
rename src/{ => service}/messenger/gnunet-service-messenger_message_send.h
(100%)
rename src/{ => service}/messenger/gnunet-service-messenger_message_state.c
(100%)
rename src/{ => service}/messenger/gnunet-service-messenger_message_state.h
(100%)
rename src/{ => service}/messenger/gnunet-service-messenger_message_store.c
(100%)
rename src/{ => service}/messenger/gnunet-service-messenger_message_store.h
(100%)
rename src/{ => service}/messenger/gnunet-service-messenger_operation.c (100%)
rename src/{ => service}/messenger/gnunet-service-messenger_operation.h (100%)
rename src/{ => service}/messenger/gnunet-service-messenger_operation_store.c
(100%)
rename src/{ => service}/messenger/gnunet-service-messenger_operation_store.h
(100%)
rename src/{ => service}/messenger/gnunet-service-messenger_room.c (100%)
rename src/{ => service}/messenger/gnunet-service-messenger_room.h (100%)
rename src/{ => service}/messenger/gnunet-service-messenger_service.c (100%)
rename src/{ => service}/messenger/gnunet-service-messenger_service.h (100%)
rename src/{ => service}/messenger/gnunet-service-messenger_tunnel.c (100%)
rename src/{ => service}/messenger/gnunet-service-messenger_tunnel.h (100%)
rename src/{ => service}/messenger/meson.build (100%)
rename src/{ => service}/messenger/messenger.conf.in (100%)
rename src/{ => service}/messenger/messenger_api.c (100%)
rename src/{ => service}/messenger/messenger_api_contact.c (100%)
rename src/{ => service}/messenger/messenger_api_contact.h (100%)
rename src/{ => service}/messenger/messenger_api_contact_store.c (100%)
rename src/{ => service}/messenger/messenger_api_contact_store.h (100%)
rename src/{ => service}/messenger/messenger_api_ego.h (100%)
rename src/{ => service}/messenger/messenger_api_handle.c (100%)
rename src/{ => service}/messenger/messenger_api_handle.h (100%)
rename src/{ => service}/messenger/messenger_api_list_tunnels.c (100%)
rename src/{ => service}/messenger/messenger_api_list_tunnels.h (100%)
rename src/{ => service}/messenger/messenger_api_message.c (100%)
rename src/{ => service}/messenger/messenger_api_message.h (100%)
rename src/{ => service}/messenger/messenger_api_room.c (100%)
rename src/{ => service}/messenger/messenger_api_room.h (100%)
rename src/{ => service}/messenger/messenger_api_util.c (100%)
rename src/{ => service}/messenger/messenger_api_util.h (100%)
rename src/{ => service}/messenger/plugin_gnsrecord_messenger.c (100%)
rename src/{ => service}/messenger/test_messenger.c (100%)
rename src/{ => service}/messenger/test_messenger_anonymous.c (100%)
rename src/{ => service}/messenger/test_messenger_api.conf (100%)
rename src/{ => service}/messenger/testing_messenger_barrier.c (100%)
rename src/{ => service}/messenger/testing_messenger_barrier.h (100%)
rename src/{ => service}/messenger/testing_messenger_setup.c (100%)
rename src/{ => service}/messenger/testing_messenger_setup.h (100%)
rename src/{ => service}/reclaim/.gitignore (100%)
create mode 100644 src/service/reclaim/Makefile.am
rename src/{ => service}/reclaim/did.h (100%)
rename src/{ => service}/reclaim/did_core.c (100%)
rename src/{ => service}/reclaim/did_core.h (100%)
rename src/{ => service}/reclaim/did_helper.c (100%)
rename src/{ => service}/reclaim/did_helper.h (100%)
rename src/{ => service}/reclaim/did_misc.c (100%)
rename src/{ => service}/reclaim/gnunet-service-reclaim.c (100%)
rename src/{ => service}/reclaim/gnunet-service-reclaim_tickets.c (100%)
rename src/{ => service}/reclaim/gnunet-service-reclaim_tickets.h (100%)
rename src/{ => service}/reclaim/meson.build (100%)
rename src/{ => service}/reclaim/pabc_helper.c (100%)
rename src/{ => service}/reclaim/pabc_helper.h (100%)
rename src/{ => service}/reclaim/reclaim.conf (100%)
rename src/{ => service}/reclaim/reclaim.h (100%)
rename src/{ => service}/reclaim/reclaim_api.c (100%)
rename src/{ => service}/reclaim/reclaim_attribute.c (100%)
rename src/{ => service}/reclaim/reclaim_attribute.h (100%)
rename src/{ => service}/reclaim/reclaim_credential.c (100%)
rename src/{ => service}/reclaim/reclaim_credential.h (100%)
rename src/{ => service}/reclaim/test_did_helper.c (100%)
rename src/{ => service}/reclaim/test_reclaim.conf (100%)
rename src/{ => service}/reclaim/test_reclaim_attribute.c (100%)
rename src/{ => service}/reclaim/test_reclaim_defaults.conf (100%)
rename src/{ => service}/reclaim/test_w3c_ed25519_2020.c (100%)
diff --git a/configure.ac b/configure.ac
index a792b0290..ab92e7f22 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1245,6 +1245,7 @@ src/plugin/gns/Makefile
src/plugin/gnsrecord/Makefile
src/plugin/namecache/Makefile
src/plugin/namestore/Makefile
+src/plugin/reclaim/Makefile
src/plugin/revocation/Makefile
src/service/Makefile
src/service/arm/Makefile
@@ -1269,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
@@ -1282,6 +1285,7 @@ src/service/nse/nse.conf
src/service/peerstore/Makefile
src/service/peerstore/peerstore.conf
src/service/pt/Makefile
+src/service/reclaim/Makefile
src/service/regex/Makefile
src/service/regex/regex.conf
src/service/rest/Makefile
@@ -1305,6 +1309,7 @@ src/service/zonemaster/zonemaster.conf
src/rest-plugin/Makefile
src/rest-plugin/gns/Makefile
src/rest-plugin/identity/Makefile
+src/rest-plugin/reclaim/Makefile
src/rest-plugin/rest/Makefile
src/cli/Makefile
src/cli/arm/Makefile
@@ -1314,11 +1319,13 @@ 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
src/cli/nat-auto/Makefile
src/cli/nse/Makefile
+src/cli/reclaim/Makefile
src/cli/revocation/Makefile
src/cli/statistics/Makefile
src/cli/util/Makefile
@@ -1345,9 +1352,6 @@ src/contrib/cli/template/Makefile
src/lib/hello/Makefile
src/include/Makefile
src/include/gnunet_config.h
-src/reclaim/Makefile
-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 3e96e599d..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
@@ -24,6 +25,8 @@ src/cli/nat-auto/gnunet-nat-auto.c
src/cli/nat-auto/gnunet-nat-server.c
src/cli/nat/gnunet-nat.c
src/cli/nse/gnunet-nse.c
+src/cli/reclaim/gnunet-did.c
+src/cli/reclaim/gnunet-reclaim.c
src/cli/revocation/gnunet-revocation-tvg.c
src/cli/revocation/gnunet-revocation.c
src/cli/statistics/gnunet-statistics.c
@@ -202,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
@@ -250,29 +221,18 @@ src/plugin/namestore/plugin_namestore_flat.c
src/plugin/namestore/plugin_namestore_postgres.c
src/plugin/namestore/plugin_namestore_sqlite.c
src/plugin/namestore/plugin_rest_namestore.c
+src/plugin/reclaim/plugin_gnsrecord_reclaim.c
+src/plugin/reclaim/plugin_reclaim_attribute_basic.c
+src/plugin/reclaim/plugin_reclaim_credential_jwt.c
+src/plugin/reclaim/plugin_reclaim_credential_pabc.c
src/plugin/revocation/plugin_block_revocation.c
-src/reclaim/did_core.c
-src/reclaim/did_helper.c
-src/reclaim/did_misc.c
-src/reclaim/gnunet-did.c
-src/reclaim/gnunet-reclaim.c
-src/reclaim/gnunet-service-reclaim.c
-src/reclaim/gnunet-service-reclaim_tickets.c
-src/reclaim/json_reclaim.c
-src/reclaim/oidc_helper.c
-src/reclaim/pabc_helper.c
-src/reclaim/plugin_gnsrecord_reclaim.c
-src/reclaim/plugin_reclaim_attribute_basic.c
-src/reclaim/plugin_reclaim_credential_jwt.c
-src/reclaim/plugin_reclaim_credential_pabc.c
-src/reclaim/plugin_rest_openid_connect.c
-src/reclaim/plugin_rest_pabc.c
-src/reclaim/plugin_rest_reclaim.c
-src/reclaim/reclaim_api.c
-src/reclaim/reclaim_attribute.c
-src/reclaim/reclaim_credential.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
src/rest-plugin/rest/plugin_rest_config.c
src/rest-plugin/rest/plugin_rest_copying.c
src/service/arm/arm_api.c
@@ -383,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
@@ -413,6 +404,15 @@ src/service/peerstore/peerstore_common.c
src/service/peerstore/plugin_peerstore_flat.c
src/service/peerstore/plugin_peerstore_sqlite.c
src/service/pt/gnunet-daemon-pt.c
+src/service/reclaim/did_core.c
+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/pabc_helper.c
+src/service/reclaim/reclaim_api.c
+src/service/reclaim/reclaim_attribute.c
+src/service/reclaim/reclaim_credential.c
src/service/regex/gnunet-daemon-regexprofiler.c
src/service/regex/gnunet-regex-profiler.c
src/service/regex/gnunet-regex-simulation-profiler.c
diff --git a/src/Makefile.am b/src/Makefile.am
index b30ae47f6..2b1e94c50 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,6 +9,4 @@ SUBDIRS = \
plugin \
rest-plugin \
cli \
- contrib \
- reclaim \
- messenger
+ contrib
diff --git a/src/README b/src/README
new file mode 100644
index 000000000..e74bf3def
--- /dev/null
+++ b/src/README
@@ -0,0 +1,13 @@
+# Folder layout
+
+ - lib/ : Core libraries. Does not contain any binaries.
+ - service/: Core services. Contains services and daemons.
+ - plugin/: ltlibraries/dlload plugins. DBs, REST, Block etc.
+ - contrib/: Third-party, experimental or currently unmaintained components.
Also has lib/service/plugin layout.
+
+# Open issues:
+
+ - Separate folder for daemons after service? daemon/
+ - Separate folder for tests after plugin? test/
+ - Separate folder for configuration? conf/
+ - Possibly move arm and testing into lib and rename it to base/
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index 950aab622..06fdfb629 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -14,4 +14,6 @@ SUBDIRS = \
vpn \
gns \
fs \
- cadet
+ cadet \
+ 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/cadet/Makefile.am b/src/cli/messenger/Makefile.am
similarity index 53%
copy from src/cli/cadet/Makefile.am
copy to src/cli/messenger/Makefile.am
index fc9caa12c..bb5e9c388 100644
--- a/src/cli/cadet/Makefile.am
+++ b/src/cli/messenger/Makefile.am
@@ -10,17 +10,15 @@ pkgcfgdir= $(pkgdatadir)/config.d/
libexecdir= $(pkglibdir)/libexec/
-plugindir = $(libdir)/gnunet
-
AM_CLFAGS = -g
bin_PROGRAMS = \
- gnunet-cadet
+ gnunet-messenger
-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 = \
+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/cli/reclaim/.gitignore b/src/cli/reclaim/.gitignore
new file mode 100644
index 000000000..49e84eb66
--- /dev/null
+++ b/src/cli/reclaim/.gitignore
@@ -0,0 +1,2 @@
+gnunet-reclaim
+gnunet-did
diff --git a/src/cli/reclaim/Makefile.am b/src/cli/reclaim/Makefile.am
new file mode 100644
index 000000000..1a9273f6b
--- /dev/null
+++ b/src/cli/reclaim/Makefile.am
@@ -0,0 +1,55 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+ plugindir = $(libdir)/gnunet
+
+if USE_COVERAGE
+ AM_CFLAGS = --coverage -O0
+ XLIB = -lgcov
+endif
+
+
+EXTRA_DIST = \
+ $(check_SCRIPTS)
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+bin_PROGRAMS = \
+ gnunet-reclaim \
+ gnunet-did
+
+gnunet_reclaim_SOURCES = \
+ gnunet-reclaim.c
+gnunet_reclaim_LDADD = \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+ $(top_builddir)/src/service/reclaim/libgnunetreclaim.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(GN_LIBINTL)
+
+gnunet_did_SOURCES = \
+ gnunet-did.c
+gnunet_did_LDADD = \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/service/gns/libgnunetgns.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+ $(top_builddir)/src/service/reclaim/libgnunetdid.la \
+ -ljansson
+gnunet_did_CFLAGS = \
+ -I$(top_builddir)/src/service/reclaim
+
+check_SCRIPTS = \
+ test_reclaim_attribute.sh \
+ test_reclaim_issue.sh \
+ test_reclaim_consume.sh
+
+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;
+ TESTS = \
+ $(check_SCRIPTS) \
+ $(check_PROGRAMS)
+endif
diff --git a/src/reclaim/gnunet-did.c b/src/cli/reclaim/gnunet-did.c
similarity index 99%
rename from src/reclaim/gnunet-did.c
rename to src/cli/reclaim/gnunet-did.c
index e88a3671e..33f6c5657 100644
--- a/src/reclaim/gnunet-did.c
+++ b/src/cli/reclaim/gnunet-did.c
@@ -39,7 +39,6 @@
#include "gnunet_identity_service.h"
#include "gnunet_gns_service.h"
#include "gnunet_gnsrecord_lib.h"
-#include "did_helper.h"
#include "did_core.h"
#include "jansson.h"
diff --git a/src/reclaim/gnunet-reclaim.c b/src/cli/reclaim/gnunet-reclaim.c
similarity index 100%
rename from src/reclaim/gnunet-reclaim.c
rename to src/cli/reclaim/gnunet-reclaim.c
diff --git a/src/reclaim/test_reclaim.sh b/src/cli/reclaim/test_reclaim.sh
similarity index 100%
rename from src/reclaim/test_reclaim.sh
rename to src/cli/reclaim/test_reclaim.sh
diff --git a/src/reclaim/test_reclaim_attribute.sh
b/src/cli/reclaim/test_reclaim_attribute.sh
similarity index 100%
rename from src/reclaim/test_reclaim_attribute.sh
rename to src/cli/reclaim/test_reclaim_attribute.sh
diff --git a/src/reclaim/test_reclaim_consume.sh
b/src/cli/reclaim/test_reclaim_consume.sh
similarity index 100%
rename from src/reclaim/test_reclaim_consume.sh
rename to src/cli/reclaim/test_reclaim_consume.sh
diff --git a/src/reclaim/test_reclaim_issue.sh
b/src/cli/reclaim/test_reclaim_issue.sh
similarity index 100%
rename from src/reclaim/test_reclaim_issue.sh
rename to src/cli/reclaim/test_reclaim_issue.sh
diff --git a/src/reclaim/test_reclaim_revoke.sh
b/src/cli/reclaim/test_reclaim_revoke.sh
similarity index 100%
rename from src/reclaim/test_reclaim_revoke.sh
rename to src/cli/reclaim/test_reclaim_revoke.sh
diff --git a/src/plugin/Makefile.am b/src/plugin/Makefile.am
index 574c57639..1a1ecffa7 100644
--- a/src/plugin/Makefile.am
+++ b/src/plugin/Makefile.am
@@ -6,4 +6,5 @@ SUBDIRS = \
namestore \
revocation \
gns \
- fs
+ fs \
+ reclaim
diff --git a/src/plugin/reclaim/Makefile.am b/src/plugin/reclaim/Makefile.am
new file mode 100644
index 000000000..0b5159c6b
--- /dev/null
+++ b/src/plugin/reclaim/Makefile.am
@@ -0,0 +1,70 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+ plugindir = $(libdir)/gnunet
+
+if USE_COVERAGE
+ AM_CFLAGS = --coverage -O0
+ XLIB = -lgcov
+endif
+
+
+CREDENTIAL_PLUGIN = \
+ libgnunet_plugin_reclaim_credential_jwt.la
+
+if HAVE_PABC
+ CREDENTIAL_PLUGIN += libgnunet_plugin_reclaim_credential_pabc.la
+endif
+
+plugin_LTLIBRARIES = \
+ libgnunet_plugin_gnsrecord_reclaim.la \
+ libgnunet_plugin_reclaim_attribute_basic.la \
+ $(CREDENTIAL_PLUGIN)
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+libgnunet_plugin_gnsrecord_reclaim_la_SOURCES = \
+ plugin_gnsrecord_reclaim.c
+libgnunet_plugin_gnsrecord_reclaim_la_LIBADD = \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(LTLIBINTL)
+libgnunet_plugin_gnsrecord_reclaim_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
+
+libgnunet_plugin_reclaim_attribute_basic_la_SOURCES = \
+ plugin_reclaim_attribute_basic.c
+libgnunet_plugin_reclaim_attribute_basic_la_LIBADD = \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(LTLIBINTL)
+libgnunet_plugin_reclaim_attribute_basic_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
+if HAVE_PABC
+libgnunet_plugin_reclaim_credential_pabc_la_SOURCES = \
+ plugin_reclaim_credential_pabc.c \
+ pabc_helper.c \
+ pabc_helper.h
+libgnunet_plugin_reclaim_credential_pabc_la_LIBADD = \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/service/reclaim/libgnunetreclaim.la \
+ -ljansson\
+ -lpabc \
+ $(LTLIBINTL)
+libgnunet_plugin_reclaim_credential_pabc_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+endif
+
+
+libgnunet_plugin_reclaim_credential_jwt_la_SOURCES = \
+ plugin_reclaim_credential_jwt.c
+libgnunet_plugin_reclaim_credential_jwt_la_LIBADD = \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/service/reclaim/libgnunetreclaim.la \
+ -ljansson\
+ $(LTLIBINTL)
+libgnunet_plugin_reclaim_credential_jwt_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
diff --git a/src/reclaim/plugin_gnsrecord_reclaim.c
b/src/plugin/reclaim/plugin_gnsrecord_reclaim.c
similarity index 100%
rename from src/reclaim/plugin_gnsrecord_reclaim.c
rename to src/plugin/reclaim/plugin_gnsrecord_reclaim.c
diff --git a/src/reclaim/plugin_reclaim_attribute_basic.c
b/src/plugin/reclaim/plugin_reclaim_attribute_basic.c
similarity index 100%
rename from src/reclaim/plugin_reclaim_attribute_basic.c
rename to src/plugin/reclaim/plugin_reclaim_attribute_basic.c
diff --git a/src/reclaim/plugin_reclaim_credential_jwt.c
b/src/plugin/reclaim/plugin_reclaim_credential_jwt.c
similarity index 100%
rename from src/reclaim/plugin_reclaim_credential_jwt.c
rename to src/plugin/reclaim/plugin_reclaim_credential_jwt.c
diff --git a/src/reclaim/plugin_reclaim_credential_pabc.c
b/src/plugin/reclaim/plugin_reclaim_credential_pabc.c
similarity index 100%
rename from src/reclaim/plugin_reclaim_credential_pabc.c
rename to src/plugin/reclaim/plugin_reclaim_credential_pabc.c
diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am
deleted file mode 100644
index e5603d662..000000000
--- a/src/reclaim/Makefile.am
+++ /dev/null
@@ -1,252 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
- plugindir = $(libdir)/gnunet
-
-if USE_COVERAGE
- AM_CFLAGS = --coverage -O0
- XLIB = -lgcov
-endif
-
-
-REST_PLUGIN = \
- libgnunet_plugin_rest_reclaim.la
-
-if HAVE_JOSE
-REST_PLUGIN += libgnunet_plugin_rest_openid_connect.la
-endif
-
-CREDENTIAL_PLUGIN = \
- libgnunet_plugin_reclaim_credential_jwt.la
-
-if HAVE_PABC
- CREDENTIAL_PLUGIN += libgnunet_plugin_reclaim_credential_pabc.la
- REST_PLUGIN += libgnunet_plugin_rest_pabc.la
-endif
-
-EXTRA_DIST = \
- reclaim.conf \
- test_reclaim_defaults.conf \
- test_reclaim.conf \
- $(check_SCRIPTS)
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfg_DATA = \
- reclaim.conf
-
-lib_LTLIBRARIES = \
- libgnunetreclaim.la \
- libgnunetdid.la
-plugin_LTLIBRARIES = \
- libgnunet_plugin_gnsrecord_reclaim.la \
- libgnunet_plugin_reclaim_attribute_basic.la \
- $(CREDENTIAL_PLUGIN) \
- $(REST_PLUGIN)
-
-bin_PROGRAMS = \
- gnunet-reclaim \
- gnunet-did
-
-libexec_PROGRAMS = \
- gnunet-service-reclaim
-
-libgnunet_plugin_rest_reclaim_la_SOURCES = \
- plugin_rest_reclaim.c \
- json_reclaim.h \
- json_reclaim.c
-libgnunet_plugin_rest_reclaim_la_LIBADD = \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- libgnunetreclaim.la \
- $(top_builddir)/src/lib/json/libgnunetjson.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/rest/libgnunetrest.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
- $(LTLIBINTL) -ljansson $(MHD_LIBS)
-libgnunet_plugin_rest_reclaim_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_rest_reclaim_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
-
-if HAVE_JOSE
-libgnunet_plugin_rest_openid_connect_la_SOURCES = \
- plugin_rest_openid_connect.c \
- oidc_helper.h \
- oidc_helper.c
-libgnunet_plugin_rest_openid_connect_la_LIBADD = \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- libgnunetreclaim.la \
- $(top_builddir)/src/service/rest/libgnunetrest.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
- $(top_builddir)/src/service/gns/libgnunetgns.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
- $(LTLIBINTL) -ljansson -ljose $(MHD_LIBS) \
- $(LIBGCRYPT_LIBS)
-libgnunet_plugin_rest_openid_connect_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_rest_openid_connect_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
-endif
-
-if HAVE_PABC
-libgnunet_plugin_rest_pabc_la_SOURCES = \
- plugin_rest_pabc.c \
- pabc_helper.c
-libgnunet_plugin_rest_pabc_la_LIBADD = \
- libgnunetreclaim.la \
- $(top_builddir)/src/lib/json/libgnunetjson.la \
- $(top_builddir)/src/service/rest/libgnunetrest.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
- $(LTLIBINTL) -ljansson -lpabc $(MHD_LIBS)
-libgnunet_plugin_rest_pabc_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_rest_pabc_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
-endif
-
-
-libgnunet_plugin_gnsrecord_reclaim_la_SOURCES = \
- plugin_gnsrecord_reclaim.c
-libgnunet_plugin_gnsrecord_reclaim_la_LIBADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(LTLIBINTL)
-libgnunet_plugin_gnsrecord_reclaim_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
-gnunet_service_reclaim_SOURCES = \
- gnunet-service-reclaim.c \
- gnunet-service-reclaim_tickets.c \
- gnunet-service-reclaim_tickets.h
-gnunet_service_reclaim_LDADD = \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
- $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
- libgnunetreclaim.la \
- $(top_builddir)/src/service/gns/libgnunetgns.la \
- $(GN_LIBINTL)
-
-libgnunetreclaim_la_SOURCES = \
- reclaim_api.c \
- reclaim.h \
- reclaim_attribute.c \
- reclaim_attribute.h \
- reclaim_credential.c \
- reclaim_credential.h
-libgnunetreclaim_la_LIBADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(GN_LIBINTL) $(XLIB)
-libgnunetreclaim_la_LDFLAGS = \
- $(GN_LIB_LDFLAGS) \
- -version-info 0:0:0
-
-libgnunetdid_la_SOURCES = \
- did_helper.c \
- did_helper.h \
- did_core.h \
- did_core.c
-libgnunetdid_la_LIBADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/gns/libgnunetgns.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
- -ljansson \
- $(GN_LIBINTL) $(XLIB)
-libgnunetdid_la_LDFLAGS = \
- $(GN_LIB_LDFLAGS) \
- -version-info 0:0:0
-
-libgnunet_plugin_reclaim_attribute_basic_la_SOURCES = \
- plugin_reclaim_attribute_basic.c
-libgnunet_plugin_reclaim_attribute_basic_la_LIBADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(LTLIBINTL)
-libgnunet_plugin_reclaim_attribute_basic_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-if HAVE_PABC
-libgnunet_plugin_reclaim_credential_pabc_la_SOURCES = \
- plugin_reclaim_credential_pabc.c \
- pabc_helper.c \
- pabc_helper.h
-libgnunet_plugin_reclaim_credential_pabc_la_LIBADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- libgnunetreclaim.la \
- -ljansson\
- -lpabc \
- $(LTLIBINTL)
-libgnunet_plugin_reclaim_credential_pabc_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-endif
-
-
-libgnunet_plugin_reclaim_credential_jwt_la_SOURCES = \
- plugin_reclaim_credential_jwt.c
-libgnunet_plugin_reclaim_credential_jwt_la_LIBADD = \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- libgnunetreclaim.la \
- -ljansson\
- $(LTLIBINTL)
-libgnunet_plugin_reclaim_credential_jwt_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-gnunet_reclaim_SOURCES = \
- gnunet-reclaim.c
-gnunet_reclaim_LDADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
- libgnunetreclaim.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(GN_LIBINTL)
-
-test_reclaim_attribute_SOURCES = \
- test_reclaim_attribute.c
-test_reclaim_attribute_LDADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- libgnunetreclaim.la \
- $(GN_LIBINTL)
-
-gnunet_did_SOURCES = \
- gnunet-did.c
-gnunet_did_LDADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/gns/libgnunetgns.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
- libgnunetdid.la \
- -ljansson
-
-
-test_did_helper_SOURCES = \
- test_did_helper.c
-test_did_helper_LDADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/gns/libgnunetgns.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
- libgnunetdid.la \
- -ljansson
-
-check_SCRIPTS = \
- test_reclaim_attribute.sh \
- test_reclaim_issue.sh \
- test_reclaim_consume.sh
-
-check_PROGRAMS = \
- test_reclaim_attribute \
- test_did_helper
-
-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;
- TESTS = \
- $(check_SCRIPTS) \
- $(check_PROGRAMS)
-endif
diff --git a/src/rest-plugin/Makefile.am b/src/rest-plugin/Makefile.am
index 4b1b71bb7..d76972b78 100644
--- a/src/rest-plugin/Makefile.am
+++ b/src/rest-plugin/Makefile.am
@@ -1,4 +1,5 @@
SUBDIRS = \
rest \
identity \
- gns
+ gns \
+ reclaim
diff --git a/src/rest-plugin/reclaim/Makefile.am
b/src/rest-plugin/reclaim/Makefile.am
new file mode 100644
index 000000000..76ca198ab
--- /dev/null
+++ b/src/rest-plugin/reclaim/Makefile.am
@@ -0,0 +1,81 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+ plugindir = $(libdir)/gnunet
+
+if USE_COVERAGE
+ AM_CFLAGS = --coverage -O0
+ XLIB = -lgcov
+endif
+
+
+REST_PLUGIN = \
+ libgnunet_plugin_rest_reclaim.la
+
+if HAVE_JOSE
+REST_PLUGIN += libgnunet_plugin_rest_openid_connect.la
+endif
+
+if HAVE_PABC
+ REST_PLUGIN += libgnunet_plugin_rest_pabc.la
+endif
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+plugin_LTLIBRARIES = \
+ $(REST_PLUGIN)
+
+libgnunet_plugin_rest_reclaim_la_SOURCES = \
+ plugin_rest_reclaim.c \
+ json_reclaim.h \
+ json_reclaim.c
+libgnunet_plugin_rest_reclaim_la_LIBADD = \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/reclaim/libgnunetreclaim.la \
+ $(top_builddir)/src/lib/json/libgnunetjson.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/service/rest/libgnunetrest.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
+ $(LTLIBINTL) -ljansson $(MHD_LIBS)
+libgnunet_plugin_rest_reclaim_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_rest_reclaim_la_CFLAGS = \
+ $(MHD_CFLAGS) $(AM_CFLAGS)
+
+if HAVE_JOSE
+libgnunet_plugin_rest_openid_connect_la_SOURCES = \
+ plugin_rest_openid_connect.c \
+ oidc_helper.h \
+ oidc_helper.c
+libgnunet_plugin_rest_openid_connect_la_LIBADD = \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/reclaim/libgnunetreclaim.la \
+ $(top_builddir)/src/service/rest/libgnunetrest.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+ $(top_builddir)/src/service/gns/libgnunetgns.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
+ $(LTLIBINTL) -ljansson -ljose $(MHD_LIBS) \
+ $(LIBGCRYPT_LIBS)
+libgnunet_plugin_rest_openid_connect_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_rest_openid_connect_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
+endif
+
+if HAVE_PABC
+libgnunet_plugin_rest_pabc_la_SOURCES = \
+ plugin_rest_pabc.c \
+ pabc_helper.c
+libgnunet_plugin_rest_pabc_la_LIBADD = \
+ $(top_builddir)/src/service/reclaim/libgnunetreclaim.la \
+ $(top_builddir)/src/lib/json/libgnunetjson.la \
+ $(top_builddir)/src/service/rest/libgnunetrest.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
+ $(LTLIBINTL) -ljansson -lpabc $(MHD_LIBS)
+libgnunet_plugin_rest_pabc_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_rest_pabc_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
+endif
diff --git a/src/reclaim/json_reclaim.c b/src/rest-plugin/reclaim/json_reclaim.c
similarity index 100%
rename from src/reclaim/json_reclaim.c
rename to src/rest-plugin/reclaim/json_reclaim.c
diff --git a/src/reclaim/json_reclaim.h b/src/rest-plugin/reclaim/json_reclaim.h
similarity index 100%
rename from src/reclaim/json_reclaim.h
rename to src/rest-plugin/reclaim/json_reclaim.h
diff --git a/src/reclaim/oidc_helper.c b/src/rest-plugin/reclaim/oidc_helper.c
similarity index 100%
rename from src/reclaim/oidc_helper.c
rename to src/rest-plugin/reclaim/oidc_helper.c
diff --git a/src/reclaim/oidc_helper.h b/src/rest-plugin/reclaim/oidc_helper.h
similarity index 100%
rename from src/reclaim/oidc_helper.h
rename to src/rest-plugin/reclaim/oidc_helper.h
diff --git a/src/reclaim/plugin_rest_openid_connect.c
b/src/rest-plugin/reclaim/plugin_rest_openid_connect.c
similarity index 100%
rename from src/reclaim/plugin_rest_openid_connect.c
rename to src/rest-plugin/reclaim/plugin_rest_openid_connect.c
diff --git a/src/reclaim/plugin_rest_pabc.c
b/src/rest-plugin/reclaim/plugin_rest_pabc.c
similarity index 100%
rename from src/reclaim/plugin_rest_pabc.c
rename to src/rest-plugin/reclaim/plugin_rest_pabc.c
diff --git a/src/reclaim/plugin_rest_reclaim.c
b/src/rest-plugin/reclaim/plugin_rest_reclaim.c
similarity index 100%
rename from src/reclaim/plugin_rest_reclaim.c
rename to src/rest-plugin/reclaim/plugin_rest_reclaim.c
diff --git a/src/service/Makefile.am b/src/service/Makefile.am
index 9b39208de..8e661e432 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -29,5 +29,7 @@ SUBDIRS = \
zonemaster \
fs \
exit \
- pt
+ pt \
+ 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
diff --git a/src/reclaim/.gitignore b/src/service/reclaim/.gitignore
similarity index 100%
rename from src/reclaim/.gitignore
rename to src/service/reclaim/.gitignore
diff --git a/src/service/reclaim/Makefile.am b/src/service/reclaim/Makefile.am
new file mode 100644
index 000000000..56b9e96e1
--- /dev/null
+++ b/src/service/reclaim/Makefile.am
@@ -0,0 +1,104 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+ plugindir = $(libdir)/gnunet
+
+if USE_COVERAGE
+ AM_CFLAGS = --coverage -O0
+ XLIB = -lgcov
+endif
+
+
+EXTRA_DIST = \
+ reclaim.conf \
+ test_reclaim_defaults.conf \
+ test_reclaim.conf
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+pkgcfg_DATA = \
+ reclaim.conf
+
+lib_LTLIBRARIES = \
+ libgnunetreclaim.la \
+ libgnunetdid.la
+
+libexec_PROGRAMS = \
+ gnunet-service-reclaim
+
+gnunet_service_reclaim_SOURCES = \
+ gnunet-service-reclaim.c \
+ gnunet-service-reclaim_tickets.c \
+ gnunet-service-reclaim_tickets.h
+gnunet_service_reclaim_LDADD = \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
+ libgnunetreclaim.la \
+ $(top_builddir)/src/service/gns/libgnunetgns.la \
+ $(GN_LIBINTL)
+
+libgnunetreclaim_la_SOURCES = \
+ reclaim_api.c \
+ reclaim.h \
+ reclaim_attribute.c \
+ reclaim_attribute.h \
+ reclaim_credential.c \
+ reclaim_credential.h
+libgnunetreclaim_la_LIBADD = \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(GN_LIBINTL) $(XLIB)
+libgnunetreclaim_la_LDFLAGS = \
+ $(GN_LIB_LDFLAGS) \
+ -version-info 0:0:0
+
+libgnunetdid_la_SOURCES = \
+ did_helper.c \
+ did_helper.h \
+ did_core.h \
+ did_core.c
+libgnunetdid_la_LIBADD = \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/service/gns/libgnunetgns.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+ -ljansson \
+ $(GN_LIBINTL) $(XLIB)
+libgnunetdid_la_LDFLAGS = \
+ $(GN_LIB_LDFLAGS) \
+ -version-info 0:0:0
+
+test_reclaim_attribute_SOURCES = \
+ test_reclaim_attribute.c
+test_reclaim_attribute_LDADD = \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ libgnunetreclaim.la \
+ $(GN_LIBINTL)
+
+test_did_helper_SOURCES = \
+ test_did_helper.c
+test_did_helper_LDADD = \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/service/gns/libgnunetgns.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+ libgnunetdid.la \
+ -ljansson
+
+check_PROGRAMS = \
+ test_reclaim_attribute \
+ test_did_helper
+
+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;
+ TESTS = \
+ $(check_SCRIPTS) \
+ $(check_PROGRAMS)
+endif
diff --git a/src/reclaim/did.h b/src/service/reclaim/did.h
similarity index 100%
rename from src/reclaim/did.h
rename to src/service/reclaim/did.h
diff --git a/src/reclaim/did_core.c b/src/service/reclaim/did_core.c
similarity index 100%
rename from src/reclaim/did_core.c
rename to src/service/reclaim/did_core.c
diff --git a/src/reclaim/did_core.h b/src/service/reclaim/did_core.h
similarity index 100%
rename from src/reclaim/did_core.h
rename to src/service/reclaim/did_core.h
diff --git a/src/reclaim/did_helper.c b/src/service/reclaim/did_helper.c
similarity index 100%
rename from src/reclaim/did_helper.c
rename to src/service/reclaim/did_helper.c
diff --git a/src/reclaim/did_helper.h b/src/service/reclaim/did_helper.h
similarity index 100%
rename from src/reclaim/did_helper.h
rename to src/service/reclaim/did_helper.h
diff --git a/src/reclaim/did_misc.c b/src/service/reclaim/did_misc.c
similarity index 100%
rename from src/reclaim/did_misc.c
rename to src/service/reclaim/did_misc.c
diff --git a/src/reclaim/gnunet-service-reclaim.c
b/src/service/reclaim/gnunet-service-reclaim.c
similarity index 100%
rename from src/reclaim/gnunet-service-reclaim.c
rename to src/service/reclaim/gnunet-service-reclaim.c
diff --git a/src/reclaim/gnunet-service-reclaim_tickets.c
b/src/service/reclaim/gnunet-service-reclaim_tickets.c
similarity index 100%
rename from src/reclaim/gnunet-service-reclaim_tickets.c
rename to src/service/reclaim/gnunet-service-reclaim_tickets.c
diff --git a/src/reclaim/gnunet-service-reclaim_tickets.h
b/src/service/reclaim/gnunet-service-reclaim_tickets.h
similarity index 100%
rename from src/reclaim/gnunet-service-reclaim_tickets.h
rename to src/service/reclaim/gnunet-service-reclaim_tickets.h
diff --git a/src/reclaim/meson.build b/src/service/reclaim/meson.build
similarity index 100%
rename from src/reclaim/meson.build
rename to src/service/reclaim/meson.build
diff --git a/src/reclaim/pabc_helper.c b/src/service/reclaim/pabc_helper.c
similarity index 100%
rename from src/reclaim/pabc_helper.c
rename to src/service/reclaim/pabc_helper.c
diff --git a/src/reclaim/pabc_helper.h b/src/service/reclaim/pabc_helper.h
similarity index 100%
rename from src/reclaim/pabc_helper.h
rename to src/service/reclaim/pabc_helper.h
diff --git a/src/reclaim/reclaim.conf b/src/service/reclaim/reclaim.conf
similarity index 100%
rename from src/reclaim/reclaim.conf
rename to src/service/reclaim/reclaim.conf
diff --git a/src/reclaim/reclaim.h b/src/service/reclaim/reclaim.h
similarity index 100%
rename from src/reclaim/reclaim.h
rename to src/service/reclaim/reclaim.h
diff --git a/src/reclaim/reclaim_api.c b/src/service/reclaim/reclaim_api.c
similarity index 100%
rename from src/reclaim/reclaim_api.c
rename to src/service/reclaim/reclaim_api.c
diff --git a/src/reclaim/reclaim_attribute.c
b/src/service/reclaim/reclaim_attribute.c
similarity index 100%
rename from src/reclaim/reclaim_attribute.c
rename to src/service/reclaim/reclaim_attribute.c
diff --git a/src/reclaim/reclaim_attribute.h
b/src/service/reclaim/reclaim_attribute.h
similarity index 100%
rename from src/reclaim/reclaim_attribute.h
rename to src/service/reclaim/reclaim_attribute.h
diff --git a/src/reclaim/reclaim_credential.c
b/src/service/reclaim/reclaim_credential.c
similarity index 100%
rename from src/reclaim/reclaim_credential.c
rename to src/service/reclaim/reclaim_credential.c
diff --git a/src/reclaim/reclaim_credential.h
b/src/service/reclaim/reclaim_credential.h
similarity index 100%
rename from src/reclaim/reclaim_credential.h
rename to src/service/reclaim/reclaim_credential.h
diff --git a/src/reclaim/test_did_helper.c
b/src/service/reclaim/test_did_helper.c
similarity index 100%
rename from src/reclaim/test_did_helper.c
rename to src/service/reclaim/test_did_helper.c
diff --git a/src/reclaim/test_reclaim.conf
b/src/service/reclaim/test_reclaim.conf
similarity index 100%
rename from src/reclaim/test_reclaim.conf
rename to src/service/reclaim/test_reclaim.conf
diff --git a/src/reclaim/test_reclaim_attribute.c
b/src/service/reclaim/test_reclaim_attribute.c
similarity index 100%
rename from src/reclaim/test_reclaim_attribute.c
rename to src/service/reclaim/test_reclaim_attribute.c
diff --git a/src/reclaim/test_reclaim_defaults.conf
b/src/service/reclaim/test_reclaim_defaults.conf
similarity index 100%
rename from src/reclaim/test_reclaim_defaults.conf
rename to src/service/reclaim/test_reclaim_defaults.conf
diff --git a/src/reclaim/test_w3c_ed25519_2020.c
b/src/service/reclaim/test_w3c_ed25519_2020.c
similarity index 100%
rename from src/reclaim/test_w3c_ed25519_2020.c
rename to src/service/reclaim/test_w3c_ed25519_2020.c
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [gnunet] branch master updated (a2de07695 -> 3de5a3245),
gnunet <=