[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] 06/09: -Merge branch 'master' into dev/vanni/build-info
|
From: |
gnunet |
|
Subject: |
[gnunet] 06/09: -Merge branch 'master' into dev/vanni/build-info |
|
Date: |
Fri, 17 Sep 2021 19:03:22 +0200 |
This is an automated email from the git hooks/post-receive script.
alessio-vanni pushed a commit to branch master
in repository gnunet.
commit 6e1bb6601e21a3329950129b9dc39e05746e3b65
Merge: 382fc8faa 3da9cbd62
Author: Alessio Vanni <vannilla@firemail.cc>
AuthorDate: Tue Sep 7 14:50:20 2021 +0200
-Merge branch 'master' into dev/vanni/build-info
.buildbot/build.sh | 2 +-
.buildbot/firefly-x86_64-amdepyc_deploy.sh | 1 -
AUTHORS | 2 +-
ChangeLog | 170 +-
README | 6 +-
configure.ac | 12 +-
contrib/scripts/netjail/netjail_core.sh | 57 +-
contrib/scripts/netjail/netjail_setup_internet.sh | 105 +-
contrib/services/systemd/Makefile.am | 5 +-
contrib/services/systemd/gnunet-user.service | 11 +
contrib/services/systemd/gnunet.service | 17 +-
contrib/services/systemd/sysusers-gnunet.conf | 4 +
contrib/services/systemd/tmpfiles-gnunet.conf | 10 +
debian/changelog | 87 +
debian/control | 2 +-
debian/gnunet.config | 6 -
debian/gnunet.dirs | 1 -
debian/gnunet.install | 6 +-
debian/gnunet.postinst | 435 ++--
debian/gnunet.postrm | 118 +-
debian/gnunet.service | 12 +-
debian/gnunet.templates | 25 +-
debian/rules | 7 +-
doc/handbook/Makefile.am | 106 +-
doc/handbook/chapters/developer.texi | 28 +
doc/man/gnunet-search.1 | 2 -
po/POTFILES.in | 36 +-
po/de.po | 1350 +++++++------
po/es.po | 1505 +++++++-------
po/fr.po | 1302 ++++++------
po/it.po | 1291 ++++++------
po/sr.po | 1415 +++++++------
po/sv.po | 1349 +++++++------
po/vi.po | 1409 ++++++-------
po/zh_CN.po | 1349 +++++++------
src/Makefile.am | 2 -
src/arm/arm_api.c | 7 +-
src/ats-tests/.gitignore | 14 -
src/ats-tests/Makefile.am | 169 --
src/ats-tests/ats-testing-experiment.c | 820 --------
src/ats-tests/ats-testing-log.c | 979 ---------
src/ats-tests/ats-testing-preferences.c | 265 ---
src/ats-tests/ats-testing-traffic.c | 393 ----
src/ats-tests/ats-testing.c | 975 ---------
src/ats-tests/ats-testing.h | 757 -------
.../evaluation1_dru_3_peers_1addr_1scope_prop.conf | 24 -
.../evaluation1_dru_3_peers_1addr_1scope_prop.exp | 46 -
src/ats-tests/experiments/send_linear_10_sec.exp | 30 -
src/ats-tests/experiments/test.exp | 55 -
src/ats-tests/gnunet-ats-sim.c | 399 ----
src/ats-tests/gnunet-solver-eval.c | 1025 ----------
src/ats-tests/gnunet_ats_sim_default.conf | 6 -
src/ats-tests/perf_ats.c | 601 ------
src/ats-tests/perf_ats.h | 256 ---
src/ats-tests/perf_ats_logging.c | 780 --------
src/ats-tests/perf_ats_proportional_bandwidth.conf | 4 -
src/ats-tests/perf_ats_proportional_latency.conf | 4 -
src/ats-tests/perf_ats_proportional_none.conf | 4 -
src/ats-tests/template_perf_ats.conf | 52 -
src/block/Makefile.am | 13 -
src/consensus/Makefile.am | 1 +
src/conversation/conversation_api.c | 1 +
src/curl/curl.c | 51 +-
src/datacache/plugin_datacache_postgres.c | 4 +-
src/datacache/plugin_datacache_sqlite.c | 2 +-
src/datastore/datastore_api.c | 4 +-
src/datastore/plugin_datastore_mysql.c | 2 +-
src/datastore/plugin_datastore_postgres.c | 2 +-
src/datastore/plugin_datastore_sqlite.c | 4 +-
src/dht/Makefile.am | 1 +
src/dht/gnunet-service-dht_neighbours.c | 12 +-
src/dhtu/plugin_dhtu_ip.c | 67 +-
src/dns/Makefile.am | 6 -
src/fs/Makefile.am | 5 +-
src/gns/gnunet-gns-proxy.c | 2 +-
src/gnsrecord/Makefile.am | 2 -
src/hostlist/hostlist.conf | 2 +-
src/identity/identity_api.c | 4 -
src/identity/plugin_rest_identity.c | 26 +-
src/include/Makefile.am | 2 +-
src/include/gnunet_common.h | 42 +-
src/include/gnunet_configuration_lib.h | 193 +-
src/include/gnunet_container_lib.h | 3 +-
src/include/gnunet_curl_lib.h | 2 +-
src/include/gnunet_db_lib.h | 44 +
src/include/gnunet_disk_lib.h | 26 +
src/include/gnunet_json_lib.h | 304 +++
src/include/gnunet_messenger_service.h | 12 +-
src/include/gnunet_pq_lib.h | 125 +-
src/include/gnunet_protocols.h | 7 +
src/include/gnunet_setu_service.h | 26 +-
src/include/gnunet_testbed_ng_service.h | 284 ---
src/include/gnunet_testing_ng_lib.h | 74 +
src/include/gnunet_testing_plugin.h | 7 +-
src/include/gnunet_util_lib.h | 3 +-
src/include/platform.h | 34 +-
src/json/Makefile.am | 12 +-
src/json/json.c | 37 +-
src/json/json_pack.c | 325 +++
src/messenger/gnunet-messenger.c | 7 +-
src/messenger/gnunet-service-messenger_handle.c | 32 +-
src/messenger/gnunet-service-messenger_member.c | 1 +
src/messenger/gnunet-service-messenger_room.c | 1 +
src/namecache/namecache_api.c | 1 +
src/namestore/Makefile.am | 4 -
src/namestore/gnunet-namestore-fcfsd.c | 12 +-
src/namestore/plugin_rest_namestore.c | 6 +
...KS42GMK2VKVE96BAYDS3QVMAS7SC5208FD6HFTAXE0.zkey | 1 -
...C65M6PQW6VSRR6D3NEZVHAQF6NC037J01TETS6CJ30.zkey | Bin 32 -> 0 bytes
...9Z8BC2GHSEQ9WGZ5HWVEF25TBFR3Q5QHCERMVM76DG.zkey | 1 -
...JJ41KN2FG8782EJ2N0XDF4J6BWASR1BK5BPPRWQJAG.zkey | 2 -
src/nse/Makefile.am | 1 +
src/peerinfo-tool/Makefile.am | 8 -
src/pq/Makefile.am | 1 -
src/pq/pq.h | 31 +-
src/pq/pq_connect.c | 84 +-
src/pq/pq_event.c | 320 ++-
src/pq/test_pq.c | 129 +-
src/reclaim/Makefile.am | 13 -
src/regex/Makefile.am | 4 +-
src/rest/plugin_rest_config.c | 14 +-
src/revocation/Makefile.am | 5 -
src/revocation/gnunet-service-revocation.c | 1 +
src/secretsharing/Makefile.am | 1 +
src/set/ibf.c | 2 +-
src/set/ibf.h | 1 +
src/setu/gnunet-service-setu.c | 2087 +++++++++++++++++---
src/setu/gnunet-service-setu_protocol.h | 78 +-
src/setu/gnunet-service-setu_strata_estimator.c | 362 +++-
src/setu/gnunet-service-setu_strata_estimator.h | 54 +-
src/setu/ibf.c | 290 ++-
src/setu/ibf.h | 65 +-
src/setu/perf_setu_api.c | 571 +++---
src/setu/setu.h | 49 +
src/setu/setu_api.c | 40 +
src/setu/test_setu_api.c | 60 +-
src/testbed/Makefile.am | 59 +-
src/testbed/gnunet-cmd.c | 123 --
src/testbed/testbed_api.h | 6 +-
src/testbed/testbed_api_cmd_controller.c | 203 --
src/testbed/testbed_api_cmd_peer.c | 281 ---
src/testbed/testbed_api_cmd_peer_store.c | 60 -
src/testbed/testbed_api_cmd_send_peer_ready.c | 103 -
src/testbed/testbed_api_cmd_tng_connect.c | 55 -
src/testbed/testbed_api_cmd_tng_service.c | 276 ---
src/testbed/testbed_api_hosts.c | 53 +-
src/testbed/testbed_helper.h | 54 -
src/testing/Makefile.am | 50 +-
src/{testbed => testing}/gnunet-cmds-helper.c | 205 +-
src/{testbed => testing}/netjail_core.sh | 15 +-
src/{testbed => testing}/netjail_exec.sh | 4 +-
src/{testbed => testing}/netjail_start.sh | 2 +-
src/{testbed => testing}/netjail_stop.sh | 2 +-
.../test_testing_api_cmd_netjail.c} | 21 +-
.../test_testing_plugin_testcmd.c} | 9 +-
...esting_api_cmd_block_until_all_peers_started.c} | 41 +-
.../testing_api_cmd_local_test_finished.c} | 50 +-
.../testing_api_cmd_netjail_start.c} | 66 +-
.../testing_api_cmd_netjail_start_testsystem.c} | 318 +--
.../testing_api_cmd_netjail_stop.c} | 64 +-
.../testing_api_cmd_netjail_stop_testsystem.c} | 68 +-
src/testing/testing_api_cmd_send_peer_ready.c | 36 +-
src/testing/testing_api_cmd_system_create.c | 25 +-
src/testing/testing_api_cmd_system_destroy.c | 116 ++
src/testing/testing_api_loop.c | 44 +-
.../testbed_helper.h => testing/testing_cmds.h} | 71 +-
src/transport/Makefile.am | 71 +-
src/transport/gnunet-communicator-tcp.c | 32 +-
src/transport/plugin_cmd_simple_send.c | 188 --
src/transport/test_transport_api2_tcp_node1.conf | 23 +
src/transport/test_transport_api2_tcp_node2.conf | 22 +
src/transport/test_transport_api_cmd_simple_send.c | 80 -
.../test_transport_plugin_cmd_simple_send.c | 248 +++
src/transport/test_transport_simple_send.sh | 2 +
src/transport/transport-testing-cmds.h | 81 +
src/transport/transport-testing-ng.h | 74 +-
src/transport/transport-testing2.h | 37 -
src/transport/transport_api_cmd_connecting_peers.c | 118 +-
src/transport/transport_api_cmd_send_simple.c | 82 +-
src/transport/transport_api_cmd_start_peer.c | 274 +--
src/transport/transport_api_cmd_stop_peer.c | 163 ++
src/util/Makefile.am | 10 +-
src/util/client.c | 1 +
src/util/common_logging.c | 4 +-
src/util/configuration.c | 1096 ++++++++--
src/util/configuration_helper.c | 302 +++
src/util/configuration_loader.c | 91 -
src/util/crypto_hkdf.c | 6 +-
src/util/disk.c | 194 +-
src/util/gnunet-config.c | 318 +--
src/util/network.c | 30 +-
src/util/os_installation.c | 2 +-
src/util/os_priority.c | 14 +-
src/util/plugin.c | 6 +-
src/util/program.c | 89 +-
src/util/strings.c | 2 +-
src/util/test_plugin.c | 52 +-
src/util/test_plugin_plug.c | 5 +-
src/vpn/Makefile.am | 5 +-
src/vpn/gnunet-helper-vpn.c | 11 +-
200 files changed, 14389 insertions(+), 17846 deletions(-)
diff --cc src/util/gnunet-config.c
index 11682daea,797de0b0d..a195d6014
--- a/src/util/gnunet-config.c
+++ b/src/util/gnunet-config.c
@@@ -49,107 -34,13 +34,30 @@@
*/
static char *backend_check;
- /**
- * Treat option as a filename.
- */
- static int is_filename;
-
- /**
- * Whether to show the sections.
- */
- static int list_sections;
-
- /**
- * Return value from 'main'.
- */
- static int global_ret;
-
- /**
- * Should we write out the configuration file, even if no value was changed?
- */
- static int rewrite;
-
- /**
- * Should the generated configuration file contain the whole configuration?
- */
- static int full;
/**
+ * If printing the value of CFLAGS has been requested.
+ */
+static int cflags;
+
+/**
+ * If printing the value of LIBS has been requested.
+ */
+static int libs;
+
+/**
+ * If printing the value of PREFIX has been requested.
+ */
+static int prefix;
+
+
+/**
+ * Print each option in a given section.
+ * Main task to run to perform operations typical for
+ * gnunet-config as per the configuration settings
+ * given in @a cls.
*
- * @param cls closure
- * @param section name of the section
- * @param option name of the option
- * @param value value of the option
- */
- static void
- print_option (void *cls,
- const char *section,
- const char *option,
- const char *value)
- {
- const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
-
- (void) section;
- if (is_filename)
- {
- char *value_fn;
- char *fn;
-
- GNUNET_assert (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_filename (cfg,
- section,
- option,
- &value_fn));
- fn = GNUNET_STRINGS_filename_expand (value_fn);
- if (NULL == fn)
- fn = value_fn;
- else
- GNUNET_free (value_fn);
- fprintf (stdout, "%s = %s\n", option, fn);
- GNUNET_free (fn);
- }
- else
- {
- fprintf (stdout, "%s = %s\n", option, value);
- }
- }
-
-
- /**
- * Print out given section name.
- *
- * @param cls unused
- * @param section a section in the configuration file
- */
- static void
- print_section_name (void *cls, const char *section)
- {
- (void) cls;
- fprintf (stdout, "%s\n", section);
- }
-
-
- /**
- * Main function that will be run by the scheduler.
- *
- * @param cls closure
+ * @param cls closure with the `struct GNUNET_CONFIGURATION_ConfigSettings`
* @param args remaining command-line arguments
* @param cfgfile name of the configuration file used (for saving,
* can be NULL!)
@@@ -161,30 -52,8 +69,28 @@@ run (void *cls
const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
- struct GNUNET_CONFIGURATION_Handle *out = NULL;
+ struct GNUNET_CONFIGURATION_ConfigSettings *cs = cls;
- (void) cls;
- (void) args;
+ if (1 == cflags || 1 == libs || 1 == prefix)
+ {
+ char *prefixdir = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_PREFIX);
+ char *libdir = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_LIBDIR);
+ if (1 == cflags)
+ {
+ fprintf (stdout, "-I%sinclude\n", prefixdir);
+ }
+ if (1 == libs)
+ {
+ fprintf (stdout, "-L%s -lgnunetutil\n", libdir);
+ }
+ if (1 == prefix)
+ {
+ fprintf (stdout, "%s\n", prefixdir);
+ }
+ GNUNET_free (prefixdir);
+ GNUNET_free (libdir);
+ return;
+ }
if (NULL != backend_check)
{
char *name;
@@@ -361,62 -97,10 +134,25 @@@ main (int argc
gettext_noop (
"test if the current installation supports the specified BACKEND"),
&backend_check)),
- GNUNET_GETOPT_option_flag (
- 'F',
- "full",
- gettext_noop (
- "write the full configuration file, including default values"),
- &full),
- GNUNET_GETOPT_option_flag (
- 'f',
- "filename",
- gettext_noop ("interpret option value as a filename (with
$-expansion)"),
- &is_filename),
- GNUNET_GETOPT_option_string ('o',
- "option",
- "OPTION",
- gettext_noop ("name of the option to
access"),
- &option),
- GNUNET_GETOPT_option_flag (
- 'r',
- "rewrite",
- gettext_noop (
- "rewrite the configuration file, even if nothing changed"),
- &rewrite),
- GNUNET_GETOPT_option_flag ('S',
- "list-sections",
- gettext_noop (
- "print available configuration sections"),
- &list_sections),
- GNUNET_GETOPT_option_string ('s',
- "section",
- "SECTION",
- gettext_noop (
- "name of the section to access"),
- §ion),
- GNUNET_GETOPT_option_string ('V',
- "value",
- "VALUE",
- gettext_noop ("value to set"),
- &value),
+ GNUNET_GETOPT_option_flag ('C',
+ "cflags",
+ gettext_noop (
+ "Provide an appropriate value for CFLAGS to
applications building on top of GNUnet"),
+ &cflags),
+ GNUNET_GETOPT_option_flag ('j',
+ "libs",
+ gettext_noop (
+ "Provide an appropriate value for LIBS to
applications building on top of GNUnet"),
+ &libs),
+ GNUNET_GETOPT_option_flag ('p',
+ "prefix",
+ gettext_noop (
+ "Provide the path under which GNUnet was
installed"),
+ &prefix),
+ GNUNET_CONFIGURATION_CONFIG_OPTIONS (&cs),
GNUNET_GETOPT_OPTION_END
};
- int ret;
+ enum GNUNET_GenericReturnValue ret;
if (GNUNET_OK !=
GNUNET_STRINGS_get_utf8_args (argc, argv,
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [gnunet] branch master updated (5df20a349 -> ad9c10e6e), gnunet, 2021/09/17
- [gnunet] 07/09: -indentation, gnunet, 2021/09/17
- [gnunet] 03/09: - Do not hardcode values in gnunet-config, gnunet, 2021/09/17
- [gnunet] 04/09: Autoconf macro to detect GNUnet installations, gnunet, 2021/09/17
- [gnunet] 05/09: gnunet.m4: add flag to disable debug messages, gnunet, 2021/09/17
- [gnunet] 01/09: 5708: allow gnunet-config to output build config informations, gnunet, 2021/09/17
- [gnunet] 06/09: -Merge branch 'master' into dev/vanni/build-info,
gnunet <=
- [gnunet] 08/09: -set return value following the current API, gnunet, 2021/09/17
- [gnunet] 09/09: Merge branch 'dev/vanni/build-info' into 'master', gnunet, 2021/09/17
- [gnunet] 02/09: gnunet-config manpage: Document the new flags, gnunet, 2021/09/17