[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] 09/19: Merge branch 'master' into dev/t3ss/probnatt
|
From: |
gnunet |
|
Subject: |
[gnunet] 09/19: Merge branch 'master' into dev/t3ss/probnatt |
|
Date: |
Wed, 28 Aug 2024 11:19:39 +0200 |
This is an automated email from the git hooks/post-receive script.
t3sserakt pushed a commit to branch master
in repository gnunet.
commit 50613e9318901e786a43ad7953071a3370aaa4e4
Merge: ad377b8c8 a0f729cc5
Author: t3sserakt <t3ss@posteo.de>
AuthorDate: Tue Jul 23 17:16:09 2024 +0200
Merge branch 'master' into dev/t3ss/probnatt
NEWS | 7 +
bootstrap | 5 +-
configure.ac | 3 +-
contrib/gana | 2 +-
contrib/handbook | 2 +-
debian/changelog | 12 +
meson.build | 80 +-
po/POTFILES.in | 63 +-
po/de.po | 477 ++--
po/es.po | 566 ++--
po/fr.po | 451 ++--
po/it.po | 451 ++--
po/sr.po | 549 ++--
po/sv.po | 503 ++--
po/vi.po | 554 ++--
po/zh_CN.po | 490 ++--
scripts/Makefile.am | 18 +-
scripts/meson.build | 2 -
scripts/netjail/netjail_core.sh | 28 +-
scripts/netjail/netjail_exec.sh | 14 +-
scripts/netjail/netjail_start.sh | 7 +-
scripts/netjail/netjail_start_new.sh | 266 ++
scripts/netjail/netjail_stop.sh | 2 +-
scripts/netjail/netjail_test_master.sh | 18 +
src/cli/core/gnunet-core.c | 3 +
src/cli/dht/gnunet-dht-put.c | 21 +-
src/cli/gns/test_dns2gns.sh | 2 +-
src/cli/gns/test_gns_at_lookup.sh | 2 +-
src/cli/gns/test_gns_box_sbox.sh | 2 +-
src/cli/gns/test_gns_caa_lookup.sh | 2 +-
src/cli/gns/test_gns_config_lookup.sh | 2 +-
src/cli/gns/test_gns_delegated_lookup.sh | 2 +-
src/cli/gns/test_gns_dht_lookup.sh | 2 +-
src/cli/gns/test_gns_gns2dns_cname_lookup.sh | 2 +-
src/cli/gns/test_gns_gns2dns_lookup.sh | 2 +-
src/cli/gns/test_gns_gns2dns_zkey_lookup.sh | 2 +-
src/cli/gns/test_gns_ipv6_lookup.sh | 2 +-
src/cli/gns/test_gns_lightest.sh | 2 +-
src/cli/gns/test_gns_lookup.sh | 2 +-
src/cli/gns/test_gns_multiple_record_lookup.sh | 2 +-
src/cli/gns/test_gns_mx_lookup.sh | 2 +-
src/cli/gns/test_gns_quickupdate.sh | 2 +-
src/cli/gns/test_gns_redirect_lookup.sh | 2 +-
src/cli/gns/test_gns_rel_expiration.sh | 2 +-
src/cli/gns/test_gns_revocation.sh | 2 +-
src/cli/gns/test_gns_sbox.sh | 2 +-
src/cli/gns/test_gns_sbox_simple.sh | 2 +-
src/cli/gns/test_gns_soa_lookup.sh | 2 +-
src/cli/gns/test_gns_txt_lookup.sh | 2 +-
src/cli/gns/test_gns_zkey_lookup.sh | 2 +-
src/cli/messenger/gnunet-messenger.c | 92 +-
src/cli/reclaim/gnunet-reclaim.c | 78 +-
src/cli/reclaim/test_reclaim.conf | 12 +-
src/cli/reclaim/test_reclaim_consume.sh | 6 +-
src/cli/reclaim/test_reclaim_issue.sh | 2 +-
src/cli/reclaim/test_reclaim_oidc.sh | 57 +
src/cli/util/gnunet-config.c | 248 +-
src/cli/util/gnunet-ecc.c | 24 +-
src/contrib/service/abd/gnunet-abd.c | 7 +-
src/contrib/service/abd/meson.build | 54 +
src/contrib/service/consensus/Makefile.am | 4 +-
src/contrib/service/consensus/meson.build | 3 +
src/contrib/service/conversation/Makefile.am | 24 +-
src/contrib/service/conversation/meson.build | 3 +
src/contrib/service/meson.build | 2 +-
src/include/Makefile.am | 13 +-
src/include/gettext.h | 10 +-
src/include/gnunet_arm_service.h | 82 +-
src/include/gnunet_common.h | 485 ++--
src/include/gnunet_configuration_lib.h | 174 +-
src/include/gnunet_crypto_lib.h | 9 +
src/include/gnunet_getopt_lib.h | 29 +-
src/include/gnunet_gns_service.h | 10 +
src/include/gnunet_helper_lib.h | 2 +-
src/include/gnunet_json_lib.h | 71 +
src/include/gnunet_messenger_service.h | 117 +-
src/include/gnunet_mq_lib.h | 79 +-
src/include/gnunet_os_lib.h | 70 +-
src/include/gnunet_pq_lib.h | 24 +-
src/include/gnunet_protocols.h | 17 +-
src/include/gnunet_reclaim_service.h | 77 +-
src/include/gnunet_testbed_lib.h | 130 +
src/include/gnunet_testing_arm_lib.h | 47 +
src/include/gnunet_testing_barrier.h | 122 -
...ore_testing_lib.h => gnunet_testing_core_lib.h} | 13 +-
src/include/gnunet_testing_lib.h | 1120 +++++---
src/include/gnunet_testing_loop_lib.h | 697 -----
src/include/gnunet_testing_ng_lib.h | 115 -
src/include/gnunet_testing_plugin.h | 145 -
src/include/gnunet_testing_testbed_lib.h | 42 +
...ing_ng_lib.h => gnunet_testing_transport_lib.h} | 34 +-
src/include/gnunet_transport_application_service.h | 2 -
src/include/gnunet_util_lib.h | 39 +-
src/include/meson.build | 8 +-
src/lib/Makefile.am | 9 +-
src/lib/gnsrecord/Makefile.am | 5 -
.../gnsrecord/test_gnsrecord_block_expiration.c | 3 +-
src/lib/gnsrecord/test_gnsrecord_testvectors.c | 8 +
src/lib/json/json_helper.c | 428 +++
src/lib/json/json_pack.c | 115 +-
src/lib/meson.build | 1 +
src/lib/pq/Makefile.am | 2 +-
src/lib/pq/pq_query_helper.c | 200 ++
src/lib/pq/pq_result_helper.c | 114 +-
src/{service => lib}/testing/.gitignore | 2 +
src/lib/testing/Makefile.am | 92 +
src/lib/testing/gnunet-cmds-helper.c | 549 ++++
src/lib/testing/gnunet-testing-netjail-launcher.c | 87 +
src/lib/testing/meson.build | 38 +
src/lib/testing/test_netjail_api.sh | 2 +
src/lib/testing/test_netjail_topo.conf | 12 +
src/lib/testing/test_testing_api.c | 130 +
src/lib/testing/test_testing_plugin_ping.c | 54 +
src/{service => lib}/testing/testing.conf | 0
src/lib/testing/testing_api_barrier.c | 51 +
src/lib/testing/testing_api_barrier.h | 81 +
src/lib/testing/testing_api_cmd_barrier_create.c | 106 +
src/lib/testing/testing_api_cmd_barrier_reached.c | 189 ++
.../testing/testing_api_cmd_batch.c | 63 +-
src/lib/testing/testing_api_cmd_batch.h | 72 +
src/lib/testing/testing_api_cmd_exec.c | 254 ++
.../testing/testing_api_cmd_finish.c | 68 +-
src/lib/testing/testing_api_cmd_get_topo.c | 214 ++
.../testing/testing_api_cmd_netjail_start.c | 99 +-
.../testing_api_cmd_netjail_start_cmds_helper.c | 595 ++++
src/lib/testing/testing_api_cmd_signal.c | 120 +
src/lib/testing/testing_api_cmd_stat.c | 161 ++
src/lib/testing/testing_api_cmds.c | 92 +
src/lib/testing/testing_api_loop.c | 1024 +++++++
src/lib/testing/testing_api_loop.h | 163 ++
src/lib/testing/testing_api_main.c | 140 +
src/lib/testing/testing_api_topology.c | 1355 ++++++++++
.../testing/testing_api_topology.h} | 386 ++-
src/{service => lib}/testing/testing_api_traits.c | 18 +-
src/lib/testing/testing_cmds.h | 109 +
src/lib/util/.gitignore | 2 +
src/lib/util/Makefile.am | 5 +-
src/lib/util/common_allocation.c | 261 +-
src/lib/util/crypto_ecc.c | 21 +-
src/lib/util/crypto_ecc_setup.c | 5 +-
src/lib/util/crypto_pkey.c | 17 +
src/lib/util/crypto_symmetric.c | 2 +-
src/lib/util/gnunet_error_codes.c | 1 +
src/lib/util/helper.c | 4 +-
src/lib/util/meson.build | 1 -
src/lib/util/op.c | 335 ---
src/lib/util/service.c | 596 ++---
src/lib/util/strings.c | 30 +-
src/lib/util/test_crypto_blind.c | 1 +
src/plugin/datastore/Makefile.am | 6 -
src/plugin/namecache/Makefile.am | 3 -
src/plugin/peerstore/Makefile.am | 1 -
src/plugin/reclaim/plugin_gnsrecord_reclaim.c | 4 +-
src/service/Makefile.am | 3 +-
src/service/arm/Makefile.am | 23 +-
src/service/arm/arm_api.c | 77 +-
src/service/arm/testing_arm_cmd_start_peer.c | 293 ++
src/service/arm/testing_arm_cmd_stop_peer.c | 174 ++
.../testing_arm_traits.c} | 9 +-
src/service/cadet/gnunet-service-cadet_dht.c | 1 +
src/service/cadet/gnunet-service-cadet_hello.c | 1 -
src/service/cadet/meson.build | 4 +
src/service/core/Makefile.am | 53 +-
src/service/core/meson.build | 14 +-
src/service/core/test_core_plugin_cmd_just_run.c | 22 +-
...peers.c => testing_core_cmd_connecting_peers.c} | 33 +-
src/service/datacache/Makefile.am | 6 -
src/service/datastore/Makefile.am | 14 +-
src/service/datastore/meson.build | 3 +
src/service/dht/gnunet-service-dht.c | 7 -
src/service/dht/meson.build | 8 +-
src/service/fs/Makefile.am | 46 +-
src/service/gns/gns_tld_api.c | 32 +-
.../hostlist/gnunet-daemon-hostlist_server.c | 2 +-
src/service/identity/Makefile.am | 6 +-
src/service/meson.build | 2 +-
src/service/messenger/Makefile.am | 48 +-
src/service/messenger/gnunet-service-messenger.c | 19 +
.../messenger/gnunet-service-messenger_handle.c | 46 +-
.../gnunet-service-messenger_list_messages.c | 6 +-
.../messenger/gnunet-service-messenger_member.c | 75 +
.../messenger/gnunet-service-messenger_member.h | 54 +
.../gnunet-service-messenger_member_session.c | 18 +-
.../gnunet-service-messenger_message_handle.c | 42 +
.../gnunet-service-messenger_message_handle.h | 15 +
.../gnunet-service-messenger_message_recv.c | 1 +
.../gnunet-service-messenger_message_send.c | 1 +
.../gnunet-service-messenger_message_store.c | 172 +-
.../gnunet-service-messenger_message_store.h | 14 +
.../gnunet-service-messenger_peer_store.c | 6 +-
.../messenger/gnunet-service-messenger_room.c | 82 +-
.../messenger/gnunet-service-messenger_room.h | 11 +
.../messenger/gnunet-service-messenger_service.c | 5 +
.../gnunet-service-messenger_subscription.c | 149 ++
.../gnunet-service-messenger_subscription.h | 71 +
src/service/messenger/meson.build | 1 +
src/service/messenger/messenger-testing-cmds.h | 6 +-
src/service/messenger/messenger_api.c | 137 +-
.../messenger/messenger_api_contact_store.c | 2 +
src/service/messenger/messenger_api_list_tunnels.c | 6 +-
src/service/messenger/messenger_api_message.c | 167 +-
src/service/messenger/messenger_api_message.h | 10 +
.../messenger/messenger_api_message_control.c | 2 +-
src/service/messenger/messenger_api_message_kind.c | 59 +-
src/service/messenger/messenger_api_message_kind.h | 37 +-
.../messenger/messenger_api_queue_messages.c | 4 +-
src/service/messenger/messenger_api_room.c | 160 +-
src/service/messenger/messenger_api_room.h | 11 +
src/service/messenger/test_messenger.c | 1 +
.../test_messenger_plugin_cmd_simple_join.c | 8 +-
.../{messenger-testing.c => testing_messenger.c} | 0
.../{messenger-testing.h => testing_messenger.h} | 0
...in_room.c => testing_messenger_cmd_join_room.c} | 7 +-
...ice.c => testing_messenger_cmd_start_service.c} | 13 +-
...vice.c => testing_messenger_cmd_stop_service.c} | 3 +-
...ger_api_traits.c => testing_messenger_traits.c} | 0
src/service/namecache/Makefile.am | 4 +-
src/service/namestore/Makefile.am | 7 +-
src/service/namestore/gnunet-service-namestore.c | 9 +-
src/service/namestore/meson.build | 4 +
src/service/nat/gnunet-service-nat.c | 116 +-
src/service/nse/Makefile.am | 6 +-
src/service/peerstore/Makefile.am | 10 +-
src/service/peerstore/gnunet-service-peerstore.c | 25 +-
src/service/peerstore/meson.build | 6 +-
src/service/peerstore/peerstore_api.c | 39 +-
src/service/peerstore/peerstore_api_monitor.c | 29 +-
src/service/peerstore/peerstore_common.c | 1 -
src/service/pt/Makefile.am | 12 +-
src/service/reclaim/gnunet-service-reclaim.c | 123 +-
.../reclaim/gnunet-service-reclaim_tickets.c | 262 +-
.../reclaim/gnunet-service-reclaim_tickets.h | 14 +-
src/service/reclaim/reclaim.h | 26 +-
src/service/reclaim/reclaim_api.c | 179 +-
src/service/regex/Makefile.am | 14 +-
src/service/rest/json_reclaim.c | 55 +-
src/service/rest/oidc_helper.c | 93 +-
src/service/rest/oidc_helper.h | 25 +-
src/service/rest/openid_plugin.c | 85 +-
src/service/rest/reclaim_plugin.c | 63 +-
.../setu/gnunet-service-setu_strata_estimator.c | 8 +
src/service/testbed/.gitignore | 1 +
src/service/testbed/Makefile.am | 53 +
src/service/testbed/gnunet-testbed.c | 230 ++
.../test_testbed_portreservation.c} | 32 +-
src/service/testbed/testbed.c | 579 ++++
.../testbed_api_cmd_system_create.c} | 31 +-
.../testing_testbed_traits.c} | 10 +-
src/service/testing/Makefile.am | 134 -
src/service/testing/gnunet-cmds-helper.c | 713 -----
src/service/testing/gnunet-testing.c | 444 ---
src/service/testing/list-keys.c | 112 -
src/service/testing/meson.build | 62 -
src/service/testing/test_testing_defaults.conf | 25 -
src/service/testing/test_testing_peerstartup.c | 143 -
src/service/testing/test_testing_peerstartup2.c | 222 --
src/service/testing/test_testing_servicestartup.c | 75 -
src/service/testing/test_testing_sharedservices.c | 167 --
.../testing/test_testing_sharedservices.conf | 30 -
.../testing/test_testing_start_with_config.c | 121 -
src/service/testing/testing.c | 2830 --------------------
src/service/testing/testing.h | 339 ---
src/service/testing/testing_api_cmd_barrier.c | 206 --
.../testing/testing_api_cmd_barrier_reached.c | 229 --
.../testing_api_cmd_block_until_external_trigger.c | 119 -
.../testing/testing_api_cmd_exec_bash_script.c | 216 --
.../testing/testing_api_cmd_local_test_prepared.c | 112 -
.../testing_api_cmd_netjail_start_cmds_helper.c | 917 -------
src/service/testing/testing_api_cmd_netjail_stop.c | 200 --
.../testing_api_cmd_netjail_stop_cmds_helper.c | 157 --
.../testing/testing_api_cmd_send_peer_ready.c | 123 -
.../testing/testing_api_cmd_system_destroy.c | 111 -
src/service/testing/testing_api_loop.c | 893 ------
src/service/testing/testing_cmds.h | 143 -
src/service/testing/topo.sh | 99 -
src/service/topology/gnunet-daemon-topology.c | 1 +
src/service/transport/Makefile.am | 160 +-
src/service/transport/gnunet-communicator-tcp.c | 10 +-
src/service/transport/gnunet-communicator-udp.c | 18 +-
src/service/transport/gnunet-service-transport.c | 53 +-
src/service/transport/meson.build | 52 +-
...st_transport_plugin_cmd_simple_send_broadcast.c | 4 +-
..._transport_plugin_cmd_simple_send_performance.c | 4 +-
.../test_transport_plugin_cmd_udp_backchannel.c | 85 +-
.../transport/test_transport_simple_send.sh | 13 +-
.../transport/test_transport_start_with_config.c | 3 +-
src/service/transport/testing_api_cmd_start_peer.c | 519 ----
src/service/transport/testing_api_cmd_stop_peer.c | 130 -
...ort_api_traits.c => testing_transport_traits.c} | 11 +-
src/service/transport/transport-testing-cmds.h | 42 +-
.../transport/transport-testing-communicator.c | 12 +
src/service/transport/transport-testing2.h | 2 +-
.../transport_api_cmd_backchannel_check.c | 19 +-
.../transport/transport_api_cmd_connecting_peers.c | 26 +-
.../transport/transport_api_cmd_send_simple.c | 5 +-
.../transport_api_cmd_send_simple_performance.c | 15 +-
.../transport/transport_api_cmd_start_peer.c | 28 +-
.../transport/transport_api_cmd_stop_peer.c | 3 +-
298 files changed, 15372 insertions(+), 16785 deletions(-)
diff --cc scripts/Makefile.am
index 3f154da55,819ca903e..58cf12ce0
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@@ -2,15 -2,14 +2,17 @@@
AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
dist_pkgdata_DATA = \
+ netjail/nat_node_test.sh \
+ netjail/getmsg.sh \
netjail/netjail_core.sh \
- netjail/netjail_exec.sh \
netjail/netjail_start.sh \
+ netjail/netjail_exec.sh \
+ netjail/netjail_start_new.sh \
netjail/netjail_stop.sh \
+ netjail/netjail_test_master.sh \
netjail/topo.sh \
- testing-ng/block.sh
+ testing-ng/block.sh \
+ testing-ng/emu_run.sh
EXTRA_DIST = \
get_version.sh \
@@@ -23,14 -22,13 +25,16 @@@
sphinx_update.sh
install-data-hook:
+ chmod o+x '$(DESTDIR)$(pkgdatadir)/nat_node_test.sh'
+ chmod o+x '$(DESTDIR)$(pkgdatadir)/getmsg.sh'
- chmod o+x '$(DESTDIR)$(pkgdatadir)/netjail_core.sh'
- chmod o+x '$(DESTDIR)$(pkgdatadir)/netjail_start.sh'
- chmod o+x '$(DESTDIR)$(pkgdatadir)/netjail_stop.sh'
- chmod o+x '$(DESTDIR)$(pkgdatadir)/netjail_exec.sh'
- chmod o+x '$(DESTDIR)$(pkgdatadir)/topo.sh'
- chmod o+x '$(DESTDIR)$(pkgdatadir)/block.sh'
+ chmod +x '$(DESTDIR)$(pkgdatadir)/netjail_core.sh'
+ chmod +x '$(DESTDIR)$(pkgdatadir)/netjail_start.sh'
+ chmod +x '$(DESTDIR)$(pkgdatadir)/netjail_start_new.sh'
+ chmod +x '$(DESTDIR)$(pkgdatadir)/netjail_exec.sh'
+ chmod +x '$(DESTDIR)$(pkgdatadir)/netjail_stop.sh'
+ chmod +x '$(DESTDIR)$(pkgdatadir)/netjail_test_master.sh'
+ chmod +x '$(DESTDIR)$(pkgdatadir)/topo.sh'
+ chmod +x '$(DESTDIR)$(pkgdatadir)/block.sh'
+ chmod o+x '$(DESTDIR)$(pkgdatadir)/emu_run.sh'
## EOF
diff --cc src/include/gnunet_util_lib.h
index 4bca96282,86a1204bb..5f24b6307
--- a/src/include/gnunet_util_lib.h
+++ b/src/include/gnunet_util_lib.h
@@@ -77,10 -77,8 +77,9 @@@ extern "C
#include "gnunet_helper_lib.h"
#include "gnunet_mst_lib.h"
#include "gnunet_mq_lib.h"
+#include "gnunet_nat_lib.h"
#include "gnunet_nt_lib.h"
#include "gnunet_nc_lib.h"
- #include "gnunet_op_lib.h"
#include "gnunet_os_lib.h"
#include "gnunet_peer_lib.h"
#include "gnunet_plugin_lib.h"
diff --cc src/lib/util/Makefile.am
index 73b2835e9,38dd4c2ad..3bf0c7ecf
--- a/src/lib/util/Makefile.am
+++ b/src/lib/util/Makefile.am
@@@ -82,11 -82,9 +82,10 @@@ libgnunetutil_la_SOURCES =
load.c \
mst.c \
mq.c \
+ nat.c \
nc.c \
network.c \
- nt.c \
- op.c \
+ nt.c \
os_installation.c \
os_network.c \
os_priority.c \
diff --cc src/service/core/Makefile.am
index 2822197b7,6de6762b1..1466db582
--- a/src/service/core/Makefile.am
+++ b/src/service/core/Makefile.am
@@@ -15,16 -15,12 +15,16 @@@ if USE_COVERAG
XLIB = -lgcov
endif
-#plugin_LTLIBRARIES = \
-# libgnunet_test_core_plugin_cmd_just_run.la
+plugin_LTLIBRARIES = \
- libgnunet_test_core_plugin_cmd_just_run.la \
++ #libgnunet_test_core_plugin_cmd_just_run.la \
+ libgnunet_test_core_plugin_cmd_run_emu.la
+
+TESTING_LIBS = \
+ libgnunetcoretesting.la
lib_LTLIBRARIES = \
- libgnunetcore.la \
- $(TESTING_LIBS)
+ libgnunetcore.la
+ # libgnunettestingcore.la
libgnunetcore_la_SOURCES = \
core_api.c core.h \
@@@ -50,33 -46,16 +50,32 @@@ libgnunet_test_core_plugin_cmd_run_emu_
$(top_builddir)/src/service/arm/libgnunetarm.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(LTLIBINTL)
-libgnunet_test_core_plugin_cmd_just_run_la_LDFLAGS = \
+libgnunet_test_core_plugin_cmd_run_emu_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
- libgnunet_test_core_plugin_cmd_just_run_la_SOURCES = \
- test_core_plugin_cmd_just_run.c
- libgnunet_test_core_plugin_cmd_just_run_la_LIBADD = \
- libgnunetcoretesting.la \
- $(top_builddir)/src/service/transport/libgnunettransportapplication.la \
- $(top_builddir)/src/service/transport/libgnunettransportcore.la \
- $(top_builddir)/src/lib/hello/libgnunethello.la \
- $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
- $(top_builddir)/src/service/transport/libgnunettransporttesting2.la \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/service/arm/libgnunetarm.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(LTLIBINTL)
- libgnunet_test_core_plugin_cmd_just_run_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-libgnunettestingcore_la_SOURCES = \
- testing_core_cmd_connecting_peers.c
-libgnunettestingcore_la_LIBADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
- $(top_builddir)/src/service/transport/libgnunettestingtransport.la \
++#libgnunet_test_core_plugin_cmd_just_run_la_SOURCES = \
++# test_core_plugin_cmd_just_run.c
++#libgnunet_test_core_plugin_cmd_just_run_la_LIBADD = \
++# libgnunettestingcore.la \
++# $(top_builddir)/src/service/transport/libgnunettestingtransport.la \
++# $(top_builddir)/src/lib/testing/libgnunettesting.la \
++# $(top_builddir)/src/service/transport/libgnunettransportapplication.la \
++# $(top_builddir)/src/service/transport/libgnunettransportcore.la \
++# $(top_builddir)/src/lib/hello/libgnunethello.la \
++# $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
++# $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
++# $(top_builddir)/src/service/arm/libgnunetarm.la \
++# $(top_builddir)/src/lib/util/libgnunetutil.la \
++# $(LTLIBINTL)
++#libgnunet_test_core_plugin_cmd_just_run_la_LDFLAGS = \
++# $(GN_PLUGIN_LDFLAGS)
+
+libgnunetcoretesting_la_SOURCES = \
+ core_api_cmd_connecting_peers.c
+libgnunetcoretesting_la_LIBADD = \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/service/arm/libgnunetarm.la \
$(top_builddir)/src/service/transport/libgnunettransportapplication.la \
- $(top_builddir)/src/service/transport/libgnunettransporttesting2.la \
$(top_builddir)/src/lib/hello/libgnunethello.la \
$(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
$(top_builddir)/src/service/transport/libgnunettransportcore.la \
diff --cc src/service/transport/Makefile.am
index 07d5b5855,eac451882..312285fa7
--- a/src/service/transport/Makefile.am
+++ b/src/service/transport/Makefile.am
@@@ -189,30 -185,13 +185,30 @@@ gnunet_service_transport_LDADD =
$(LIBGCRYPT_LIBS) \
$(GN_LIBINTL)
-#plugin_LTLIBRARIES = \
-# libgnunet_test_transport_plugin_cmd_simple_send_performance.la \
-# libgnunet_test_transport_plugin_cmd_nat_upnp.la \
-# libgnunet_test_transport_plugin_cmd_simple_send.la \
-# libgnunet_test_transport_plugin_cmd_simple_send_broadcast.la \
-# libgnunet_test_transport_plugin_cmd_simple_send_dv.la \
-# libgnunet_test_transport_plugin_cmd_udp_backchannel.la
+plugin_LTLIBRARIES = \
- libgnunet_test_transport_plugin_cmd_nat_mapping.la \
++ #libgnunet_test_transport_plugin_cmd_nat_mapping.la \
+ libgnunet_test_transport_plugin_cmd_simple_send_performance.la \
+ libgnunet_test_transport_plugin_cmd_nat_upnp.la \
+ libgnunet_test_transport_plugin_cmd_simple_send.la \
+ libgnunet_test_transport_plugin_cmd_simple_send_broadcast.la \
+ libgnunet_test_transport_plugin_cmd_simple_send_dv.la \
+ libgnunet_test_transport_plugin_cmd_udp_backchannel.la
+
- libgnunet_test_transport_plugin_cmd_nat_mapping_la_SOURCES = \
- test_transport_plugin_cmd_nat_mapping.c
- libgnunet_test_transport_plugin_cmd_nat_mapping_la_LIBADD = \
- libgnunettransporttesting2.la \
- libgnunettransportapplication.la \
- libgnunettransportcore.la \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
- $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/lib/hello/libgnunethello.la \
- $(top_builddir)/src/service/arm/libgnunetarm.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(LTLIBINTL)
- libgnunet_test_transport_plugin_cmd_nat_mapping_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
++#libgnunet_test_transport_plugin_cmd_nat_mapping_la_SOURCES = \
++# test_transport_plugin_cmd_nat_mapping.c
++#libgnunet_test_transport_plugin_cmd_nat_mapping_la_LIBADD = \
++# libgnunettransporttesting2.la \
++# libgnunettransportapplication.la \
++# libgnunettransportcore.la \
++# $(top_builddir)/src/service/testing/libgnunettesting.la \
++# $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
++# $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
++# $(top_builddir)/src/lib/hello/libgnunethello.la \
++# $(top_builddir)/src/service/arm/libgnunetarm.la \
++# $(top_builddir)/src/lib/util/libgnunetutil.la \
++# $(LTLIBINTL)
++#libgnunet_test_transport_plugin_cmd_nat_mapping_la_LDFLAGS = \
++# $(GN_PLUGIN_LDFLAGS)
libgnunet_test_transport_plugin_cmd_nat_upnp_la_SOURCES = \
test_transport_plugin_cmd_nat_upnp.c
diff --cc src/service/transport/gnunet-communicator-udp.c
index d6185ed2e,fa5294218..c2133e944
--- a/src/service/transport/gnunet-communicator-udp.c
+++ b/src/service/transport/gnunet-communicator-udp.c
@@@ -916,12 -911,11 +918,17 @@@ receiver_destroy (struct ReceiverAddres
GNUNET_TRANSPORT_communicator_mq_del (receiver->d_qh);
receiver->d_qh = NULL;
}
+ else if (NULL != receiver->d_mq)
+ {
+ GNUNET_MQ_destroy (receiver->d_mq);
+ receiver->d_mq = NULL;
+ }
+ if (NULL != receiver->udp_sock)
+ {
+ GNUNET_break (GNUNET_OK ==
+ GNUNET_NETWORK_socket_close (receiver->udp_sock));
+ receiver->udp_sock = NULL;
+ }
GNUNET_assert (GNUNET_YES ==
GNUNET_CONTAINER_multihashmap_remove (receivers,
&receiver->key,
diff --cc src/service/transport/gnunet-service-transport.c
index 4a0be882c,91ce801db..231df7a9c
--- a/src/service/transport/gnunet-service-transport.c
+++ b/src/service/transport/gnunet-service-transport.c
@@@ -5447,15 -5393,17 +5454,18 @@@ consider_sending_fc (void *cls
struct TransportFlowControlMessage *fc;
struct GNUNET_TIME_Relative duration;
struct GNUNET_TIME_Relative rtt;
+ struct GNUNET_TIME_Relative rtt_avarage;
struct Neighbour *n = vl->n;
- if (0 < n->number_of_addresses)
+ if (NULL != n && 0 < n->number_of_addresses)
{
- char *tgnas = GNUNET_malloc (n->number_of_addresses * sizeof (struct
TransportGlobalNattedAddress) + n->size_of_global_addresses);
- size_t addresses_size;
+ size_t addresses_size =
+ n->number_of_addresses * sizeof (struct TransportGlobalNattedAddress) +
n->size_of_global_addresses;
+ char *tgnas = GNUNET_malloc (addresses_size);
+ struct AddGlobalAddressesContext ctx;
+ ctx.off = 0;
+ ctx.tgnas = tgnas;
- addresses_size = n->number_of_addresses * sizeof (struct
TransportGlobalNattedAddress) + n->size_of_global_addresses;
fc = GNUNET_malloc (sizeof (struct TransportFlowControlMessage) +
addresses_size);
fc->header.size = htons (sizeof(struct TransportFlowControlMessage) +
addresses_size);
fc->size_of_addresses = htonl (n->size_of_global_addresses);
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [gnunet] 01/19: Transport: Added test case to simulate router NAT mapping behavior., (continued)
- [gnunet] 01/19: Transport: Added test case to simulate router NAT mapping behavior., gnunet, 2024/08/28
- [gnunet] 04/19: Added sync protocol., gnunet, 2024/08/28
- [gnunet] 03/19: Added functionality to check if all services and communicators are started., gnunet, 2024/08/28
- [gnunet] 08/19: Implemented burst mode., gnunet, 2024/08/28
- [gnunet] 13/19: Refactoring the burst logic., gnunet, 2024/08/28
- [gnunet] 06/19: Moved sync protocol to util., gnunet, 2024/08/28
- [gnunet] 12/19: Fixed Generic and specific test setup and code., gnunet, 2024/08/28
- [gnunet] 07/19: NAT: Added missing missing files, gnunet, 2024/08/28
- [gnunet] 05/19: Fixed bug with new queues inheriting the validated_until value of existing queues., gnunet, 2024/08/28
- [gnunet] 15/19: Make hole punch socket available, and some bug fixes., gnunet, 2024/08/28
- [gnunet] 09/19: Merge branch 'master' into dev/t3ss/probnatt,
gnunet <=
- [gnunet] 17/19: Merge master into branch., gnunet, 2024/08/28
- [gnunet] 10/19: Make the test framework work to run full peers., gnunet, 2024/08/28
- [gnunet] 11/19: Added msssing config., gnunet, 2024/08/28
- [gnunet] 14/19: Fixed bug adding global addresses to nat service., gnunet, 2024/08/28
- [gnunet] 16/19: Fixed back in peerstore when iteration already has finished., gnunet, 2024/08/28
- [gnunet] 18/19: Added meson build files for arm and arm monolith, and fixed macro to start daemons., gnunet, 2024/08/28
- [gnunet] 19/19: Fixed merge failures., gnunet, 2024/08/28