summaryrefslogtreecommitdiff
path: root/src/util
diff options
context:
space:
mode:
authorAlessio Vanni <vannilla@firemail.cc>2020-05-27 15:01:30 +0200
committerChristian Grothoff <christian@grothoff.org>2020-05-27 22:37:08 +0200
commitcf4608196bc02093409dbf6b7a24e6ed08c36f76 (patch)
tree46c2ecc852810e35d9d5eabcfcb52620e06aaa3f /src/util
parent3a966c83d32db67d0e9cb23675f28b7233280aeb (diff)
Make REQUEST_AGPL messages configurable and add handler by default
This makes two changes: * Add a field to `struct GNUNET_OS_ProjectData' containing a URL (as a string) pointing to the source code of the application. * If the field is not NULL, add a handler for the REQUEST_AGPL messages sending the specified URL to the client. The handler is added both in client-service communications (i.e. local services that don't make requests to other peers in the network) and in peer-peer communications (CADET.) This way, any client (local or remote with CADET) can request the source code location using a standardized mechanism instead of writing ad-hoc solutions (unless the service/peer explicitly specifies a NULL pointer.) Signed-off-by: Christian Grothoff <christian@grothoff.org>
Diffstat (limited to 'src/util')
-rw-r--r--src/util/os_installation.c1
-rw-r--r--src/util/service.c7
2 files changed, 6 insertions, 2 deletions
diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index dcd31dc2c..714df6957 100644
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -70,6 +70,7 @@ static const struct GNUNET_OS_ProjectData default_pd = {
.is_gnu = 1,
.gettext_domain = PACKAGE,
.gettext_path = NULL,
+ .agpl_url = GNUNET_AGPL_URL,
};
/**
diff --git a/src/util/service.c b/src/util/service.c
index 9dc14eba9..ea078b19b 100644
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -1823,9 +1823,10 @@ return_agpl (void *cls, const struct GNUNET_MessageHeader *msg)
struct GNUNET_MQ_Envelope *env;
struct GNUNET_MessageHeader *res;
size_t slen;
+ const struct GNUNET_OS_ProjectData *pd = GNUNET_OS_project_data_get ();
(void) msg;
- slen = strlen (GNUNET_AGPL_URL) + 1;
+ slen = strlen (pd->agpl_url) + 1;
env = GNUNET_MQ_msg_extra (res, GNUNET_MESSAGE_TYPE_RESPONSE_AGPL, slen);
memcpy (&res[1], GNUNET_AGPL_URL, slen);
mq = GNUNET_SERVICE_client_get_mq (client);
@@ -2019,7 +2020,9 @@ GNUNET_SERVICE_run_ (int argc,
sh.connect_cb = connect_cb;
sh.disconnect_cb = disconnect_cb;
sh.cb_cls = cls;
- sh.handlers = GNUNET_MQ_copy_handlers (handlers);
+ sh.handlers = (NULL == pd->agpl_url)
+ ? GNUNET_MQ_copy_handlers (handlers)
+ : GNUNET_MQ_copy_handlers2 (handlers, &return_agpl, NULL);
sh.service_name = service_name;
sh.ret = 0;
/* setup subsystems */