[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated: -fix ftbfs from recent ProjectData chang
|
From: |
gnunet |
|
Subject: |
[gnunet] branch master updated: -fix ftbfs from recent ProjectData change |
|
Date: |
Fri, 15 Nov 2024 09:18:24 +0100 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new 8343c52c9 -fix ftbfs from recent ProjectData change
8343c52c9 is described below
commit 8343c52c968374b6e17afa2f64c1b3b963fde97a
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Fri Nov 15 09:14:06 2024 +0100
-fix ftbfs from recent ProjectData change
---
contrib/gana | 2 +-
contrib/handbook | 2 +-
src/cli/nat-auto/gnunet-nat-server.c | 3 ++-
src/cli/util/gnunet-qr.c | 3 ++-
src/contrib/service/abd/gnunet-abd.c | 3 ++-
src/contrib/service/abd/gnunet-service-abd.c | 1 +
.../service/consensus/gnunet-service-consensus.c | 1 +
.../conversation/gnunet-conversation-test.c | 3 ++-
.../service/conversation/gnunet-conversation.c | 5 ++---
.../conversation/gnunet-service-conversation.c | 4 +---
src/contrib/service/conversation/microphone.c | 4 +++-
src/contrib/service/conversation/speaker.c | 4 +++-
.../gnunet-service-scalarproduct-ecc_alice.c | 3 +--
.../gnunet-service-scalarproduct-ecc_bob.c | 5 ++---
.../gnunet-service-scalarproduct_alice.c | 3 +--
.../gnunet-service-scalarproduct_bob.c | 5 ++---
.../secretsharing/gnunet-service-secretsharing.c | 3 ++-
src/contrib/service/set/gnunet-service-set.c | 1 +
.../service/template/gnunet-service-template.c | 3 ++-
src/include/gnunet_service_lib.h | 4 ++--
src/lib/util/meson.build | 1 -
src/lib/util/perf_mq.c | 5 ++---
src/service/arm/mockup-service.c | 3 ++-
src/service/cadet/gnunet-service-cadet.c | 5 ++---
src/service/core/gnunet-service-core.c | 1 +
src/service/core/test_core_api_start_only.c | 22 ++++++++++++++--------
src/service/datacache/test_datacache.c | 4 ++--
src/service/datacache/test_datacache_quota.c | 4 ++--
src/service/datastore/gnunet-service-datastore.c | 1 +
src/service/dht/gnunet-dht-tvg.c | 3 ++-
src/service/dht/gnunet-service-dht_clients.c | 3 ++-
src/service/dns/gnunet-service-dns.c | 3 ++-
src/service/fs/gnunet-service-fs.c | 4 ++--
src/service/gns/gnunet-service-gns.c | 3 ++-
src/service/identity/gnunet-service-identity.c | 3 +--
src/service/messenger/gnunet-service-messenger.c | 2 +-
src/service/namecache/gnunet-service-namecache.c | 6 ++----
src/service/namestore/gnunet-service-namestore.c | 1 +
src/service/nat-auto/gnunet-service-nat-auto.c | 3 ++-
src/service/nat/gnunet-service-nat.c | 5 ++---
src/service/nse/gnunet-service-nse.c | 5 ++---
src/service/peerstore/gnunet-service-peerstore.c | 1 +
src/service/reclaim/gnunet-service-reclaim.c | 2 +-
src/service/regex/gnunet-service-regex.c | 4 ++--
src/service/revocation/gnunet-service-revocation.c | 3 ++-
src/service/seti/gnunet-service-seti.c | 1 +
src/service/setu/gnunet-service-setu.c | 1 +
src/service/statistics/gnunet-service-statistics.c | 1 +
src/service/transport/gnunet-service-transport.c | 1 +
src/service/util/gnunet-service-resolver.c | 1 +
src/service/vpn/gnunet-service-vpn.c | 2 +-
src/service/zonemaster/gnunet-service-zonemaster.c | 3 ++-
52 files changed, 95 insertions(+), 74 deletions(-)
diff --git a/contrib/gana b/contrib/gana
index a2f72a9fb..cbbf44fdd 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit a2f72a9fb7a7d7757091821ea83180e1461714ff
+Subproject commit cbbf44fdd7a0d74a0b216a72daed134ac647c016
diff --git a/contrib/handbook b/contrib/handbook
index e28963e03..9d49141d0 160000
--- a/contrib/handbook
+++ b/contrib/handbook
@@ -1 +1 @@
-Subproject commit e28963e034813b23ea4ca680fcb8885bbf786789
+Subproject commit 9d49141d0a856c91ce1a4f46217092b7a577c795
diff --git a/src/cli/nat-auto/gnunet-nat-server.c
b/src/cli/nat-auto/gnunet-nat-server.c
index 7f47e9ebf..867620d67 100644
--- a/src/cli/nat-auto/gnunet-nat-server.c
+++ b/src/cli/nat-auto/gnunet-nat-server.c
@@ -369,7 +369,8 @@ client_disconnect_cb (void *cls,
* Define "main" method using service macro.
*/
GNUNET_SERVICE_MAIN
- ("nat-server",
+(GNUNET_OS_project_data_gnunet(),
+ "nat-server",
GNUNET_SERVICE_OPTION_NONE,
&run,
&client_connect_cb,
diff --git a/src/cli/util/gnunet-qr.c b/src/cli/util/gnunet-qr.c
index a4c3e469a..1f74ba38c 100644
--- a/src/cli/util/gnunet-qr.c
+++ b/src/cli/util/gnunet-qr.c
@@ -606,7 +606,8 @@ main (int argc, char *const *argv)
};
enum GNUNET_GenericReturnValue ret =
- GNUNET_PROGRAM_run (argc,
+ GNUNET_PROGRAM_run (GNUNET_OS_project_data_gnunet(),
+ argc,
argv,
"gnunet-qr",
gettext_noop ("Scan a QR code and import the URI
read"),
diff --git a/src/contrib/service/abd/gnunet-abd.c
b/src/contrib/service/abd/gnunet-abd.c
index 523a7a3d5..08697bb54 100644
--- a/src/contrib/service/abd/gnunet-abd.c
+++ b/src/contrib/service/abd/gnunet-abd.c
@@ -1094,7 +1094,8 @@ main (int argc, char *const *argv)
timeout = GNUNET_TIME_UNIT_FOREVER_REL;
GNUNET_log_setup ("gnunet-abd", "WARNING", NULL);
- if (GNUNET_OK != GNUNET_PROGRAM_run (argc,
+ if (GNUNET_OK != GNUNET_PROGRAM_run (GNUNET_OS_project_data_gnunet(),
+ argc,
argv,
"gnunet-abd",
_ ("GNUnet abd resolver tool"),
diff --git a/src/contrib/service/abd/gnunet-service-abd.c
b/src/contrib/service/abd/gnunet-service-abd.c
index 899f600db..610ee71b3 100644
--- a/src/contrib/service/abd/gnunet-service-abd.c
+++ b/src/contrib/service/abd/gnunet-service-abd.c
@@ -1765,6 +1765,7 @@ run (void *cls,
* Define "main" method using service macro
*/
GNUNET_SERVICE_MAIN (
+ GNUNET_OS_project_data_gnunet(),
"abd",
GNUNET_SERVICE_OPTION_NONE,
&run,
diff --git a/src/contrib/service/consensus/gnunet-service-consensus.c
b/src/contrib/service/consensus/gnunet-service-consensus.c
index 4c0b7773e..0cfc038a1 100644
--- a/src/contrib/service/consensus/gnunet-service-consensus.c
+++ b/src/contrib/service/consensus/gnunet-service-consensus.c
@@ -3553,6 +3553,7 @@ client_disconnect_cb (void *cls,
* Define "main" method using service macro.
*/
GNUNET_SERVICE_MAIN (
+ GNUNET_OS_project_data_gnunet(),
"consensus",
GNUNET_SERVICE_OPTION_NONE,
&run,
diff --git a/src/contrib/service/conversation/gnunet-conversation-test.c
b/src/contrib/service/conversation/gnunet-conversation-test.c
index 5e7fdebc0..2c926e14e 100644
--- a/src/contrib/service/conversation/gnunet-conversation-test.c
+++ b/src/contrib/service/conversation/gnunet-conversation-test.c
@@ -246,7 +246,8 @@ main (int argc,
};
ret = (GNUNET_OK ==
- GNUNET_PROGRAM_run (argc, argv,
+ GNUNET_PROGRAM_run (GNUNET_OS_project_data_gnunet(),
+ argc, argv,
"gnunet-conversation-test",
gettext_noop ("help text"),
options,
diff --git a/src/contrib/service/conversation/gnunet-conversation.c
b/src/contrib/service/conversation/gnunet-conversation.c
index 5e37dd09b..1accb62f7 100644
--- a/src/contrib/service/conversation/gnunet-conversation.c
+++ b/src/contrib/service/conversation/gnunet-conversation.c
@@ -25,10 +25,8 @@
*/
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_constants.h"
#include "gnunet_gnsrecord_lib.h"
#include "gnunet_conversation_service.h"
-#include "gnunet_namestore_service.h"
/**
* Maximum length allowed for the command line input.
@@ -1209,7 +1207,8 @@ main (int argc, char *const *argv)
stdin_fh = GNUNET_DISK_get_handle_from_int_fd (0);
ret =
- GNUNET_PROGRAM_run (argc,
+ GNUNET_PROGRAM_run (GNUNET_OS_project_data_gnunet(),
+ argc,
argv,
"gnunet-conversation",
gettext_noop (
diff --git a/src/contrib/service/conversation/gnunet-service-conversation.c
b/src/contrib/service/conversation/gnunet-service-conversation.c
index 06721e535..4fd4ddde3 100644
--- a/src/contrib/service/conversation/gnunet-service-conversation.c
+++ b/src/contrib/service/conversation/gnunet-service-conversation.c
@@ -27,11 +27,8 @@
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_protocols.h"
-#include "gnunet_applications.h"
-#include "gnunet_constants.h"
#include "gnunet_signatures.h"
#include "gnunet_cadet_service.h"
-#include "gnunet_conversation_service.h"
#include "conversation.h"
@@ -1421,6 +1418,7 @@ run (void *cls,
* Define "main" method using service macro.
*/
GNUNET_SERVICE_MAIN (
+ GNUNET_OS_project_data_gnunet(),
"conversation",
GNUNET_SERVICE_OPTION_NONE,
&run,
diff --git a/src/contrib/service/conversation/microphone.c
b/src/contrib/service/conversation/microphone.c
index 61b953fcc..5bfab3141 100644
--- a/src/contrib/service/conversation/microphone.c
+++ b/src/contrib/service/conversation/microphone.c
@@ -27,6 +27,7 @@
* @author Christian Grothoff
*/
#include "platform.h"
+
#include "gnunet_microphone_lib.h"
#include "conversation.h"
@@ -107,7 +108,8 @@ enable (void *cls,
mic->rdc = rdc;
mic->rdc_cls = rdc_cls;
- mic->record_helper = GNUNET_HELPER_start (GNUNET_NO,
+ mic->record_helper = GNUNET_HELPER_start (GNUNET_OS_project_data_gnunet(),
+ GNUNET_NO,
"gnunet-helper-audio-record",
record_helper_argv,
&process_record_messages,
diff --git a/src/contrib/service/conversation/speaker.c
b/src/contrib/service/conversation/speaker.c
index 2e51f4fac..4fa961510 100644
--- a/src/contrib/service/conversation/speaker.c
+++ b/src/contrib/service/conversation/speaker.c
@@ -26,6 +26,7 @@
* @author Christian Grothoff
*/
#include "platform.h"
+
#include "gnunet_speaker_lib.h"
#include "conversation.h"
@@ -62,7 +63,8 @@ enable (void *cls)
NULL
};
- spe->playback_helper = GNUNET_HELPER_start (GNUNET_NO,
+ spe->playback_helper = GNUNET_HELPER_start (GNUNET_OS_project_data_gnunet(),
+ GNUNET_NO,
"gnunet-helper-audio-playback",
playback_helper_argv,
NULL,
diff --git
a/src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
b/src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
index b8bac0803..245934d0a 100644
--- a/src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
+++ b/src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
@@ -27,9 +27,7 @@
#include <limits.h>
#include <gcrypt.h>
#include "gnunet_util_lib.h"
-#include "gnunet_core_service.h"
#include "gnunet_cadet_service.h"
-#include "gnunet_applications.h"
#include "gnunet_protocols.h"
#include "gnunet_scalarproduct_service.h"
#include "gnunet_seti_service.h"
@@ -1129,6 +1127,7 @@ run (void *cls,
* Define "main" method using service macro.
*/
GNUNET_SERVICE_MAIN (
+ GNUNET_OS_project_data_gnunet(),
"scalarproduct-alice",
GNUNET_SERVICE_OPTION_NONE,
&run,
diff --git
a/src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
b/src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
index 1945f1937..38931d542 100644
--- a/src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
+++ b/src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
@@ -27,9 +27,7 @@
#include <limits.h>
#include <gcrypt.h>
#include "gnunet_util_lib.h"
-#include "gnunet_core_service.h"
#include "gnunet_cadet_service.h"
-#include "gnunet_applications.h"
#include "gnunet_protocols.h"
#include "gnunet_scalarproduct_service.h"
#include "gnunet_seti_service.h"
@@ -1040,7 +1038,8 @@ run (void *cls,
* Define "main" method using service macro.
*/
GNUNET_SERVICE_MAIN
- ("scalarproduct-bob",
+(GNUNET_OS_project_data_gnunet(),
+ "scalarproduct-bob",
GNUNET_SERVICE_OPTION_NONE,
&run,
&client_connect_cb,
diff --git
a/src/contrib/service/scalarproduct/gnunet-service-scalarproduct_alice.c
b/src/contrib/service/scalarproduct/gnunet-service-scalarproduct_alice.c
index 0149f45ba..ffa3ed9b0 100644
--- a/src/contrib/service/scalarproduct/gnunet-service-scalarproduct_alice.c
+++ b/src/contrib/service/scalarproduct/gnunet-service-scalarproduct_alice.c
@@ -27,9 +27,7 @@
#include <limits.h>
#include <gcrypt.h>
#include "gnunet_util_lib.h"
-#include "gnunet_core_service.h"
#include "gnunet_cadet_service.h"
-#include "gnunet_applications.h"
#include "gnunet_protocols.h"
#include "gnunet_scalarproduct_service.h"
#include "gnunet_seti_service.h"
@@ -1367,6 +1365,7 @@ run (void *cls,
* Define "main" method using service macro.
*/
GNUNET_SERVICE_MAIN (
+ GNUNET_OS_project_data_gnunet(),
"scalarproduct-alice",
GNUNET_SERVICE_OPTION_NONE,
&run,
diff --git
a/src/contrib/service/scalarproduct/gnunet-service-scalarproduct_bob.c
b/src/contrib/service/scalarproduct/gnunet-service-scalarproduct_bob.c
index 65e732675..1091aa830 100644
--- a/src/contrib/service/scalarproduct/gnunet-service-scalarproduct_bob.c
+++ b/src/contrib/service/scalarproduct/gnunet-service-scalarproduct_bob.c
@@ -27,9 +27,7 @@
#include <limits.h>
#include <gcrypt.h>
#include "gnunet_util_lib.h"
-#include "gnunet_core_service.h"
#include "gnunet_cadet_service.h"
-#include "gnunet_applications.h"
#include "gnunet_protocols.h"
#include "gnunet_scalarproduct_service.h"
#include "gnunet_seti_service.h"
@@ -1364,7 +1362,8 @@ run (void *cls,
* Define "main" method using service macro.
*/
GNUNET_SERVICE_MAIN
- ("scalarproduct-bob",
+(GNUNET_OS_project_data_gnunet(),
+ "scalarproduct-bob",
GNUNET_SERVICE_OPTION_NONE,
&run,
&client_connect_cb,
diff --git a/src/contrib/service/secretsharing/gnunet-service-secretsharing.c
b/src/contrib/service/secretsharing/gnunet-service-secretsharing.c
index 866180d08..56e6f42fa 100644
--- a/src/contrib/service/secretsharing/gnunet-service-secretsharing.c
+++ b/src/contrib/service/secretsharing/gnunet-service-secretsharing.c
@@ -2397,7 +2397,8 @@ client_disconnect_cb (void *cls,
* Define "main" method using service macro.
*/
GNUNET_SERVICE_MAIN
- ("secretsharing",
+(GNUNET_OS_project_data_gnunet(),
+ "secretsharing",
GNUNET_SERVICE_OPTION_NONE,
&run,
&client_connect_cb,
diff --git a/src/contrib/service/set/gnunet-service-set.c
b/src/contrib/service/set/gnunet-service-set.c
index 5417baddc..7fb571ccc 100644
--- a/src/contrib/service/set/gnunet-service-set.c
+++ b/src/contrib/service/set/gnunet-service-set.c
@@ -1922,6 +1922,7 @@ run (void *cls,
* Define "main" method using service macro.
*/
GNUNET_SERVICE_MAIN (
+ GNUNET_OS_project_data_gnunet(),
"set",
GNUNET_SERVICE_OPTION_NONE,
&run,
diff --git a/src/contrib/service/template/gnunet-service-template.c
b/src/contrib/service/template/gnunet-service-template.c
index e04d2f61d..d0ba83fd0 100644
--- a/src/contrib/service/template/gnunet-service-template.c
+++ b/src/contrib/service/template/gnunet-service-template.c
@@ -92,7 +92,8 @@ run (void *cls,
/**
* Define "main" method using service macro.
*/
-GNUNET_SERVICE_MAIN ("template",
+GNUNET_SERVICE_MAIN (GNUNET_OS_project_data_gnunet(),
+ "template",
GNUNET_SERVICE_OPTION_NONE,
&run,
&client_connect_cb,
diff --git a/src/include/gnunet_service_lib.h b/src/include/gnunet_service_lib.h
index 23bceb3c2..fc8e1fe47 100644
--- a/src/include/gnunet_service_lib.h
+++ b/src/include/gnunet_service_lib.h
@@ -370,7 +370,7 @@ GNUNET_SERVICE_register_ (
* </code>
*/
#ifndef HAVE_GNUNET_MONOLITH
-#define GNUNET_SERVICE_MAIN(service_name, service_options, init_cb, \
+#define GNUNET_SERVICE_MAIN(pd, service_name, service_options, init_cb, \
connect_cb, \
disconnect_cb, cls, ...) \
int \
@@ -380,7 +380,7 @@ GNUNET_SERVICE_register_ (
struct GNUNET_MQ_MessageHandler mh[] = { \
__VA_ARGS__ \
}; \
- return GNUNET_SERVICE_run_ (GNUNET_OS_project_data_gnunet (), \
+ return GNUNET_SERVICE_run_ (pd, \
argc, \
argv, \
service_name, \
diff --git a/src/lib/util/meson.build b/src/lib/util/meson.build
index cb1bd5d47..56f795a7a 100644
--- a/src/lib/util/meson.build
+++ b/src/lib/util/meson.build
@@ -9,7 +9,6 @@ libgnunetutil_src = ['bandwidth.c',
'common_logging.c',
'compress.c',
'configuration.c',
- 'configuration_helper.c',
'consttime_memcmp.c',
'container_bloomfilter.c',
'container_heap.c',
diff --git a/src/lib/util/perf_mq.c b/src/lib/util/perf_mq.c
index 45422fc2a..8c6155fb2 100644
--- a/src/lib/util/perf_mq.c
+++ b/src/lib/util/perf_mq.c
@@ -24,8 +24,6 @@
* @author Florian Dold
* @author Christian Grothoff
*/
-
-#include "platform.h"
#include "gnunet_util_lib.h"
#define NUM_TRANSMISSIONS 1000000
@@ -278,7 +276,8 @@ main (int argc, char **argv)
NULL);
start = GNUNET_TIME_absolute_get ();
if (0 !=
- GNUNET_SERVICE_run_ (3,
+ GNUNET_SERVICE_run_ (GNUNET_OS_project_data_gnunet(),
+ 3,
test_argv,
"test_client",
GNUNET_SERVICE_OPTION_NONE,
diff --git a/src/service/arm/mockup-service.c b/src/service/arm/mockup-service.c
index 87f64d217..1c5a0e4f6 100644
--- a/src/service/arm/mockup-service.c
+++ b/src/service/arm/mockup-service.c
@@ -101,7 +101,8 @@ run (void *cls,
/**
* Define "main" method using service macro.
*/
-GNUNET_SERVICE_MAIN ("do-nothing",
+GNUNET_SERVICE_MAIN (GNUNET_OS_project_data_gnunet(),
+ "do-nothing",
GNUNET_SERVICE_OPTION_NONE,
&run,
&client_connect_cb,
diff --git a/src/service/cadet/gnunet-service-cadet.c
b/src/service/cadet/gnunet-service-cadet.c
index 89731c451..802ae4866 100644
--- a/src/service/cadet/gnunet-service-cadet.c
+++ b/src/service/cadet/gnunet-service-cadet.c
@@ -32,14 +32,12 @@
* - channel: logical link between two clients, on the same or different peers.
* have properties like reliability.
*/
-#include "platform.h"
#include "gnunet_util_lib.h"
#include "cadet.h"
#include "gnunet_statistics_service.h"
#include "gnunet_transport_application_service.h"
#include "gnunet-service-cadet.h"
#include "gnunet-service-cadet_channel.h"
-#include "gnunet-service-cadet_connection.h"
#include "gnunet-service-cadet_core.h"
#include "gnunet-service-cadet_dht.h"
#include "gnunet-service-cadet_hello.h"
@@ -1325,7 +1323,8 @@ run (void *cls,
* Define "main" method using service macro.
*/
GNUNET_SERVICE_MAIN
- ("cadet",
+(GNUNET_OS_project_data_gnunet(),
+ "cadet",
GNUNET_SERVICE_OPTION_NONE,
&run,
&client_connect_cb,
diff --git a/src/service/core/gnunet-service-core.c
b/src/service/core/gnunet-service-core.c
index 175ca5652..ad9376498 100644
--- a/src/service/core/gnunet-service-core.c
+++ b/src/service/core/gnunet-service-core.c
@@ -960,6 +960,7 @@ run (void *cls,
* Define "main" method using service macro.
*/
GNUNET_SERVICE_MAIN (
+ GNUNET_OS_project_data_gnunet(),
"core",
GNUNET_SERVICE_OPTION_NONE,
&run,
diff --git a/src/service/core/test_core_api_start_only.c
b/src/service/core/test_core_api_start_only.c
index 9ad9445be..4ce3f7336 100644
--- a/src/service/core/test_core_api_start_only.c
+++ b/src/service/core/test_core_api_start_only.c
@@ -24,7 +24,7 @@
* @author Christian Grothoff
*/
#include "platform.h"
-#include "gnunet_arm_service.h"
+
#include "gnunet_core_service.h"
#include "gnunet_util_lib.h"
@@ -115,8 +115,9 @@ setup_peer (struct PeerContext *p,
{
char *binary;
- binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm");
- p->cfg = GNUNET_CONFIGURATION_create ();
+ binary = GNUNET_OS_get_libexec_binary_path (GNUNET_OS_project_data_gnunet(),
+ "gnunet-service-arm");
+ p->cfg = GNUNET_CONFIGURATION_create (GNUNET_OS_project_data_gnunet());
p->arm_proc =
GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR
| GNUNET_OS_USE_PIPE_CONTROL,
@@ -212,14 +213,17 @@ check ()
};
GNUNET_DISK_purge_cfg_dir
- ("test_core_api_peer1.conf",
+ (GNUNET_OS_project_data_gnunet(),
+ "test_core_api_peer1.conf",
"GNUNET_TEST_HOME");
GNUNET_DISK_purge_cfg_dir
- ("test_core_api_peer2.conf",
+ (GNUNET_OS_project_data_gnunet(),
+ "test_core_api_peer2.conf",
"GNUNET_TEST_HOME");
ok = 1;
- GNUNET_PROGRAM_run ((sizeof(argv) / sizeof(char *)) - 1,
+ GNUNET_PROGRAM_run (GNUNET_OS_project_data_gnunet(),
+ (sizeof(argv) / sizeof(char *)) - 1,
argv,
"test-core-api-start-only",
"nohelp",
@@ -245,10 +249,12 @@ main (int argc,
NULL);
ret = check ();
GNUNET_DISK_purge_cfg_dir
- ("test_core_api_peer1.conf",
+ (GNUNET_OS_project_data_gnunet(),
+ "test_core_api_peer1.conf",
"GNUNET_TEST_HOME");
GNUNET_DISK_purge_cfg_dir
- ("test_core_api_peer2.conf",
+ (GNUNET_OS_project_data_gnunet(),
+ "test_core_api_peer2.conf",
"GNUNET_TEST_HOME");
return ret;
}
diff --git a/src/service/datacache/test_datacache.c
b/src/service/datacache/test_datacache.c
index afe7487ec..8d7a42834 100644
--- a/src/service/datacache/test_datacache.c
+++ b/src/service/datacache/test_datacache.c
@@ -22,7 +22,6 @@
* @brief Test for the datacache implementations.
* @author Nils Durner
*/
-#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_datacache_lib.h"
@@ -186,7 +185,8 @@ main (int argc, char *argv[])
sizeof(cfg_name),
"test_datacache_data_%s.conf",
plugin_name);
- if (GNUNET_OK != GNUNET_PROGRAM_run ((sizeof(xargv) / sizeof(char *)) - 1,
+ if (GNUNET_OK != GNUNET_PROGRAM_run (GNUNET_OS_project_data_gnunet(),
+ (sizeof(xargv) / sizeof(char *)) - 1,
(char *const*) xargv,
"test-datacache",
"nohelp",
diff --git a/src/service/datacache/test_datacache_quota.c
b/src/service/datacache/test_datacache_quota.c
index 2cc3e9aa3..b26328063 100644
--- a/src/service/datacache/test_datacache_quota.c
+++ b/src/service/datacache/test_datacache_quota.c
@@ -22,7 +22,6 @@
* @brief Test for the quota code of the datacache implementations.
* @author Nils Durner
*/
-#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_datacache_lib.h"
@@ -175,7 +174,8 @@ main (int argc,
sizeof(cfg_name),
"test_datacache_data_%s.conf",
plugin_name);
- if (GNUNET_OK != GNUNET_PROGRAM_run ((sizeof(xargv) / sizeof(char *)) - 1,
+ if (GNUNET_OK != GNUNET_PROGRAM_run (GNUNET_OS_project_data_gnunet(),
+ (sizeof(xargv) / sizeof(char *)) - 1,
(char* const*)xargv,
"test-datacache-quota",
"nohelp",
diff --git a/src/service/datastore/gnunet-service-datastore.c
b/src/service/datastore/gnunet-service-datastore.c
index 4fc661af2..ad513cfad 100644
--- a/src/service/datastore/gnunet-service-datastore.c
+++ b/src/service/datastore/gnunet-service-datastore.c
@@ -1609,6 +1609,7 @@ run (void *cls,
* Define "main" method using service macro.
*/
GNUNET_SERVICE_MAIN (
+ GNUNET_OS_project_data_gnunet(),
"datastore",
GNUNET_SERVICE_OPTION_NONE,
&run,
diff --git a/src/service/dht/gnunet-dht-tvg.c b/src/service/dht/gnunet-dht-tvg.c
index b1be188d9..7cc89cfc2 100644
--- a/src/service/dht/gnunet-dht-tvg.c
+++ b/src/service/dht/gnunet-dht-tvg.c
@@ -157,7 +157,8 @@ main (int argc,
// gcry_control (GCRYCTL_SET_DEBUG_FLAGS, 1u, 0);
// gcry_control (GCRYCTL_SET_VERBOSITY, 99);
if (GNUNET_OK !=
- GNUNET_PROGRAM_run (argc, argv,
+ GNUNET_PROGRAM_run (GNUNET_OS_project_data_gnunet(),
+ argc, argv,
"gnunet-dht-tvg",
"Generate test vectors for R5N",
options,
diff --git a/src/service/dht/gnunet-service-dht_clients.c
b/src/service/dht/gnunet-service-dht_clients.c
index 032f5db9e..79fbcdc3b 100644
--- a/src/service/dht/gnunet-service-dht_clients.c
+++ b/src/service/dht/gnunet-service-dht_clients.c
@@ -1631,7 +1631,8 @@ GDS_CLIENTS_stop (void)
*/
#define GDS_DHT_SERVICE_INIT(name, run) \
GNUNET_SERVICE_MAIN \
- (name, \
+ (GNUNET_OS_project_data_gnunet(), \
+ name, \
GNUNET_SERVICE_OPTION_NONE, \
run, \
&client_connect_cb, \
diff --git a/src/service/dns/gnunet-service-dns.c
b/src/service/dns/gnunet-service-dns.c
index 977009bec..46340f187 100644
--- a/src/service/dns/gnunet-service-dns.c
+++ b/src/service/dns/gnunet-service-dns.c
@@ -1218,7 +1218,8 @@ run (void *cls,
* Define "main" method using service macro.
*/
GNUNET_SERVICE_MAIN
- ("dns",
+(GNUNET_OS_project_data_gnunet(),
+ "dns",
GNUNET_SERVICE_OPTION_NONE,
&run,
&client_connect_cb,
diff --git a/src/service/fs/gnunet-service-fs.c
b/src/service/fs/gnunet-service-fs.c
index 6e3db49ba..f5bc63e27 100644
--- a/src/service/fs/gnunet-service-fs.c
+++ b/src/service/fs/gnunet-service-fs.c
@@ -25,7 +25,6 @@
*/
#include "platform.h"
#include <float.h>
-#include "gnunet_constants.h"
#include "gnunet_core_service.h"
#include "gnunet_dht_service.h"
#include "gnunet_datastore_service.h"
@@ -1347,7 +1346,8 @@ run (void *cls,
* Define "main" method using service macro.
*/
GNUNET_SERVICE_MAIN
- ("fs",
+(GNUNET_OS_project_data_gnunet(),
+ "fs",
GNUNET_SERVICE_OPTION_NONE,
&run,
&client_connect_cb,
diff --git a/src/service/gns/gnunet-service-gns.c
b/src/service/gns/gnunet-service-gns.c
index 00eb21a28..983a099f3 100644
--- a/src/service/gns/gnunet-service-gns.c
+++ b/src/service/gns/gnunet-service-gns.c
@@ -602,7 +602,8 @@ run (void *cls,
* Define "main" method using service macro.
*/
GNUNET_SERVICE_MAIN
- ("gns",
+(GNUNET_OS_project_data_gnunet(),
+ "gns",
GNUNET_SERVICE_OPTION_NONE,
&run,
&client_connect_cb,
diff --git a/src/service/identity/gnunet-service-identity.c
b/src/service/identity/gnunet-service-identity.c
index 4f1cdfa16..03be5f799 100644
--- a/src/service/identity/gnunet-service-identity.c
+++ b/src/service/identity/gnunet-service-identity.c
@@ -32,10 +32,8 @@
*/
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_constants.h"
#include "gnunet_protocols.h"
#include "gnunet_statistics_service.h"
-#include "gnunet_identity_service.h"
#include "identity.h"
@@ -1000,6 +998,7 @@ run (void *cls,
* Define "main" method using service macro.
*/
GNUNET_SERVICE_MAIN (
+ GNUNET_OS_project_data_gnunet(),
"identity",
GNUNET_SERVICE_OPTION_NONE,
&run,
diff --git a/src/service/messenger/gnunet-service-messenger.c
b/src/service/messenger/gnunet-service-messenger.c
index 26ff9023b..9f820f428 100644
--- a/src/service/messenger/gnunet-service-messenger.c
+++ b/src/service/messenger/gnunet-service-messenger.c
@@ -22,7 +22,6 @@
* @file src/messenger/gnunet-service-messenger.c
* @brief GNUnet MESSENGER service
*/
-#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet-service-messenger.h"
#include "gnunet-service-messenger_handle.h"
@@ -613,6 +612,7 @@ run (void *cls,
* Define "main" method using service macro.
*/
GNUNET_SERVICE_MAIN (
+ GNUNET_OS_project_data_gnunet(),
GNUNET_MESSENGER_SERVICE_NAME,
GNUNET_SERVICE_OPTION_NONE,
&run,
diff --git a/src/service/namecache/gnunet-service-namecache.c
b/src/service/namecache/gnunet-service-namecache.c
index 4c39fe9fb..1ab91e71c 100644
--- a/src/service/namecache/gnunet-service-namecache.c
+++ b/src/service/namecache/gnunet-service-namecache.c
@@ -24,12 +24,9 @@
* @author Matthias Wachs
* @author Christian Grothoff
*/
-#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_statistics_service.h"
-#include "gnunet_namecache_service.h"
#include "gnunet_namecache_plugin.h"
-#include "gnunet_signatures.h"
#include "namecache.h"
#define LOG_STRERROR_FILE(kind, syscall, \
@@ -371,7 +368,8 @@ run (void *cls,
* Define "main" method using service macro.
*/
GNUNET_SERVICE_MAIN
- ("namecache",
+(GNUNET_OS_project_data_gnunet(),
+ "namecache",
GNUNET_SERVICE_OPTION_NONE,
&run,
&client_connect_cb,
diff --git a/src/service/namestore/gnunet-service-namestore.c
b/src/service/namestore/gnunet-service-namestore.c
index a7779cdae..d3dafd3a7 100644
--- a/src/service/namestore/gnunet-service-namestore.c
+++ b/src/service/namestore/gnunet-service-namestore.c
@@ -2786,6 +2786,7 @@ run (void *cls,
* Define "main" method using service macro.
*/
GNUNET_SERVICE_MAIN (
+ GNUNET_OS_project_data_gnunet(),
"namestore",
GNUNET_SERVICE_OPTION_NONE,
&run,
diff --git a/src/service/nat-auto/gnunet-service-nat-auto.c
b/src/service/nat-auto/gnunet-service-nat-auto.c
index a1a9a6c40..378e5afa6 100644
--- a/src/service/nat-auto/gnunet-service-nat-auto.c
+++ b/src/service/nat-auto/gnunet-service-nat-auto.c
@@ -452,7 +452,8 @@ client_disconnect_cb (void *cls,
* Define "main" method using service macro.
*/
GNUNET_SERVICE_MAIN
- ("nat-auto",
+(GNUNET_OS_project_data_gnunet(),
+ "nat-auto",
GNUNET_SERVICE_OPTION_NONE,
&run,
&client_connect_cb,
diff --git a/src/service/nat/gnunet-service-nat.c
b/src/service/nat/gnunet-service-nat.c
index 5112a33ec..9506dd078 100644
--- a/src/service/nat/gnunet-service-nat.c
+++ b/src/service/nat/gnunet-service-nat.c
@@ -35,10 +35,8 @@
* basically, open port & try different methods.
*/
#include "platform.h"
-#include <math.h>
#include "gnunet_util_lib.h"
#include "gnunet_protocols.h"
-#include "gnunet_signatures.h"
#include "gnunet_statistics_service.h"
#include "gnunet_resolver_service.h"
#include "gnunet_nat_service.h"
@@ -2110,7 +2108,8 @@ client_disconnect_cb (void *cls,
* Define "main" method using service macro.
*/
GNUNET_SERVICE_MAIN
- ("nat",
+(GNUNET_OS_project_data_gnunet(),
+ "nat",
GNUNET_SERVICE_OPTION_NONE,
&run,
&client_connect_cb,
diff --git a/src/service/nse/gnunet-service-nse.c
b/src/service/nse/gnunet-service-nse.c
index 9c6ec3012..45e3b4023 100644
--- a/src/service/nse/gnunet-service-nse.c
+++ b/src/service/nse/gnunet-service-nse.c
@@ -38,12 +38,10 @@
#include "platform.h"
#include <math.h>
#include "gnunet_util_lib.h"
-#include "gnunet_constants.h"
#include "gnunet_protocols.h"
#include "gnunet_signatures.h"
#include "gnunet_statistics_service.h"
#include "gnunet_core_service.h"
-#include "gnunet_nse_service.h"
#if ENABLE_NSE_HISTOGRAM
#include "gnunet_testbed_logger_service.h"
#endif
@@ -1553,7 +1551,8 @@ client_disconnect_cb (void *cls,
/**
* Define "main" method using service macro.
*/
-GNUNET_SERVICE_MAIN ("nse",
+GNUNET_SERVICE_MAIN (GNUNET_OS_project_data_gnunet(),
+ "nse",
GNUNET_SERVICE_OPTION_NONE,
&run,
&client_connect_cb,
diff --git a/src/service/peerstore/gnunet-service-peerstore.c
b/src/service/peerstore/gnunet-service-peerstore.c
index dc24a5c4f..d3ef90dc6 100644
--- a/src/service/peerstore/gnunet-service-peerstore.c
+++ b/src/service/peerstore/gnunet-service-peerstore.c
@@ -1269,6 +1269,7 @@ run (void *cls,
* Define "main" method using service macro.
*/
GNUNET_SERVICE_MAIN (
+ GNUNET_OS_project_data_gnunet(),
"peerstore", GNUNET_SERVICE_OPTION_SOFT_SHUTDOWN, &run, &client_connect_cb,
&client_disconnect_cb, NULL,
GNUNET_MQ_hd_var_size (store, GNUNET_MESSAGE_TYPE_PEERSTORE_STORE,
diff --git a/src/service/reclaim/gnunet-service-reclaim.c
b/src/service/reclaim/gnunet-service-reclaim.c
index ead8e55a6..1cf34a67a 100644
--- a/src/service/reclaim/gnunet-service-reclaim.c
+++ b/src/service/reclaim/gnunet-service-reclaim.c
@@ -22,7 +22,6 @@
* @file src/reclaim/gnunet-service-reclaim.c
* @brief reclaim Service
*/
-#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet-service-reclaim_tickets.h"
#include "gnunet_gnsrecord_lib.h"
@@ -2711,6 +2710,7 @@ client_connect_cb (void *cls,
* Define "main" method using service macro.
*/
GNUNET_SERVICE_MAIN (
+ GNUNET_OS_project_data_gnunet(),
"reclaim",
GNUNET_SERVICE_OPTION_NONE,
&run,
diff --git a/src/service/regex/gnunet-service-regex.c
b/src/service/regex/gnunet-service-regex.c
index c25ef9eda..fe0b4a5b9 100644
--- a/src/service/regex/gnunet-service-regex.c
+++ b/src/service/regex/gnunet-service-regex.c
@@ -24,7 +24,6 @@
* lookup capabilities by regex
* @author Christian Grothoff
*/
-#include "platform.h"
#include "gnunet_util_lib.h"
#include "regex_internal_lib.h"
#include "regex_ipc.h"
@@ -388,7 +387,8 @@ client_disconnect_cb (void *cls,
* Define "main" method using service macro.
*/
GNUNET_SERVICE_MAIN
- ("regex",
+(GNUNET_OS_project_data_gnunet(),
+ "regex",
GNUNET_SERVICE_OPTION_NONE,
&run,
&client_connect_cb,
diff --git a/src/service/revocation/gnunet-service-revocation.c
b/src/service/revocation/gnunet-service-revocation.c
index 4d783c84c..9f2c1962a 100644
--- a/src/service/revocation/gnunet-service-revocation.c
+++ b/src/service/revocation/gnunet-service-revocation.c
@@ -1024,7 +1024,8 @@ run (void *cls,
* Define "main" method using service macro.
*/
GNUNET_SERVICE_MAIN
- ("revocation",
+(GNUNET_OS_project_data_gnunet(),
+ "revocation",
GNUNET_SERVICE_OPTION_NONE,
&run,
&client_connect_cb,
diff --git a/src/service/seti/gnunet-service-seti.c
b/src/service/seti/gnunet-service-seti.c
index e073b08a4..9fee63668 100644
--- a/src/service/seti/gnunet-service-seti.c
+++ b/src/service/seti/gnunet-service-seti.c
@@ -2476,6 +2476,7 @@ run (void *cls,
* Define "main" method using service macro.
*/
GNUNET_SERVICE_MAIN (
+ GNUNET_OS_project_data_gnunet(),
"seti",
GNUNET_SERVICE_OPTION_NONE,
&run,
diff --git a/src/service/setu/gnunet-service-setu.c
b/src/service/setu/gnunet-service-setu.c
index 14be20778..e86f7141d 100644
--- a/src/service/setu/gnunet-service-setu.c
+++ b/src/service/setu/gnunet-service-setu.c
@@ -5448,6 +5448,7 @@ run (void *cls,
* Define "main" method using service macro.
*/
GNUNET_SERVICE_MAIN (
+ GNUNET_OS_project_data_gnunet(),
"set",
GNUNET_SERVICE_OPTION_NONE,
&run,
diff --git a/src/service/statistics/gnunet-service-statistics.c
b/src/service/statistics/gnunet-service-statistics.c
index bd64a2f5f..5e26d8df2 100644
--- a/src/service/statistics/gnunet-service-statistics.c
+++ b/src/service/statistics/gnunet-service-statistics.c
@@ -1012,6 +1012,7 @@ run (void *cls,
* Define "main" method using service macro.
*/
GNUNET_SERVICE_MAIN (
+ GNUNET_OS_project_data_gnunet(),
"statistics",
GNUNET_SERVICE_OPTION_SOFT_SHUTDOWN,
&run,
diff --git a/src/service/transport/gnunet-service-transport.c
b/src/service/transport/gnunet-service-transport.c
index bedd3fd4a..c36553aa7 100644
--- a/src/service/transport/gnunet-service-transport.c
+++ b/src/service/transport/gnunet-service-transport.c
@@ -13064,6 +13064,7 @@ run (void *cls,
* Define "main" method using service macro.
*/
GNUNET_SERVICE_MAIN (
+ GNUNET_OS_project_data_gnunet(),
"transport",
GNUNET_SERVICE_OPTION_SOFT_SHUTDOWN,
&run,
diff --git a/src/service/util/gnunet-service-resolver.c
b/src/service/util/gnunet-service-resolver.c
index 6176c1693..7e5cffcb0 100644
--- a/src/service/util/gnunet-service-resolver.c
+++ b/src/service/util/gnunet-service-resolver.c
@@ -1349,6 +1349,7 @@ disconnect_cb (void *cls, struct GNUNET_SERVICE_Client
*c, void *internal_cls)
* Define "main" method using service macro.
*/
GNUNET_SERVICE_MAIN (
+ GNUNET_OS_project_data_gnunet(),
"resolver",
GNUNET_SERVICE_OPTION_NONE,
&init_cb,
diff --git a/src/service/vpn/gnunet-service-vpn.c
b/src/service/vpn/gnunet-service-vpn.c
index f9d23f3da..69727a1dc 100644
--- a/src/service/vpn/gnunet-service-vpn.c
+++ b/src/service/vpn/gnunet-service-vpn.c
@@ -37,7 +37,6 @@
#include "gnunet_applications.h"
#include "gnunet_cadet_service.h"
#include "gnunet_statistics_service.h"
-#include "gnunet_constants.h"
#include "gnunet_regex_service.h"
#include "vpn.h"
#include "exit.h"
@@ -3123,6 +3122,7 @@ run (void *cls,
* Define "main" method using service macro.
*/
GNUNET_SERVICE_MAIN (
+ GNUNET_OS_project_data_gnunet(),
"vpn",
GNUNET_SERVICE_OPTION_NONE,
&run,
diff --git a/src/service/zonemaster/gnunet-service-zonemaster.c
b/src/service/zonemaster/gnunet-service-zonemaster.c
index 2a262c5db..004131363 100644
--- a/src/service/zonemaster/gnunet-service-zonemaster.c
+++ b/src/service/zonemaster/gnunet-service-zonemaster.c
@@ -1502,7 +1502,8 @@ run (void *cls,
* Define "main" method using service macro.
*/
GNUNET_SERVICE_MAIN
- ("zonemaster",
+(GNUNET_OS_project_data_gnunet(),
+ "zonemaster",
GNUNET_SERVICE_OPTION_NONE,
&run,
NULL,
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnunet] branch master updated: -fix ftbfs from recent ProjectData change,
gnunet <=