[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] 89/90: -fix conflict
|
From: |
gnunet |
|
Subject: |
[gnunet] 89/90: -fix conflict |
|
Date: |
Tue, 18 Oct 2022 03:07:28 +0200 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
commit c9562b8cf7a29f4ec2457cb9d9d4530c24225da1
Merge: 9173da4f8 d748b0c92
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Tue Oct 18 10:04:57 2022 +0900
-fix conflict
contrib/{ => scripts/doc}/warningfilter.py | 8 +-
doc/doxygen/.gitignore | 1 +
doc/doxygen/gnunet.doxy | 8 +-
src/abd/delegate_misc.c | 1 +
src/abd/gnunet-abd.c | 4 +-
src/arm/gnunet-service-arm.c | 2 +-
src/ats/gnunet-service-ats_connectivity.c | 2 +-
src/ats/gnunet-service-ats_reservations.h | 2 -
src/block/bg_bf.c | 2 +-
src/block/plugin_block_template.c | 7 +-
src/block/plugin_block_test.c | 7 +-
src/cadet/cadet_api.c | 9 +-
src/cadet/cadet_api_drop_message.c | 2 +-
src/cadet/cadet_api_list_tunnels.c | 2 +-
src/cadet/gnunet-cadet-profiler.c | 2 -
src/cadet/gnunet-service-cadet.c | 3 +-
src/cadet/gnunet-service-cadet_channel.c | 4 +-
src/cadet/gnunet-service-cadet_connection.c | 6 +-
src/cadet/gnunet-service-cadet_connection.h | 2 +-
src/cadet/gnunet-service-cadet_core.c | 8 +-
src/cadet/gnunet-service-cadet_hello.c | 2 +-
src/cadet/gnunet-service-cadet_paths.h | 4 +-
src/cadet/gnunet-service-cadet_peer.c | 10 +-
src/cadet/gnunet-service-cadet_tunnels.c | 17 +-
src/cadet/gnunet-service-cadet_tunnels.h | 4 +-
src/consensus/plugin_block_consensus.c | 1 -
src/conversation/conversation_api.c | 2 +-
src/conversation/conversation_api_call.c | 4 +-
src/core/core_api.c | 1 -
src/core/gnunet-service-core_kx.c | 9 +-
src/datacache/plugin_datacache_postgres.c | 4 +-
src/datacache/plugin_datacache_sqlite.c | 2 +-
src/datastore/datastore_api.c | 2 +-
src/datastore/gnunet-service-datastore.c | 15 +-
src/datastore/plugin_datastore_postgres.c | 2 +-
src/dht/gnunet-service-dht.h | 1 -
src/dht/gnunet-service-dht_clients.c | 12 +-
src/dht/gnunet-service-dht_neighbours.c | 11 +-
src/dht/gnunet-service-dht_neighbours.h | 4 +-
src/dht/gnunet-service-dht_routing.c | 2 -
src/dhtu/plugin_dhtu_gnunet.c | 2 +-
src/dhtu/plugin_dhtu_ip.c | 1 -
src/dns/dns_api.c | 3 +-
src/dns/plugin_block_dns.c | 1 -
src/exit/gnunet-daemon-exit.c | 5 +-
src/fs/fs_dirmetascan.c | 8 -
src/fs/fs_download.c | 65 --
src/fs/fs_file_information.c | 69 --
src/fs/fs_list_indexed.c | 8 -
src/fs/fs_namespace.c | 15 -
src/fs/fs_search.c | 4 +-
src/fs/fs_test_lib.c | 1 -
src/fs/fs_uri.c | 17 -
src/fs/gnunet-service-fs.c | 6 +-
src/fs/gnunet-service-fs_cadet_server.c | 1 -
src/fs/gnunet-service-fs_cp.c | 2 -
src/fs/gnunet-service-fs_push.c | 2 +-
src/fs/plugin_block_fs.c | 3 +-
src/gns/gns_tld_api.c | 2 +-
src/gns/gnunet-gns-proxy.c | 1 -
src/gns/gnunet-service-gns.c | 3 +-
src/gns/nss/nss_gns.c | 4 +-
src/gns/plugin_block_gns.c | 1 -
src/gns/plugin_rest_gns.c | 2 +-
src/gnsrecord/gnsrecord.c | 16 -
src/gnsrecord/gnsrecord_crypto.c | 19 -
src/gnsrecord/gnsrecord_misc.c | 8 -
src/gnsrecord/gnsrecord_serialization.c | 17 -
src/hello/address.c | 18 -
src/hello/hello-ng.c | 4 +-
src/hello/hello.c | 22 -
src/hostlist/gnunet-daemon-hostlist_client.c | 2 -
src/identity/gnunet-service-identity.c | 15 +-
src/identity/identity_api.c | 10 -
src/identity/plugin_rest_identity.c | 4 +-
src/include/block_dns.h | 5 +
src/include/block_fs.h | 5 +
src/include/gnunet_abd_service.h | 9 +-
src/include/gnunet_applications.h | 5 +
src/include/gnunet_ats_service.h | 6 +-
src/include/gnunet_block_group_lib.h | 2 +-
src/include/gnunet_block_lib.h | 3 +-
src/include/gnunet_client_lib.h | 4 +-
src/include/gnunet_common.h | 4 +-
src/include/gnunet_configuration_lib.h | 2 +-
src/include/gnunet_container_lib.h | 18 +-
src/include/gnunet_crypto_lib.h | 14 +-
src/include/gnunet_curl_lib.h | 14 +-
src/include/gnunet_dhtu_plugin.h | 2 +-
src/include/gnunet_disk_lib.h | 2 +-
src/include/gnunet_dnsstub_lib.h | 2 +-
src/include/gnunet_friends_lib.h | 5 +
src/include/gnunet_fs_service.h | 4 +-
src/include/gnunet_getopt_lib.h | 1 -
src/include/gnunet_gns_service.h | 2 +
src/include/gnunet_gnsrecord_lib.h | 4 +-
src/include/gnunet_hello_lib.h | 8 +-
src/include/gnunet_json_lib.h | 4 +-
src/include/gnunet_load_lib.h | 5 +
src/include/gnunet_messenger_service.h | 20 +-
src/include/gnunet_mq_lib.h | 19 +-
src/include/gnunet_mst_lib.h | 4 +-
src/include/gnunet_my_lib.h | 19 +-
src/include/gnunet_nat_auto_service.h | 2 +-
src/include/gnunet_nc_lib.h | 2 +
src/include/gnunet_nt_lib.h | 5 +
src/include/gnunet_peerinfo_service.h | 1 -
src/include/gnunet_peerstore_service.h | 1 +
src/include/gnunet_pq_lib.h | 12 +-
src/include/gnunet_reclaim_lib.h | 14 +-
src/include/gnunet_reclaim_service.h | 8 +-
src/include/gnunet_resolver_service.h | 5 +
src/include/gnunet_scalarproduct_service.h | 2 +-
src/include/gnunet_service_lib.h | 8 +-
src/include/gnunet_set_service.h | 10 +-
src/include/gnunet_setu_service.h | 6 +-
src/include/gnunet_socks.h | 5 +
src/include/gnunet_sq_lib.h | 2 +-
src/include/gnunet_strings_lib.h | 4 +-
src/include/gnunet_testbed_service.h | 8 +-
src/include/gnunet_testing_lib.h | 6 +-
src/include/gnunet_testing_netjail_lib.h | 4 +-
src/include/gnunet_testing_ng_lib.h | 4 +-
src/include/gnunet_time_lib.h | 2 +-
src/include/gnunet_transport_application_service.h | 4 +-
.../gnunet_transport_communication_service.h | 5 +-
src/include/gnunet_transport_service.h | 5 +-
src/messenger/gnunet-messenger.c | 14 +-
src/messenger/gnunet-service-messenger_ego_store.h | 24 +-
src/messenger/gnunet-service-messenger_handle.h | 26 +-
.../gnunet-service-messenger_list_handles.h | 10 +-
.../gnunet-service-messenger_list_messages.h | 8 +-
src/messenger/gnunet-service-messenger_member.h | 20 +-
.../gnunet-service-messenger_member_session.h | 16 +-
.../gnunet-service-messenger_member_store.h | 12 +-
.../gnunet-service-messenger_message_handle.h | 32 +-
.../gnunet-service-messenger_message_kind.h | 2 +-
.../gnunet-service-messenger_message_recv.h | 12 +-
.../gnunet-service-messenger_message_send.h | 16 +-
.../gnunet-service-messenger_message_store.h | 12 +-
src/messenger/gnunet-service-messenger_operation.h | 8 +-
.../gnunet-service-messenger_operation_store.h | 8 +-
src/messenger/gnunet-service-messenger_room.h | 56 +-
src/messenger/gnunet-service-messenger_service.h | 32 +-
src/messenger/gnunet-service-messenger_tunnel.h | 26 +-
src/messenger/messenger_api_contact.h | 10 +-
src/messenger/messenger_api_contact_store.h | 14 +-
src/messenger/messenger_api_handle.h | 18 +-
src/messenger/messenger_api_list_tunnels.h | 16 +-
src/messenger/messenger_api_message.h | 10 +-
src/messenger/messenger_api_room.h | 12 +-
src/messenger/messenger_api_util.h | 2 +-
src/messenger/testing_messenger_barrier.h | 4 +-
src/my/my_query_helper.c | 14 +-
src/my/my_result_helper.c | 11 +-
src/mysql/mysql.c | 1 -
src/namecache/gnunet-service-namecache.c | 2 +-
src/namecache/namecache_api.c | 1 -
src/namestore/gnunet-namestore-fcfsd.c | 2 +-
src/namestore/gnunet-namestore.c | 4 +-
src/namestore/gnunet-service-namestore.c | 10 +-
src/namestore/gnunet-zoneimport.c | 2 +-
src/namestore/plugin_namestore_flat.c | 818 +++++++++++++++++++++
src/namestore/plugin_namestore_postgres.c | 4 +-
src/namestore/plugin_rest_namestore.c | 2 +-
src/nat-auto/gnunet-nat-server.c | 2 +-
src/nat-auto/nat_auto_api_test.c | 2 +-
src/nat/gnunet-nat.c | 2 +-
src/nat/gnunet-service-nat.c | 2 +-
src/nat/gnunet-service-nat_helper.c | 10 -
src/nat/gnunet-service-nat_mini.c | 8 -
src/nat/nat_api.c | 20 -
src/nat/nat_api_stun.c | 2 +-
src/nse/gnunet-service-nse.c | 2 +-
src/nt/nt.c | 6 -
src/peerinfo/peerinfo_api.c | 23 -
src/peerstore/peerstore_api.c | 11 -
src/peerstore/peerstore_common.c | 6 -
src/pq/pq_event.c | 2 +-
src/pq/pq_exec.c | 9 -
src/pq/pq_result_helper.c | 26 +-
src/reclaim/did.h | 4 +-
src/reclaim/gnunet-service-reclaim.c | 16 +-
src/reclaim/gnunet-service-reclaim_tickets.c | 21 +-
src/reclaim/oidc_helper.c | 11 -
src/reclaim/oidc_helper.h | 6 +-
src/reclaim/reclaim_api.c | 69 +-
src/reclaim/reclaim_attribute.c | 33 +-
src/reclaim/reclaim_credential.c | 72 +-
src/regex/gnunet-regex-profiler.c | 1 -
src/regex/gnunet-service-regex.c | 6 +-
src/regex/regex_api_announce.c | 5 -
src/regex/regex_api_search.c | 17 -
src/regex/regex_block_lib.c | 43 --
src/regex/regex_internal.c | 64 --
src/regex/regex_internal.h | 4 +-
src/regex/regex_internal_dht.c | 6 -
src/rest/gnunet-rest-server.c | 1 -
src/rest/plugin_rest_config.c | 1 -
src/rest/rest.c | 13 -
src/revocation/revocation_api.c | 14 -
src/rps/gnunet-rps-profiler.c | 2 +-
src/rps/gnunet-rps.c | 2 +-
src/rps/gnunet-service-rps.c | 12 +-
src/rps/gnunet-service-rps_sampler_elem.c | 2 +-
src/rps/rps-sampler_common.c | 22 -
src/rps/rps-sampler_common.h | 2 -
src/rps/rps_api.c | 2 +-
src/scalarproduct/gnunet-scalarproduct.c | 1 -
.../gnunet-service-scalarproduct-ecc_alice.c | 2 +-
.../gnunet-service-scalarproduct-ecc_bob.c | 4 +-
.../gnunet-service-scalarproduct_alice.c | 2 +-
.../gnunet-service-scalarproduct_bob.c | 2 +-
src/scalarproduct/scalarproduct_api.c | 25 +-
src/secretsharing/gnunet-service-secretsharing.c | 1 -
src/secretsharing/secretsharing_api.c | 26 -
src/secretsharing/secretsharing_protocol.h | 8 +-
src/set/gnunet-service-set.c | 4 +-
src/set/gnunet-service-set_intersection.c | 9 +-
src/set/gnunet-service-set_intersection.h | 2 +-
src/set/gnunet-service-set_union.c | 6 -
.../gnunet-service-set_union_strata_estimator.c | 6 -
src/set/set_api.c | 63 +-
src/seti/seti_api.c | 26 -
src/setu/ibf.c | 30 -
src/setu/setu_api.c | 26 -
src/sq/sq.c | 13 -
src/sq/sq_prepare.c | 8 -
src/sq/sq_query_helper.c | 2 +-
src/statistics/gnunet-service-statistics.c | 10 +-
src/statistics/statistics_api.c | 40 +-
src/testbed-logger/testbed_logger_api.c | 7 -
src/testbed/gnunet-service-testbed.c | 9 +-
src/testbed/gnunet-service-testbed.h | 11 +-
src/testbed/gnunet-service-testbed_barriers.c | 4 +-
src/testbed/gnunet-service-testbed_peers.c | 18 -
src/testbed/testbed_api.c | 75 +-
src/testbed/testbed_api_barriers.c | 11 -
src/testbed/testbed_api_hosts.c | 19 -
src/testbed/testbed_api_operations.c | 8 -
src/testbed/testbed_api_operations.h | 4 +-
src/testbed/testbed_api_peers.c | 55 --
src/testbed/testbed_api_testbed.c | 5 -
src/testbed/testbed_api_topology.c | 63 --
src/testbed/testbed_api_topology.h | 6 +-
src/testing/testing.c | 60 --
src/testing/testing_api_cmd_local_test_prepared.c | 8 -
src/testing/testing_api_loop.c | 12 -
src/transport/gnunet-communicator-tcp.c | 16 +-
src/transport/gnunet-communicator-udp.c | 12 +-
src/transport/gnunet-service-tng.c | 32 +-
src/transport/gnunet-service-transport.c | 7 +-
src/transport/gnunet-service-transport_ats.c | 14 -
src/transport/gnunet-service-transport_ats.h | 3 +-
src/transport/gnunet-service-transport_hello.c | 10 -
.../gnunet-service-transport_manipulation.c | 4 +-
.../gnunet-service-transport_neighbours.c | 24 -
.../gnunet-service-transport_neighbours.h | 2 +-
src/transport/gnunet-service-transport_plugins.c | 19 -
src/transport/gnunet-service-transport_plugins.h | 4 -
src/transport/plugin_transport_http_client.c | 6 -
src/transport/plugin_transport_http_common.c | 45 --
src/transport/plugin_transport_http_common.h | 6 +-
src/transport/plugin_transport_http_server.c | 2 +-
src/transport/plugin_transport_tcp.c | 2 +-
src/transport/plugin_transport_udp.c | 2 +-
src/transport/tcp_server_legacy.c | 20 -
src/transport/transport-testing-cmds.h | 10 +-
src/transport/transport-testing-communicator.c | 15 +-
src/transport/transport-testing-filenames.c | 28 -
src/transport/transport-testing-main.c | 2 +-
src/transport/transport-testing-main2.c | 2 +-
src/transport/transport-testing2.c | 33 -
src/transport/transport-testing2.h | 2 +-
src/transport/transport_api2_communication.c | 80 --
src/transport/transport_api_address_to_string.c | 4 +-
.../transport_api_cmd_backchannel_check.c | 12 -
src/transport/transport_api_cmd_connecting_peers.c | 11 -
src/transport/transport_api_cmd_send_simple.c | 10 -
src/transport/transport_api_core.c | 2 +-
src/transport/transport_api_monitor_peers.c | 26 -
src/transport/transport_api_monitor_plugins.c | 4 +-
src/transport/transport_api_offer_hello.c | 5 -
src/util/child_management.c | 2 +-
src/util/common_logging.c | 38 +-
src/util/configuration.c | 4 +-
src/util/container_multihashmap32.c | 4 +-
src/util/crypto_rsa.c | 2 +-
src/util/dnsstub.c | 14 +-
src/util/gnunet-scrypt.c | 1 -
src/util/gnunet-service-resolver.c | 8 +-
src/util/helper.c | 46 --
src/util/mst.c | 14 -
src/util/network.c | 23 -
src/util/os_installation.c | 5 -
src/util/os_priority.c | 51 --
src/util/peer.c | 12 -
src/util/regex.c | 42 --
src/util/scheduler.c | 28 -
src/util/service.c | 2 +-
src/util/socks.c | 2 +-
src/util/speedup.c | 6 -
src/util/tun.c | 39 -
src/vpn/gnunet-service-vpn.c | 4 +-
src/vpn/vpn_api.c | 22 -
305 files changed, 1532 insertions(+), 2748 deletions(-)
diff --cc src/include/gnunet_testing_netjail_lib.h
index ea44e030d,455eb4312..f736e1b42
--- a/src/include/gnunet_testing_netjail_lib.h
+++ b/src/include/gnunet_testing_netjail_lib.h
@@@ -473,11 -420,11 +473,10 @@@ GNUNET_TESTING_cmd_stop_testing_system
/**
* Create a GNUNET_CMDS_LOCAL_FINISHED message.
*
- * @param rv The result of the local test as GNUNET_GenericReturnValue.
* @return The GNUNET_CMDS_LOCAL_FINISHED message.
- */
+ */
struct GNUNET_MessageHeader *
-GNUNET_TESTING_send_local_test_finished_msg (enum GNUNET_GenericReturnValue
rv);
+GNUNET_TESTING_send_local_test_finished_msg ();
struct GNUNET_TESTING_Command
diff --cc src/testing/testing.c
index 95651830f,de5234979..22375bc98
--- a/src/testing/testing.c
+++ b/src/testing/testing.c
@@@ -2387,44 -2287,10 +2332,39 @@@ GNUNET_TESTING_get_address (struct GNUN
return addr;
}
+/**
+ * Get the number of unintentional additional connections the node waits for.
+ *
+ * @param num The specific node we want the additional connects for.
+ * @return The number of additional connects
+ */
+unsigned int
+GNUNET_TESTING_get_additional_connects (unsigned int num,
+ struct GNUNET_TESTING_NetjailTopology
*
+ topology)
+{
+ struct GNUNET_TESTING_NetjailNode *node;
+ struct GNUNET_TESTING_NetjailNamespace *namespace;
+ struct GNUNET_TESTING_NodeConnection *node_connections;
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "get_additional_connects\n");
+
+ get_node_info (num, topology, &node, &namespace, &node_connections);
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "node additional_connects for node %p\n",
+ node);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "node additional_connects: %u\n",
+ node->additional_connects);
+
+ return node->additional_connects;
+}
- /**
- * Create a GNUNET_CMDS_LOCAL_FINISHED message.
- *
- * @return The GNUNET_CMDS_LOCAL_FINISHED message.
- */
struct GNUNET_MessageHeader *
-GNUNET_TESTING_send_local_test_finished_msg (enum GNUNET_GenericReturnValue
rv)
+GNUNET_TESTING_send_local_test_finished_msg ()
{
struct GNUNET_CMDS_LOCAL_FINISHED *reply;
size_t msg_length;
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [gnunet] 86/90: -DOC: Tweak to doxyfile: INTERACTIVE_SVG = NO -> YES, (continued)
- [gnunet] 86/90: -DOC: Tweak to doxyfile: INTERACTIVE_SVG = NO -> YES, gnunet, 2022/10/17
- [gnunet] 41/90: -DOC: Minor comment stripping pass through VPN, gnunet, 2022/10/17
- [gnunet] 46/90: -DOC: Documentation cleanup pass through SCALARPRODUCT subsystem, gnunet, 2022/10/17
- [gnunet] 52/90: -DOC: Documentation cleanup pass through FS subsystem, gnunet, 2022/10/17
- [gnunet] 56/90: -DOC: Documentation cleanup pass through GNS subsystem, gnunet, 2022/10/17
- [gnunet] 90/90: Merge branch 'dev/willow/gnunet_temp_sh_py', gnunet, 2022/10/17
- [gnunet] 44/90: -DOC: Documentation cleanup pass through MESSENGER subsystem, gnunet, 2022/10/17
- [gnunet] 09/90: -DOC: Pass through NT subsystem, gnunet, 2022/10/17
- [gnunet] 59/90: -DOC: Documentation cleanup pass through DATASTORE subsystem, gnunet, 2022/10/17
- [gnunet] 72/90: -DOC: Documentation cleanup pass through DHT Underlay subsystem, gnunet, 2022/10/17
- [gnunet] 89/90: -fix conflict,
gnunet <=
- [gnunet] 79/90: -DOC: Documentation cleanup pass through REST subsystem, gnunet, 2022/10/17
- [gnunet] 40/90: -DOC: Comment stripping pass through UTIL dnsstub, regex, speedup, and TUN libraries, gnunet, 2022/10/17
- [gnunet] 62/90: -DOC: Documentation cleanup pass through UTIL SERVICE library, gnunet, 2022/10/17
- [gnunet] 84/90: -DOC: Documentation cleanup pass through assorted libraries (curl integration, GNSRECORD, json), gnunet, 2022/10/17
- [gnunet] 25/90: -DOC: Cleaning up 'eof inside group' warnings, some of which (along with 'eof inside comment' warnings) have no obvious source., gnunet, 2022/10/17
- [gnunet] 88/90: -more package specific files, gnunet, 2022/10/17
- [gnunet] 87/90: -Removed references to explicit /tmp in test scripts and configurations in DHT, GNS, STATISTICS, and TRANSPORT subsystems., gnunet, 2022/10/17
- [gnunet] 67/90: -DOC: Documentation cleanup pass through PQ library (Postgres?), gnunet, 2022/10/17
- [gnunet] 22/90: -DOC: Comment stripping pass in REVOCATION service, gnunet, 2022/10/17
- [gnunet] 78/90: -DOC: Documentation cleanup pass through REGEX service, gnunet, 2022/10/17