[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated (0f00c0028 -> 32a8c505c)
|
From: |
gnunet |
|
Subject: |
[gnunet] branch master updated (0f00c0028 -> 32a8c505c) |
|
Date: |
Tue, 17 Aug 2021 20:01:11 +0200 |
This is an automated email from the git hooks/post-receive script.
t3sserakt pushed a change to branch master
in repository gnunet.
from 0f00c0028 - commented plugin in Makefile.am because of circular
dependency problem
new 1e063cd73 - renamed methods and variables to prepare moving files from
testbed to testing, to fix circular dependency problem
new 32a8c505c - moved test code from testbed to testing
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
po/POTFILES.in | 140 +++++-----
src/include/Makefile.am | 1 -
src/include/gnunet_testbed_ng_service.h | 285 ---------------------
src/include/gnunet_testing_ng_lib.h | 68 +++++
src/include/gnunet_testing_plugin.h | 4 +-
src/testbed/Makefile.am | 52 ----
src/testbed/gnunet-cmd.c | 123 ---------
src/testbed/testbed_api.h | 6 +-
src/testbed/testbed_api_cmd_controller.c | 203 ---------------
.../testbed_api_cmd_netjail_start_testbed.c | 99 +++----
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 | 41 +++
src/{testbed => testing}/gnunet-cmds-helper.c | 11 +-
src/{testbed => testing}/netjail_exec.sh | 0
src/{testbed => testing}/netjail_start.sh | 0
src/{testbed => testing}/netjail_stop.sh | 0
.../test_testing_api_cmd_netjail.c} | 21 +-
.../test_testing_plugin_testcmd.c} | 4 +-
...esting_api_cmd_block_until_all_peers_started.c} | 0
.../testing_api_cmd_local_test_finished.c} | 6 +-
.../testing_api_cmd_netjail_start.c} | 12 +-
.../testing_api_cmd_netjail_start_testsystem.c} | 104 +++-----
.../testing_api_cmd_netjail_stop.c} | 12 +-
.../testing_api_cmd_netjail_stop_testsystem.c} | 40 ++-
src/testing/testing_api_cmd_send_peer_ready.c | 9 +-
.../testbed_helper.h => testing/testing_cmds.h} | 71 +----
src/transport/Makefile.am | 27 +-
src/transport/test_transport_api_cmd_simple_send.c | 23 +-
...d.c => test_transport_plugin_cmd_simple_send.c} | 34 ++-
35 files changed, 377 insertions(+), 1901 deletions(-)
delete mode 100644 src/include/gnunet_testbed_ng_service.h
delete mode 100644 src/testbed/gnunet-cmd.c
delete mode 100644 src/testbed/testbed_api_cmd_controller.c
delete mode 100644 src/testbed/testbed_api_cmd_peer.c
delete mode 100644 src/testbed/testbed_api_cmd_peer_store.c
delete mode 100644 src/testbed/testbed_api_cmd_send_peer_ready.c
delete mode 100644 src/testbed/testbed_api_cmd_tng_connect.c
delete mode 100644 src/testbed/testbed_api_cmd_tng_service.c
rename src/{testbed => testing}/gnunet-cmds-helper.c (98%)
copy src/{testbed => testing}/netjail_exec.sh (100%)
copy src/{testbed => testing}/netjail_start.sh (100%)
copy src/{testbed => testing}/netjail_stop.sh (100%)
rename src/{testbed/test_testbed_api_cmd_netjail.c =>
testing/test_testing_api_cmd_netjail.c} (74%)
rename src/{testbed/plugin_testcmd.c => testing/test_testing_plugin_testcmd.c}
(96%)
rename src/{testbed/testbed_api_cmd_block_until_all_peers_started.c =>
testing/testing_api_cmd_block_until_all_peers_started.c} (100%)
rename src/{testbed/testbed_api_cmd_local_test_finished.c =>
testing/testing_api_cmd_local_test_finished.c} (96%)
rename src/{testbed/testbed_api_cmd_netjail_start.c =>
testing/testing_api_cmd_netjail_start.c} (93%)
copy src/{testbed/testbed_api_cmd_netjail_start_testbed.c =>
testing/testing_api_cmd_netjail_start_testsystem.c} (82%)
rename src/{testbed/testbed_api_cmd_netjail_stop.c =>
testing/testing_api_cmd_netjail_stop.c} (92%)
rename src/{testbed/testbed_api_cmd_netjail_stop_testbed.c =>
testing/testing_api_cmd_netjail_stop_testsystem.c} (72%)
copy src/{testbed/testbed_helper.h => testing/testing_cmds.h} (53%)
rename src/transport/{plugin_cmd_simple_send.c =>
test_transport_plugin_cmd_simple_send.c} (81%)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index edd56bf95..6675d0d25 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -10,13 +10,21 @@ src/arm/arm_monitor_api.c
src/arm/gnunet-arm.c
src/arm/gnunet-service-arm.c
src/arm/mockup-service.c
+src/ats-tests/ats-testing-experiment.c
+src/ats-tests/ats-testing-log.c
+src/ats-tests/ats-testing-preferences.c
+src/ats-tests/ats-testing-traffic.c
+src/ats-tests/ats-testing.c
+src/ats-tests/gnunet-ats-sim.c
+src/ats-tests/gnunet-solver-eval.c
+src/ats-tool/gnunet-ats.c
src/ats/ats_api_connectivity.c
src/ats/ats_api_performance.c
src/ats/ats_api_scanner.c
src/ats/ats_api_scheduling.c
src/ats/gnunet-ats-solver-eval.c
-src/ats/gnunet-service-ats_addresses.c
src/ats/gnunet-service-ats.c
+src/ats/gnunet-service-ats_addresses.c
src/ats/gnunet-service-ats_connectivity.c
src/ats/gnunet-service-ats_normalization.c
src/ats/gnunet-service-ats_performance.c
@@ -25,14 +33,6 @@ src/ats/gnunet-service-ats_preferences.c
src/ats/gnunet-service-ats_reservations.c
src/ats/gnunet-service-ats_scheduling.c
src/ats/plugin_ats_proportional.c
-src/ats-tests/ats-testing.c
-src/ats-tests/ats-testing-experiment.c
-src/ats-tests/ats-testing-log.c
-src/ats-tests/ats-testing-preferences.c
-src/ats-tests/ats-testing-traffic.c
-src/ats-tests/gnunet-ats-sim.c
-src/ats-tests/gnunet-solver-eval.c
-src/ats-tool/gnunet-ats.c
src/auction/gnunet-auction-create.c
src/auction/gnunet-auction-info.c
src/auction/gnunet-auction-join.c
@@ -50,8 +50,8 @@ src/cadet/cadet_api_list_peers.c
src/cadet/cadet_api_list_tunnels.c
src/cadet/cadet_test_lib.c
src/cadet/desirability_table.c
-src/cadet/gnunet-cadet.c
src/cadet/gnunet-cadet-profiler.c
+src/cadet/gnunet-cadet.c
src/cadet/gnunet-service-cadet.c
src/cadet/gnunet-service-cadet_channel.c
src/cadet/gnunet-service-cadet_connection.c
@@ -67,15 +67,15 @@ src/consensus/gnunet-service-consensus.c
src/consensus/plugin_block_consensus.c
src/conversation/conversation_api.c
src/conversation/conversation_api_call.c
-src/conversation/gnunet-conversation.c
src/conversation/gnunet-conversation-test.c
-src/conversation/gnunet_gst.c
-src/conversation/gnunet_gst_test.c
-src/conversation/gnunet-helper-audio-playback.c
+src/conversation/gnunet-conversation.c
src/conversation/gnunet-helper-audio-playback-gst.c
-src/conversation/gnunet-helper-audio-record.c
+src/conversation/gnunet-helper-audio-playback.c
src/conversation/gnunet-helper-audio-record-gst.c
+src/conversation/gnunet-helper-audio-record.c
src/conversation/gnunet-service-conversation.c
+src/conversation/gnunet_gst.c
+src/conversation/gnunet_gst_test.c
src/conversation/microphone.c
src/conversation/plugin_gnsrecord_conversation.c
src/conversation/speaker.c
@@ -105,7 +105,6 @@ src/dht/dht_api.c
src/dht/dht_test_lib.c
src/dht/gnunet-dht-get.c
src/dht/gnunet-dht-monitor.c
-src/dht/gnunet_dht_profiler.c
src/dht/gnunet-dht-put.c
src/dht/gnunet-service-dht.c
src/dht/gnunet-service-dht_clients.c
@@ -114,6 +113,7 @@ src/dht/gnunet-service-dht_hello.c
src/dht/gnunet-service-dht_neighbours.c
src/dht/gnunet-service-dht_nse.c
src/dht/gnunet-service-dht_routing.c
+src/dht/gnunet_dht_profiler.c
src/dht/plugin_block_dht.c
src/dhtu/plugin_dhtu_gnunet.c
src/dhtu/plugin_dhtu_ip.c
@@ -150,8 +150,8 @@ src/fs/gnunet-auto-share.c
src/fs/gnunet-daemon-fsprofiler.c
src/fs/gnunet-directory.c
src/fs/gnunet-download.c
-src/fs/gnunet-fs.c
src/fs/gnunet-fs-profiler.c
+src/fs/gnunet-fs.c
src/fs/gnunet-helper-fs-publish.c
src/fs/gnunet-publish.c
src/fs/gnunet-search.c
@@ -171,9 +171,9 @@ src/gns/gns_tld_api.c
src/gns/gnunet-bcd.c
src/gns/gnunet-dns2gns.c
src/gns/gnunet-gns-benchmark.c
-src/gns/gnunet-gns.c
src/gns/gnunet-gns-import.c
src/gns/gnunet-gns-proxy.c
+src/gns/gnunet-gns.c
src/gns/gnunet-service-gns.c
src/gns/gnunet-service-gns_interceptor.c
src/gns/gnunet-service-gns_resolver.c
@@ -191,8 +191,8 @@ src/gnsrecord/json_gnsrecord.c
src/gnsrecord/plugin_gnsrecord_dns.c
src/hello/address.c
src/hello/gnunet-hello.c
-src/hello/hello.c
src/hello/hello-ng.c
+src/hello/hello.c
src/hostlist/gnunet-daemon-hostlist.c
src/hostlist/gnunet-daemon-hostlist_client.c
src/hostlist/gnunet-daemon-hostlist_server.c
@@ -208,8 +208,8 @@ src/json/json_helper.c
src/json/json_mhd.c
src/json/json_pack.c
src/messenger/gnunet-messenger.c
-src/messenger/gnunet-service-messenger_basement.c
src/messenger/gnunet-service-messenger.c
+src/messenger/gnunet-service-messenger_basement.c
src/messenger/gnunet-service-messenger_ego_store.c
src/messenger/gnunet-service-messenger_handle.c
src/messenger/gnunet-service-messenger_list_handles.c
@@ -248,8 +248,8 @@ src/namecache/namecache_api.c
src/namecache/plugin_namecache_flat.c
src/namecache/plugin_namecache_postgres.c
src/namecache/plugin_namecache_sqlite.c
-src/namestore/gnunet-namestore.c
src/namestore/gnunet-namestore-fcfsd.c
+src/namestore/gnunet-namestore.c
src/namestore/gnunet-service-namestore.c
src/namestore/gnunet-zoneimport.c
src/namestore/namestore_api.c
@@ -275,17 +275,17 @@ src/nat/gnunet-service-nat_mini.c
src/nat/gnunet-service-nat_stun.c
src/nat/nat_api.c
src/nat/nat_api_stun.c
-src/nse/gnunet-nse.c
src/nse/gnunet-nse-profiler.c
+src/nse/gnunet-nse.c
src/nse/gnunet-service-nse.c
src/nse/nse_api.c
src/nt/nt.c
-src/peerinfo/gnunet-service-peerinfo.c
-src/peerinfo/peerinfo_api.c
-src/peerinfo/peerinfo_api_notify.c
src/peerinfo-tool/gnunet-peerinfo.c
src/peerinfo-tool/gnunet-peerinfo_plugins.c
src/peerinfo-tool/plugin_rest_peerinfo.c
+src/peerinfo/gnunet-service-peerinfo.c
+src/peerinfo/peerinfo_api.c
+src/peerinfo/peerinfo_api_notify.c
src/peerstore/gnunet-peerstore.c
src/peerstore/gnunet-service-peerstore.c
src/peerstore/peerstore_api.c
@@ -335,27 +335,27 @@ src/rest/gnunet-rest-server.c
src/rest/plugin_rest_config.c
src/rest/plugin_rest_copying.c
src/rest/rest.c
-src/revocation/gnunet-revocation.c
src/revocation/gnunet-revocation-tvg.c
+src/revocation/gnunet-revocation.c
src/revocation/gnunet-service-revocation.c
src/revocation/plugin_block_revocation.c
src/revocation/revocation_api.c
-src/rps/gnunet-rps.c
src/rps/gnunet-rps-profiler.c
+src/rps/gnunet-rps.c
src/rps/gnunet-service-rps.c
src/rps/gnunet-service-rps_custommap.c
src/rps/gnunet-service-rps_sampler.c
src/rps/gnunet-service-rps_sampler_elem.c
src/rps/gnunet-service-rps_view.c
-src/rps/rps_api.c
src/rps/rps-sampler_client.c
src/rps/rps-sampler_common.c
src/rps/rps-test_util.c
+src/rps/rps_api.c
src/scalarproduct/gnunet-scalarproduct.c
-src/scalarproduct/gnunet-service-scalarproduct_alice.c
-src/scalarproduct/gnunet-service-scalarproduct_bob.c
src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
+src/scalarproduct/gnunet-service-scalarproduct_alice.c
+src/scalarproduct/gnunet-service-scalarproduct_bob.c
src/scalarproduct/scalarproduct_api.c
src/secretsharing/gnunet-secretsharing-profiler.c
src/secretsharing/gnunet-service-secretsharing.c
@@ -369,12 +369,12 @@ src/set/gnunet-set-ibf-profiler.c
src/set/gnunet-set-profiler.c
src/set/ibf.c
src/set/ibf_sim.c
+src/set/plugin_block_set_test.c
+src/set/set_api.c
src/seti/gnunet-service-seti.c
src/seti/gnunet-seti-profiler.c
src/seti/plugin_block_seti_test.c
src/seti/seti_api.c
-src/set/plugin_block_set_test.c
-src/set/set_api.c
src/setu/gnunet-service-setu.c
src/setu/gnunet-service-setu_strata_estimator.c
src/setu/gnunet-setu-ibf-profiler.c
@@ -393,17 +393,16 @@ src/statistics/gnunet-statistics.c
src/statistics/statistics_api.c
src/template/gnunet-service-template.c
src/template/gnunet-template.c
+src/testbed-logger/gnunet-service-testbed-logger.c
+src/testbed-logger/testbed_logger_api.c
src/testbed/generate-underlay-topology.c
-src/testbed/gnunet-cmd.c
-src/testbed/gnunet-cmds-helper.c
src/testbed/gnunet-daemon-latency-logger.c
src/testbed/gnunet-daemon-testbed-blacklist.c
src/testbed/gnunet-daemon-testbed-underlay.c
src/testbed/gnunet-helper-testbed.c
-src/testbed/gnunet_mpi_test.c
src/testbed/gnunet-service-test-barriers.c
-src/testbed/gnunet-service-testbed_barriers.c
src/testbed/gnunet-service-testbed.c
+src/testbed/gnunet-service-testbed_barriers.c
src/testbed/gnunet-service-testbed_cache.c
src/testbed/gnunet-service-testbed_connectionpool.c
src/testbed/gnunet-service-testbed_cpustatus.c
@@ -411,82 +410,86 @@ src/testbed/gnunet-service-testbed_links.c
src/testbed/gnunet-service-testbed_meminfo.c
src/testbed/gnunet-service-testbed_oc.c
src/testbed/gnunet-service-testbed_peers.c
-src/testbed/gnunet_testbed_mpi_spawn.c
src/testbed/gnunet-testbed-profiler.c
-src/testbed-logger/gnunet-service-testbed-logger.c
-src/testbed-logger/testbed_logger_api.c
-src/testbed/plugin_testcmd.c
-src/testbed/testbed_api_barriers.c
+src/testbed/gnunet_mpi_test.c
+src/testbed/gnunet_testbed_mpi_spawn.c
src/testbed/testbed_api.c
-src/testbed/testbed_api_cmd_block_until_all_peers_started.c
-src/testbed/testbed_api_cmd_controller.c
-src/testbed/testbed_api_cmd_local_test_finished.c
-src/testbed/testbed_api_cmd_netjail_start.c
+src/testbed/testbed_api_barriers.c
src/testbed/testbed_api_cmd_netjail_start_testbed.c
-src/testbed/testbed_api_cmd_netjail_stop.c
-src/testbed/testbed_api_cmd_netjail_stop_testbed.c
-src/testbed/testbed_api_cmd_peer.c
-src/testbed/testbed_api_cmd_peer_store.c
-src/testbed/testbed_api_cmd_send_peer_ready.c
-src/testbed/testbed_api_cmd_tng_connect.c
-src/testbed/testbed_api_cmd_tng_service.c
src/testbed/testbed_api_hosts.c
src/testbed/testbed_api_operations.c
src/testbed/testbed_api_peers.c
src/testbed/testbed_api_sd.c
src/testbed/testbed_api_services.c
src/testbed/testbed_api_statistics.c
-src/testbed/testbed_api_testbed.c
src/testbed/testbed_api_test.c
+src/testbed/testbed_api_testbed.c
src/testbed/testbed_api_topology.c
src/testbed/testbed_api_underlay.c
+src/testing/gnunet-cmds-helper.c
src/testing/gnunet-testing.c
src/testing/list-keys.c
+src/testing/testing.c
src/testing/testing_api_cmd_batch.c
-src/testing/testing_api_cmd_hello_world_birth.c
+src/testing/testing_api_cmd_block_until_all_peers_started.c
src/testing/testing_api_cmd_hello_world.c
+src/testing/testing_api_cmd_hello_world_birth.c
+src/testing/testing_api_cmd_local_test_finished.c
+src/testing/testing_api_cmd_netjail_start.c
+src/testing/testing_api_cmd_netjail_start_testbed.c
+src/testing/testing_api_cmd_netjail_stop.c
+src/testing/testing_api_cmd_netjail_stop_testbed.c
src/testing/testing_api_cmd_send_peer_ready.c
src/testing/testing_api_cmd_system_create.c
src/testing/testing_api_loop.c
src/testing/testing_api_trait_cmd.c
src/testing/testing_api_trait_process.c
src/testing/testing_api_traits.c
-src/testing/testing.c
src/topology/friends.c
src/topology/gnunet-daemon-topology.c
src/transport/gnunet-communicator-tcp.c
src/transport/gnunet-communicator-udp.c
src/transport/gnunet-communicator-unix.c
src/transport/gnunet-helper-transport-bluetooth.c
-src/transport/gnunet-helper-transport-wlan.c
src/transport/gnunet-helper-transport-wlan-dummy.c
+src/transport/gnunet-helper-transport-wlan.c
src/transport/gnunet-service-tng.c
-src/transport/gnunet-service-transport_ats.c
src/transport/gnunet-service-transport.c
+src/transport/gnunet-service-transport_ats.c
src/transport/gnunet-service-transport_hello.c
src/transport/gnunet-service-transport_manipulation.c
src/transport/gnunet-service-transport_neighbours.c
src/transport/gnunet-service-transport_plugins.c
src/transport/gnunet-service-transport_validation.c
-src/transport/gnunet-transport.c
src/transport/gnunet-transport-profiler.c
src/transport/gnunet-transport-wlan-receiver.c
src/transport/gnunet-transport-wlan-sender.c
-src/transport/plugin_cmd_simple_send.c
+src/transport/gnunet-transport.c
src/transport/plugin_transport_http_client.c
src/transport/plugin_transport_http_common.c
src/transport/plugin_transport_http_server.c
src/transport/plugin_transport_smtp.c
src/transport/plugin_transport_tcp.c
src/transport/plugin_transport_template.c
-src/transport/plugin_transport_udp_broadcasting.c
src/transport/plugin_transport_udp.c
+src/transport/plugin_transport_udp_broadcasting.c
src/transport/plugin_transport_unix.c
src/transport/plugin_transport_wlan.c
src/transport/tcp_connection_legacy.c
src/transport/tcp_server_legacy.c
src/transport/tcp_server_mst_legacy.c
src/transport/tcp_service_legacy.c
+src/transport/transport-testing-communicator.c
+src/transport/transport-testing-filenames.c
+src/transport/transport-testing-filenames2.c
+src/transport/transport-testing-loggers.c
+src/transport/transport-testing-loggers2.c
+src/transport/transport-testing-main.c
+src/transport/transport-testing-main2.c
+src/transport/transport-testing-send.c
+src/transport/transport-testing-send2.c
+src/transport/transport-testing.c
+src/transport/transport-testing2.c
src/transport/transport_api2_application.c
src/transport/transport_api2_communication.c
src/transport/transport_api2_core.c
@@ -502,17 +505,6 @@ src/transport/transport_api_manipulation.c
src/transport/transport_api_monitor_peers.c
src/transport/transport_api_monitor_plugins.c
src/transport/transport_api_offer_hello.c
-src/transport/transport-testing2.c
-src/transport/transport-testing.c
-src/transport/transport-testing-communicator.c
-src/transport/transport-testing-filenames2.c
-src/transport/transport-testing-filenames.c
-src/transport/transport-testing-loggers2.c
-src/transport/transport-testing-loggers.c
-src/transport/transport-testing-main2.c
-src/transport/transport-testing-main.c
-src/transport/transport-testing-send2.c
-src/transport/transport-testing-send.c
src/util/bandwidth.c
src/util/benchmark.c
src/util/bio.c
@@ -527,8 +519,8 @@ src/util/consttime_memcmp.c
src/util/container_bloomfilter.c
src/util/container_heap.c
src/util/container_meta_data.c
-src/util/container_multihashmap32.c
src/util/container_multihashmap.c
+src/util/container_multihashmap32.c
src/util/container_multipeermap.c
src/util/container_multishortmap.c
src/util/container_multiuuidmap.c
@@ -554,8 +546,8 @@ src/util/dnsstub.c
src/util/getopt.c
src/util/getopt_helpers.c
src/util/gnunet-base32.c
-src/util/gnunet-config.c
src/util/gnunet-config-diff.c
+src/util/gnunet-config.c
src/util/gnunet-crypto-tvg.c
src/util/gnunet-ecc.c
src/util/gnunet-qr.c
@@ -593,8 +585,8 @@ src/vpn/gnunet-helper-vpn.c
src/vpn/gnunet-service-vpn.c
src/vpn/gnunet-vpn.c
src/vpn/vpn_api.c
-src/zonemaster/gnunet-service-zonemaster.c
src/zonemaster/gnunet-service-zonemaster-monitor.c
+src/zonemaster/gnunet-service-zonemaster.c
src/fs/fs_api.h
src/include/gnunet_json_lib.h
src/testbed/testbed_api.h
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 16ff25350..9c22b5977 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -115,7 +115,6 @@ gnunetinclude_HEADERS = \
gnunet_strings_lib.h \
gnunet_testbed_service.h \
gnunet_testbed_logger_service.h \
- gnunet_testbed_ng_service.h \
gnunet_testing_lib.h \
gnunet_testing_plugin.h \
gnunet_testing_ng_lib.h \
diff --git a/src/include/gnunet_testbed_ng_service.h
b/src/include/gnunet_testbed_ng_service.h
deleted file mode 100644
index 2ff5228cf..000000000
--- a/src/include/gnunet_testbed_ng_service.h
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- This file is part of GNUnet
- Copyright (C) 2021 GNUnet e.V.
-
- GNUnet is free software: you can redistribute it and/or modify it
- under the terms of the GNU Affero General Public License as published
- by the Free Software Foundation, either version 3 of the License,
- or (at your option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
- SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @author t3sserakt
- *
- * @file
- * API for writing tests and creating large-scale emulation testbeds for
GNUnet with command pattern.
- *
- * @defgroup testbed Testbed service
- * Writing tests and creating large-scale emulation testbeds for GNUnet with
command pattern.
- *
- * @see
[Documentation](https://docs.gnunet.org/handbook/gnunet.html#TESTBED-NG-Subsystem)
- *
- * @{
- */
-
-#ifndef GNUNET_TESTBED_NG_SERVICE_H
-#define GNUNET_TESTBED_NG_SERVICE_H
-
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_ng_lib.h"
-
-struct TngState;
-
-struct PeerCmdState
-{
- /**
- * The label of a controller command.
- */
- const char *controller_label;
-
- /**
- * Handle to operation
- */
- struct GNUNET_TESTBED_Operation *operation;
-
- /**
- * Name of the host, use "NULL" for localhost.
- */
- const char *hostname;
-
- /**
- * Username to use for the login; may be NULL.
- */
- const char *username;
-
- /**
- * Port number to use for ssh; use 0 to let ssh decide.
- */
- uint16_t port;
-
- /**
- * The configuration to use as a template while starting a controller
- * on this host. Operation queue sizes specific to a host are also
- * read from this configuration handle.
- */
- struct GNUNET_CONFIGURATION_Handle *cfg;
-
- /**
- * The host to run peers and controllers on
- */
- struct GNUNET_TESTBED_Host *host;
-
- /**
- * Abort task identifier
- */
- struct GNUNET_SCHEDULER_Task *abort_task;
-
- /**
- * Flag indicating if peer is ready.
- */
- int peer_ready;
-
- /**
- * Flag indicating controller is going down.
- */
- int peer_going_down;
-
- /**
- * Interpreter state.
- */
- struct GNUNET_TESTING_Interpreter *is;
-
- /**
- * Peer to start
- */
- struct GNUNET_TESTBED_Peer *peer;
-};
-
-struct ControllerState
-{
- /**
- * The ip address of the controller which will be set as TRUSTED
- * HOST(all connections form this ip are permitted by the testbed) when
- * starting testbed controller at host. This can either be a single ip
- * address or a network address in CIDR notation.
- */
- const char *trusted_ip;
-
- /**
- * Name of the host, use "NULL" for localhost.
- */
- const char *hostname;
-
- /**
- * Username to use for the login; may be NULL.
- */
- const char *username;
-
- /**
- * Port number to use for ssh; use 0 to let ssh decide.
- */
- uint16_t port;
-
- /**
- * The configuration to use as a template while starting a controller
- * on this host. Operation queue sizes specific to a host are also
- * read from this configuration handle.
- */
- struct GNUNET_CONFIGURATION_Handle *cfg;
-
- /**
- * The host to run peers and controllers on
- */
- struct GNUNET_TESTBED_Host *host;
-
- /**
- * The controller process
- */
- struct GNUNET_TESTBED_ControllerProc *cp;
-
- /**
- * The controller handle
- */
- struct GNUNET_TESTBED_Controller *controller;
-
- /**
- * A bit mask with set of events to call the controller for.
- */
- uint64_t event_mask;
-
- /**
- * Abort task identifier
- */
- struct GNUNET_SCHEDULER_Task *abort_task;
-
- /**
- * Handle for host registration
- */
- struct GNUNET_TESTBED_HostRegistrationHandle *reg_handle;
-
- /**
- * Flag indicating if host create with controller is ready.
- */
- int host_ready;
-
- /**
- * Flag indicating controller is going down.
- */
- int controller_going_down;
-
- /**
- * Interpreter state.
- */
- struct GNUNET_TESTING_Interpreter *is;
-};
-
-/**
- * Offer data from trait
- *
- * @param cmd command to extract the controller from.
- * @param pt pointer to controller.
- * @return #GNUNET_OK on success.
- */
-int
-GNUNET_TESTBED_get_trait_controller (const struct GNUNET_TESTING_Command *cmd,
- struct GNUNET_TESTBED_Controller **
- controller);
-
-struct GNUNET_TESTING_Command
-GNUNET_TESTBED_cmd_controller (const char *label,
- const char *host,
- uint64_t event_mask);
-
-void
-GNUNET_TESTBED_shutdown_controller (struct ControllerState *cs);
-
-void
-GNUNET_TESTBED_shutdown_peer (struct PeerCmdState *ps);
-
-void
-GNUNET_TESTBED_shutdown_service (struct TngState *ss);
-
-/**
- * Create command.
- *
- * @param label name for command.
- * @param binaryname to start.
- * @return command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TESTBED_cmd_netjail_start (const char *label,
- char *local_m,
- char *global_n);
-
-
-/**
- * Create command.
- *
- * @param label name for command.
- * @param binaryname to exec.
- * @return command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TESTBED_cmd_netjail_start_testbed (const char *label,
- char *local_m,
- char *global_n,
- char *plugin_name,
- unsigned int *rv);
-
-
-/**
- * Create command.
- *
- * @param label name for command.
- * @param binaryname to stop.
- * @return command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TESTBED_cmd_netjail_stop (const char *label,
- char *local_m,
- char *global_n);
-
-
-struct GNUNET_TESTING_Command
-GNUNET_TESTBED_cmd_stop_testbed (const char *label,
- const char *helper_start_label,
- char *local_m,
- char *global_n);
-
-
-int
-GNUNET_TESTBED_get_trait_helper_handles (const struct
- GNUNET_TESTING_Command *cmd,
- struct GNUNET_HELPER_Handle
***helper);
-
-
-int
-GNUNET_TESTBED_get_trait_hosts (const struct
- GNUNET_TESTING_Command *cmd,
- struct GNUNET_TESTBED_Host ***hosts);
-
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_block_until_all_peers_started (const char *label,
- unsigned int *
- all_peers_started);
-
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_send_peer_ready (const char *label,
- TESTBED_CMD_HELPER_write_cb write_message);
-
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_local_test_finished (const char *label,
- TESTBED_CMD_HELPER_write_cb
- write_message);
-
-#endif
diff --git a/src/include/gnunet_testing_ng_lib.h
b/src/include/gnunet_testing_ng_lib.h
index aad7ddec2..035d1bcad 100644
--- a/src/include/gnunet_testing_ng_lib.h
+++ b/src/include/gnunet_testing_ng_lib.h
@@ -842,4 +842,72 @@ struct GNUNET_TESTING_Command
GNUNET_TESTING_cmd_system_create (const char *label,
const char *testdir);
+
+/**
+ * Create command.
+ *
+ * @param label name for command.
+ * @param binaryname to start.
+ * @return command.
+ */
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_netjail_start (const char *label,
+ char *local_m,
+ char *global_n);
+
+
+/**
+ * Create command.
+ *
+ * @param label name for command.
+ * @param binaryname to exec.
+ * @return command.
+ */
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_netjail_start_testing_system (const char *label,
+ char *local_m,
+ char *global_n,
+ char *plugin_name,
+ unsigned int *rv);
+
+
+/**
+ * Create command.
+ *
+ * @param label name for command.
+ * @param binaryname to stop.
+ * @return command.
+ */
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_netjail_stop (const char *label,
+ char *local_m,
+ char *global_n);
+
+
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_stop_testing_system (const char *label,
+ const char *helper_start_label,
+ char *local_m,
+ char *global_n);
+
+
+int
+GNUNET_TESTING_get_trait_helper_handles (const struct
+ GNUNET_TESTING_Command *cmd,
+ struct GNUNET_HELPER_Handle
***helper);
+
+
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_block_until_all_peers_started (const char *label,
+ unsigned int *
+ all_peers_started);
+
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_send_peer_ready (const char *label,
+ TESTING_CMD_HELPER_write_cb write_message);
+
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_local_test_finished (const char *label,
+ TESTING_CMD_HELPER_write_cb
+ write_message);
#endif
diff --git a/src/include/gnunet_testing_plugin.h
b/src/include/gnunet_testing_plugin.h
index 103eb23be..151827d4b 100644
--- a/src/include/gnunet_testing_plugin.h
+++ b/src/include/gnunet_testing_plugin.h
@@ -37,11 +37,11 @@ extern "C"
#endif
typedef void
-(*TESTBED_CMD_HELPER_write_cb) (struct GNUNET_MessageHeader *message, size_t
+(*TESTING_CMD_HELPER_write_cb) (struct GNUNET_MessageHeader *message, size_t
msg_length);
typedef void
-(*GNUNET_TESTING_PLUGIN_StartTestCase) (TESTBED_CMD_HELPER_write_cb
+(*GNUNET_TESTING_PLUGIN_StartTestCase) (TESTING_CMD_HELPER_write_cb
write_message, char *router_ip,
char *node_ip,
char *n,
diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index b4b2cff97..d1f43f0f6 100644
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -23,8 +23,6 @@ if HAVE_SQLITE
endif
libexec_PROGRAMS = \
- gnunet-cmd \
- gnunet-cmds-helper \
gnunet-service-testbed \
gnunet-helper-testbed \
gnunet-daemon-testbed-blacklist \
@@ -37,21 +35,6 @@ bin_PROGRAMS = \
noinst_PROGRAMS = \
$(generate_underlay)
-plugin_LTLIBRARIES = \
- libgnunet_plugin_testcmd.la
-
-libgnunet_plugin_testcmd_la_SOURCES = \
- plugin_testcmd.c
-libgnunet_plugin_testcmd_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/arm/libgnunetarm.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
- libgnunettestbed.la \
- $(LTLIBINTL)
-libgnunet_plugin_testcmd_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
gnunet_service_testbed_SOURCES = \
gnunet-service-testbed.c gnunet-service-testbed.h \
gnunet-service-testbed_links.c gnunet-service-testbed_links.h \
@@ -90,23 +73,6 @@ gnunet_helper_testbed_LDADD = $(XLIB) \
libgnunettestbed.la \
$(LTLIBINTL) $(Z_LIBS)
-gnunet_cmd_SOURCES = \
- gnunet-cmd.c
-gnunet_cmd_LDADD = $(XLIB) \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- libgnunettestbed.la \
- $(LTLIBINTL) $(Z_LIBS)
-
-gnunet_cmds_helper_SOURCES = \
- gnunet-cmds-helper.c
-gnunet_cmds_helper_LDADD = $(XLIB) \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/transport/libgnunettransporttesting2.la \
- libgnunettestbed.la \
- $(LTLIBINTL) $(Z_LIBS)
-
gnunet_daemon_testbed_blacklist_SOURCES = gnunet-daemon-testbed-blacklist.c
gnunet_daemon_testbed_blacklist_LDADD = $(XLIB) \
$(top_builddir)/src/transport/libgnunettransport.la \
@@ -129,17 +95,8 @@ lib_LTLIBRARIES = \
libgnunettestbed.la
libgnunettestbed_la_SOURCES = \
- testbed_api_cmd_local_test_finished.c \
- testbed_api_cmd_send_peer_ready.c \
- testbed_api_cmd_block_until_all_peers_started.c \
- testbed_api_cmd_netjail_start.c \
- testbed_api_cmd_netjail_start_testbed.c \
- testbed_api_cmd_netjail_stop_testbed.c \
- testbed_api_cmd_netjail_stop.c \
testbed_api.c testbed_api.h testbed.h \
testbed_api_hosts.c testbed_api_hosts.h testbed_helper.h \
- testbed_api_cmd_controller.c \
- testbed_api_cmd_peer.c \
testbed_api_operations.c testbed_api_operations.h \
testbed_api_peers.c testbed_api_peers.h \
testbed_api_services.c \
@@ -176,7 +133,6 @@ generate_underlay_topology_LDADD = $(XLIB) \
$(LTLIBINTL) -lsqlite3
check_PROGRAMS = \
- test_testbed_api_cmd_netjail \
test_testbed_api_hosts \
test_gnunet_helper_testbed \
test_testbed_api_controllerlink \
@@ -211,7 +167,6 @@ check_PROGRAMS = \
if ENABLE_TEST_RUN
AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset
XDG_CONFIG_HOME;
TESTS = \
- test_testbed_api_cmd_netjail \
test_testbed_api \
test_testbed_api_sd \
test_testbed_api_operations \
@@ -242,13 +197,6 @@ if ENABLE_TEST_RUN
$(underlay_testcases)
endif
-test_testbed_api_cmd_netjail_SOURCES = \
- test_testbed_api_cmd_netjail.c
-test_testbed_api_cmd_netjail_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettestbed.la
-
test_testbed_api_SOURCES = \
test_testbed_api.c
test_testbed_api_LDADD = \
diff --git a/src/testbed/gnunet-cmd.c b/src/testbed/gnunet-cmd.c
deleted file mode 100644
index 0ba94fdd9..000000000
--- a/src/testbed/gnunet-cmd.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- This file is part of GNUnet
- Copyright (C) 2008--2013, 2016 GNUnet e.V.
-
- GNUnet is free software: you can redistribute it and/or modify it
- under the terms of the GNU Affero General Public License as published
- by the Free Software Foundation, either version 3 of the License,
- or (at your option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
- SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testbed/gnunet-cmd.c
- *
- * @brief Binary to start testcase plugins
- *
- * @author t3sserakt
- */
-
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib.h"
-#include "gnunet_testing_plugin.h"
-
-/**
- * Generic logging shortcut
- */
-#define LOG(kind, ...) GNUNET_log (kind, __VA_ARGS__)
-
-#define NODE_BASE_IP "192.168.15."
-
-#define ROUTER_BASE_IP "92.68.150."
-
-/**
- * Handle for a plugin.
- */
-struct Plugin
-{
- /**
- * Name of the shared library.
- */
- char *library_name;
-
- /**
- * Plugin API.
- */
- struct GNUNET_TESTING_PluginFunctions *api;
-
- char *node_ip;
-
- char *plugin_name;
-
- char *global_n;
-
- char *local_m;
-
- char *n;
-
- char *m;
-};
-
-
-/**
- * Main function to run the test cases.
- *
- * @param cls plugin to use.
- *
- */
-static void
-run (void *cls)
-{
- struct Plugin *plugin = cls;
- char *router_ip;
- char *node_ip;
-
- router_ip = GNUNET_malloc (strlen (ROUTER_BASE_IP) + strlen (plugin->m) + 1);
- strcpy (router_ip, ROUTER_BASE_IP);
- strcat (router_ip, plugin->m);
-
- node_ip = GNUNET_malloc (strlen (NODE_BASE_IP) + strlen (plugin->n) + 1);
- strcat (node_ip, NODE_BASE_IP);
- strcat (node_ip, plugin->n);
-
- plugin->api->start_testcase (NULL, router_ip, node_ip, NULL, NULL, NULL);
-
-}
-
-
-int
-main (int argc, char *const *argv)
-{
- int rv = 0;
- struct Plugin *plugin;
-
- GNUNET_log_setup ("gnunet-cmd",
- "DEBUG",
- NULL);
-
- plugin = GNUNET_new (struct Plugin);
- plugin->api = GNUNET_PLUGIN_load (argv[0],
- NULL);
- plugin->library_name = GNUNET_strdup (argv[0]);
-
- plugin->global_n = argv[1];
- plugin->local_m = argv[2];
- plugin->n = argv[3];
- plugin->m = argv[4];
-
- GNUNET_SCHEDULER_run (&run,
- plugin);
-
- GNUNET_free (plugin);
- return rv;
-}
diff --git a/src/testbed/testbed_api.h b/src/testbed/testbed_api.h
index 9a54ca36c..d4ef832ad 100644
--- a/src/testbed/testbed_api.h
+++ b/src/testbed/testbed_api.h
@@ -37,11 +37,6 @@
*/
#define HELPER_TESTBED_BINARY "gnunet-helper-testbed"
-/**
- * Cmds Helper binary name
- */
-#define HELPER_CMDS_BINARY "gnunet-cmds-helper"
-
/**
* Enumeration of operations
@@ -185,6 +180,7 @@ struct OperationContext
typedef void
(*TESTBED_opcq_empty_cb) (void *cls);
+
/**
* Handle to interact with a GNUnet testbed controller. Each
* controller has at least one master handle which is created when the
diff --git a/src/testbed/testbed_api_cmd_controller.c
b/src/testbed/testbed_api_cmd_controller.c
deleted file mode 100644
index 794b1ccf3..000000000
--- a/src/testbed/testbed_api_cmd_controller.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- This file is part of GNUnet
- Copyright (C) 2021 GNUnet e.V.
-
- GNUnet is free software: you can redistribute it and/or modify it
- under the terms of the GNU Affero General Public License as published
- by the Free Software Foundation, either version 3 of the License,
- or (at your option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
- SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testbed/testbed_api_cmd_controller.c
- * @brief Command to create a controller.
- * @author t3sserakt
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet-service-testbed.h"
-#include "testbed_api_hosts.h"
-#include "gnunet_testbed_ng_service.h"
-
-
-/**
- * Generic logging shortcut
- */
-#define LOG(kind, ...) \
- GNUNET_log (kind, __VA_ARGS__)
-
-
-/**
-*
-*
-* @param cls closure
-* @param cmd current CMD being cleaned up.
-*/
-static void
-controller_cleanup (void *cls,
- const struct GNUNET_TESTING_Command *cmd)
-{
- (void) cls;
-}
-
-
-/**
- * Signature of the event handler function called by the
- * respective event controller.
- *
- * @param cls closure
- * @param event information about the event
- */
-static void
-controller_cb (void *cls,
- const struct GNUNET_TESTBED_EventInformation *event)
-{
- struct ControllerState *cs = cls;
-
- if (NULL != event->details.operation_finished.emsg)
- {
- LOG (GNUNET_ERROR_TYPE_ERROR, "There was an operation error: %s\n",
- event->details.operation_finished.emsg);
- GNUNET_TESTBED_shutdown_controller (cs);
- }
- else if (NULL == event->details.operation_finished.generic)
- {
- GNUNET_TESTBED_operation_done (event->op);
- }
-}
-
-
-static void
-controller_run (void *cls,
- const struct GNUNET_TESTING_Command *cmd,
- struct GNUNET_TESTING_Interpreter *is)
-{
- struct ControllerState *cs = cls;
-
- cs->is = is;
-
- cs->controller =
- GNUNET_TESTBED_controller_connect (cs->host, cs->event_mask,
&controller_cb,
- cs);
-
-
-}
-
-/**
-*
-*
-* @param cls closure.
-* @param[out] ret result
-* @param trait name of the trait.
-* @param index index number of the object to offer.
-* @return #GNUNET_OK on success.
-*/
-static int
-controller_traits (void *cls,
- const void **ret,
- const char *trait,
- unsigned int index)
-{
- (void) cls;
-
- struct ControllerState *cs = cls;
-
-
- struct GNUNET_TESTING_Trait traits[] = {
- {
- .index = 0,
- .trait_name = "controller",
- .ptr = (const void *) cs->controller,
- },
- GNUNET_TESTING_trait_end ()
- };
-
- return GNUNET_TESTING_get_trait (traits,
- ret,
- trait,
- index);
- return GNUNET_OK;
-}
-
-
-/**
- * Offer data from trait
- *
- * @param cmd command to extract the controller from.
- * @param pt pointer to controller.
- * @return #GNUNET_OK on success.
- */
-int
-GNUNET_TESTBED_get_trait_controller (const struct GNUNET_TESTING_Command *cmd,
- struct GNUNET_TESTBED_Controller **
- controller)
-{
- return cmd->traits (cmd->cls,
- (const void **) controller,
- "controller",
- (unsigned int) 0);
-}
-
-
-/**
- * Shutdown nicely
- *
- * @param cs controller state.
- */
-void
-GNUNET_TESTBED_shutdown_controller (struct ControllerState *cs)
-{
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Shutting down...\n");
-
- cs->controller_going_down = GNUNET_YES;
-
- if (NULL != cs->abort_task)
- GNUNET_SCHEDULER_cancel (cs->abort_task);
- if (NULL != cs->reg_handle)
- GNUNET_TESTBED_cancel_registration (cs->reg_handle);
- if (NULL != cs->controller)
- GNUNET_TESTBED_controller_disconnect (cs->controller);
- if (NULL != cs->cfg)
- GNUNET_CONFIGURATION_destroy (cs->cfg);
- if (NULL != cs->cp)
- GNUNET_TESTBED_controller_stop (cs->cp);
- if (NULL != cs->host)
- GNUNET_TESTBED_host_destroy (cs->host);
-}
-
-
-
-struct GNUNET_TESTING_Command
-GNUNET_TESTBED_cmd_controller (const char *label,
- const char *host,
- uint64_t event_mask)
-{
- struct ControllerState *cs;
-
- cs = GNUNET_new (struct ControllerState);
- cs->event_mask = event_mask;
- cs->hostname = host;
-
-
- struct GNUNET_TESTING_Command cmd = {
- .cls = cs,
- .label = label,
- .run = &controller_run,
- .cleanup = &controller_cleanup,
- .traits = &controller_traits
- };
-
- return cmd;
-}
diff --git a/src/testbed/testbed_api_cmd_netjail_start_testbed.c
b/src/testbed/testbed_api_cmd_netjail_start_testbed.c
index db9cf7508..3d1a1d893 100644
--- a/src/testbed/testbed_api_cmd_netjail_start_testbed.c
+++ b/src/testbed/testbed_api_cmd_netjail_start_testbed.c
@@ -30,7 +30,7 @@
#include "testbed_api_hosts.h"
#include "testbed_helper.h"
-#define NETJAIL_EXEC_SCRIPT "./../testbed/netjail_exec.sh"
+#define NETJAIL_EXEC_SCRIPT "./../testing/netjail_exec.sh"
struct HelperMessage;
@@ -87,23 +87,16 @@ struct NetJailState
unsigned int n_msg;
- unsigned int number_of_testbeds_started;
+ unsigned int number_of_testsystems_started;
unsigned int number_of_peers_started;
unsigned int number_of_local_test_finished;
- /**
- * The host where the controller is running
- */
- struct GNUNET_TESTBED_Host **host;
-
- unsigned int n_host;
-
char *plugin_name;
};
-struct TestbedCount
+struct TestingSystemCount
{
unsigned int count;
@@ -168,14 +161,14 @@ netjail_exec_traits (void *cls,
/**
- * Offer handles to testbed helper from trait
+ * Offer handles to testing cmd helper from trait
*
* @param cmd command to extract the message from.
* @param pt pointer to message.
* @return #GNUNET_OK on success.
*/
int
-GNUNET_TESTBED_get_trait_helper_handles (const struct
+GNUNET_TESTING_get_trait_helper_handles (const struct
GNUNET_TESTING_Command *cmd,
struct GNUNET_HELPER_Handle ***helper)
{
@@ -186,14 +179,14 @@ GNUNET_TESTBED_get_trait_helper_handles (const struct
}
/**
- * Offer handles to testbed helper from trait
+ * Offer messages received via testing cmd helper from trait
*
* @param cmd command to extract the message from.
* @param pt pointer to message.
* @return #GNUNET_OK on success.
*/
int
-GNUNET_TESTBED_get_trait_helper_messages (const struct
+GNUNET_TESTING_get_trait_helper_messages (const struct
GNUNET_TESTING_Command *cmd,
struct HelperMessage ***
hp_messages_head)
@@ -216,7 +209,7 @@ GNUNET_TESTBED_get_trait_helper_messages (const struct
static void
clear_msg (void *cls, int result)
{
- struct TestbedCount *tbc = cls;
+ struct TestingSystemCount *tbc = cls;
struct NetJailState *ns = tbc->ns;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -244,7 +237,7 @@ clear_msg (void *cls, int result)
static int
helper_mst (void *cls, const struct GNUNET_MessageHeader *message)
{
- struct TestbedCount *tbc = cls;
+ struct TestingSystemCount *tbc = cls;
struct NetJailState *ns = tbc->ns;
struct HelperMessage *hp_msg;
@@ -253,10 +246,9 @@ helper_mst (void *cls, const struct GNUNET_MessageHeader
*message)
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"helper_mst tbc->count: %d\n",
tbc->count);
- // GNUNET_TESTBED_extract_cfg (host, message);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received message from helper.\n");
- ns->number_of_testbeds_started++;
+ ns->number_of_testsystems_started++;
}
else if (GNUNET_MESSAGE_TYPE_CMDS_HELPER_PEER_STARTED == ntohs (
message->type))
@@ -320,57 +312,38 @@ create_helper_init_msg_ (char *m_char,
static void
-start_testbed (struct NetJailState *ns, struct
- GNUNET_CONFIGURATION_Handle *config,
- char *m_char,
- char *n_char)
+start_helper (struct NetJailState *ns, struct
+ GNUNET_CONFIGURATION_Handle *config,
+ char *m_char,
+ char *n_char)
{
// struct GNUNET_CONFIGURATION_Handle *cfg;
struct GNUNET_CMDS_HelperInit *msg;
- struct TestbedCount *tbc;
+ struct TestingSystemCount *tbc;
char *const script_argv[] = {NETJAIL_EXEC_SCRIPT,
m_char,
n_char,
-
GNUNET_OS_get_libexec_binary_path(HELPER_CMDS_BINARY),
+ GNUNET_OS_get_libexec_binary_path (
+ HELPER_CMDS_BINARY),
ns->global_n,
ns->local_m,
NULL};
unsigned int m = atoi (m_char);
unsigned int n = atoi (n_char);
- unsigned int helper_check = GNUNET_OS_check_helper_binary
(NETJAIL_EXEC_SCRIPT,
- GNUNET_YES,
- NULL);
+ unsigned int helper_check = GNUNET_OS_check_helper_binary (
+ NETJAIL_EXEC_SCRIPT,
+ GNUNET_YES,
+ NULL);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"m: %d n: %d\n",
m,
n);
- tbc = GNUNET_new (struct TestbedCount);
+ tbc = GNUNET_new (struct TestingSystemCount);
tbc->ns = ns;
tbc->count = (n - 1) * atoi (ns->local_m) + m;
- // cfg = GNUNET_CONFIGURATION_dup (config);
-
- // TODO We do not need this?
- /*GNUNET_array_append (ns->host, ns->n_host,
- GNUNET_TESTBED_host_create_with_id (tbc->count - 1,
- NULL,
- NULL,
- cfg,
- 0));*/
-
- /*if ((GNUNET_YES != GNUNET_DISK_file_test ("test_testbed_api.conf")) ||
- (GNUNET_SYSERR == GNUNET_CONFIGURATION_load (config,
- "test_testbed_api.conf")))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _ (
- "Unreadable or malformed configuration file `%s', exit
...\n"),
- "test_testbed_api.conf");
- }*/
-
-
if (GNUNET_NO == helper_check)
{
@@ -396,13 +369,13 @@ start_testbed (struct NetJailState *ns, struct
tbc));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "First using helper %d %d\n",
+ "First using helper %d %d\n",
tbc->count - 1,
ns->n_helper);
struct GNUNET_HELPER_Handle *helper = ns->helper[tbc->count - 1];
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "First using helper %d %d %p\n",
+ "First using helper %d %d %p\n",
tbc->count - 1,
ns->n_helper,
helper);
@@ -456,9 +429,9 @@ netjail_exec_run (void *cls,
{
sprintf (str_n, "%d", i);
sprintf (str_m, "%d", j);
- start_testbed (ns, config,
- str_m,
- str_n);
+ start_helper (ns, config,
+ str_m,
+ str_n);
}
}
}
@@ -475,7 +448,7 @@ netjail_start_finish (void *cls,
struct GNUNET_CMDS_ALL_PEERS_STARTED *reply;
size_t msg_length;
struct GNUNET_HELPER_Handle *helper;
- struct TestbedCount *tbc;
+ struct TestingSystemCount *tbc;
if (ns->number_of_local_test_finished == total_number)
{
@@ -483,11 +456,11 @@ netjail_start_finish (void *cls,
cont (cont_cls);
}
- if (ns->number_of_testbeds_started == total_number)
+ if (ns->number_of_testsystems_started == total_number)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"All helpers started!\n");
- ns->number_of_testbeds_started = 0;
+ ns->number_of_testsystems_started = 0;
}
if (ns->number_of_peers_started == total_number)
@@ -498,7 +471,7 @@ netjail_start_finish (void *cls,
for (int i = 1; i <= atoi (ns->global_n); i++) {
for (int j = 1; j <= atoi (ns->local_m); j++)
{
- tbc = GNUNET_new (struct TestbedCount);
+ tbc = GNUNET_new (struct TestingSystemCount);
tbc->ns = ns;
// TODO This needs to be more generic. As we send more messages back
and forth, we can not grow the arrays again and again, because this is to error
prone.
tbc->count = (i - 1) * atoi (ns->local_m) + j + total_number;
@@ -544,11 +517,11 @@ netjail_start_finish (void *cls,
* @return command.
*/
struct GNUNET_TESTING_Command
-GNUNET_TESTBED_cmd_netjail_start_testbed (const char *label,
- char *local_m,
- char *global_n,
- char *plugin_name,
- unsigned int *rv)
+GNUNET_TESTING_cmd_netjail_start_testing_system (const char *label,
+ char *local_m,
+ char *global_n,
+ char *plugin_name,
+ unsigned int *rv)
{
struct NetJailState *ns;
diff --git a/src/testbed/testbed_api_cmd_peer.c
b/src/testbed/testbed_api_cmd_peer.c
deleted file mode 100644
index 2e253e408..000000000
--- a/src/testbed/testbed_api_cmd_peer.c
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- This file is part of GNUnet
- Copyright (C) 2021 GNUnet e.V.
-
- GNUnet is free software: you can redistribute it and/or modify it
- under the terms of the GNU Affero General Public License as published
- by the Free Software Foundation, either version 3 of the License,
- or (at your option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
- SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-
-/**
- * @file testbed/testbed_api_cmd_peer.c
- * @brief Command to create a peer.
- * @author t3sserakt
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testbed_ng_service.h"
-#include "gnunet-service-testbed.h"
-#include "testbed_api_peers.h"
-
-
-/**
- * Generic logging shortcut
- */
-#define LOG(kind, ...) \
- GNUNET_log (kind, __VA_ARGS__)
-
-
-/**
-*
-*
-* @param cls closure.
-* @param[out] ret result
-* @param trait name of the trait.
-* @param index index number of the object to offer.
-* @return #GNUNET_OK on success.
-*/
-static int
-peer_traits (void *cls,
- const void **ret,
- const char *trait,
- unsigned int index)
-{
- struct PeerCmdState *ps = cls;
-
- struct GNUNET_TESTING_Trait traits[] = {
- {
- .index = 0,
- .trait_name = "peer",
- .ptr = (const void *) ps->peer,
- },
- GNUNET_TESTING_trait_end ()
- };
-
- return GNUNET_TESTING_get_trait (traits,
- ret,
- trait,
- index);
-
- return GNUNET_OK;
-}
-
-/**
- * Offer data from trait
- *
- * @param cmd command to extract the controller from.
- * @param peer pointer GNUNET_TESTBED_PEER
- * @return #GNUNET_OK on success.
- */
-int
-GNUNET_TESTBED_get_trait_peer (const struct GNUNET_TESTING_Command *cmd,
- struct GNUNET_TESTBED_Peer **
- peer)
-{
- return cmd->traits (cmd->cls,
- (const void **) peer,
- "peer",
- (unsigned int) 0);
-}
-
-
-/**
-*
-*
-* @param cls closure
-* @param cmd current CMD being cleaned up.
-*/
-static void
-peer_cleanup (void *cls,
- const struct GNUNET_TESTING_Command *cmd)
-{
- (void) cls;
-}
-
-
-/**
- * abort task to run on test timed out
- *
- * @param cls NULL
- * @param tc the task context
- */
-static void
-do_abort (void *cls)
-{
- struct PeerCmdState *ps = cls;
-
- if (GNUNET_NO == ps->peer_ready)
- {
- LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n");
- ps->abort_task = NULL;
- GNUNET_TESTBED_shutdown_peer (ps);
- }
-}
-
-
-/**
- * Functions of this signature are called when a peer has been successfully
- * created
- *
- * @param cls the closure from GNUNET_TESTBED_peer_create()
- * @param emsg MAY contain an error description, if starting peer failed.
- */
-static void
-peer_started_cb (void *cls,
- const char *emsg)
-{
- struct PeerCmdState *ps = cls;
-
- GNUNET_TESTBED_operation_done (ps->operation);
- if (NULL == emsg)
- {
- ps->peer_ready = GNUNET_YES;
- }
- else
- {
- LOG (GNUNET_ERROR_TYPE_ERROR, "There was an error starting a peer: %s\n",
- emsg);
- }
-
-}
-
-
-/**
- * Functions of this signature are called when a peer has been successfully
- * created
- *
- * @param cls the closure from GNUNET_TESTBED_peer_create()
- * @param peer the handle for the created peer; NULL on any error during
- * creation
- * @param emsg NULL if peer is not NULL; else MAY contain the error description
- */
-static void
-peer_create_cb (void *cls,
- struct GNUNET_TESTBED_Peer *peer,
- const char *emsg)
-{
- struct PeerCmdState *ps = cls;
-
- ps->peer = peer;
- GNUNET_TESTBED_operation_done (ps->operation);
- ps->operation = GNUNET_TESTBED_peer_start (NULL,
- peer,
- &peer_started_cb,
- ps);
-}
-
-
-static void
-peer_run (void *cls,
- const struct GNUNET_TESTING_Command *cmd,
- struct GNUNET_TESTING_Interpreter *is)
-{
- struct PeerCmdState *ps = cls;
- const struct GNUNET_TESTING_Command *controller_cmd;
- struct GNUNET_TESTBED_Controller *controller;
-
- ps->is = is;
- controller_cmd = GNUNET_TESTING_interpreter_lookup_command (
- ps->controller_label);
- GNUNET_TESTBED_get_trait_controller (controller_cmd,
- &controller);
- ps->host = GNUNET_TESTBED_host_create (ps->hostname, ps->username, ps->cfg,
- ps->port);
- ps->operation =
- GNUNET_TESTBED_peer_create (controller,
- ps->host,
- ps->cfg,
- &peer_create_cb,
- ps);
-
- ps->abort_task =
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_MINUTES, 5),
- &do_abort,
- ps);
-}
-
-
-void
-peer_stopped_cb (void *cls,
- const char *emsg)
-{
- struct PeerCmdState *ps = cls;
-
- if (NULL != emsg)
- {
- LOG (GNUNET_ERROR_TYPE_ERROR, "There was an error stopping a peer: %s\n",
- emsg);
- }
- GNUNET_TESTBED_operation_done (ps->operation);
- GNUNET_TESTBED_peer_destroy (ps->peer);
-}
-
-
-/**
- * Shutdown nicely
- *
- * @param cs controller state.
- */
-void
-GNUNET_TESTBED_shutdown_peer (struct PeerCmdState *ps)
-{
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Shutting down...\n");
-
- ps->peer_going_down = GNUNET_YES;
-
- if (NULL != ps->abort_task)
- GNUNET_SCHEDULER_cancel (ps->abort_task);
- if (NULL != ps->cfg)
- GNUNET_CONFIGURATION_destroy (ps->cfg);
- if (NULL != ps->host)
- GNUNET_TESTBED_host_destroy (ps->host);
-
- GNUNET_TESTBED_operation_done (ps->operation);
- ps->operation = GNUNET_TESTBED_peer_stop (NULL, ps->peer, peer_stopped_cb,
- ps);
-
-}
-
-
-struct GNUNET_TESTING_Command
-GNUNET_TESTBED_cmd_peer (const char *label,
- const char *controller_label,
- const char *hostname,
- const char *username,
- uint16_t port,
- struct GNUNET_CONFIGURATION_Handle *cfg)
-{
- struct PeerCmdState *ps;
-
- ps = GNUNET_new (struct PeerCmdState);
- ps->hostname = hostname;
- ps->username = username;
- ps->port = port;
- ps->cfg = cfg;
- ps->controller_label = controller_label;
-
- struct GNUNET_TESTING_Command cmd = {
- .cls = ps,
- .label = label,
- .run = &peer_run,
- .cleanup = &peer_cleanup,
- .traits = &peer_traits
- };
-
- return cmd;
-}
diff --git a/src/testbed/testbed_api_cmd_peer_store.c
b/src/testbed/testbed_api_cmd_peer_store.c
deleted file mode 100644
index fc96f589c..000000000
--- a/src/testbed/testbed_api_cmd_peer_store.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- This file is part of GNUnet
- Copyright (C) 2021 GNUnet e.V.
-
- GNUnet is free software: you can redistribute it and/or modify it
- under the terms of the GNU Affero General Public License as published
- by the Free Software Foundation, either version 3 of the License,
- or (at your option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
- SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testbed/testbed_api_cmd_peer_store.c
- * @brief Command to start the peer store service of a peer.
- * @author t3sserakt
- */
-
-
-static void
-service_run (void *cls,
- const struct GNUNET_TESTING_Command *cmd,
- struct GNUNET_TESTING_Interpreter *is)
-{
- struct PeerStoreState *pss = cls;
-
- pss->psh = GNUNET_PEERSTORE_connect (pss->cfg);
- GNUNET_TESTING_interpreter_next (ps->is);
-}
-
-
-struct GNUNET_TESTING_Command
-GNUNET_TESTBED_cmd_peer_store (const char *label,
- struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-
- struct PeerStoreState *pss;
-
- pss = GNUNET_new (struct PeerStoreState);
- pss->cfg = cfg;
-
- struct GNUNET_TESTING_Command cmd = {
- .cls = pss,
- .label = label,
- .run = &peer_store_run,
- .cleanup = &peer_store_cleanup,
- .traits = &peer_store_traits
- };
-
- return cmd;
-
-}
diff --git a/src/testbed/testbed_api_cmd_send_peer_ready.c
b/src/testbed/testbed_api_cmd_send_peer_ready.c
deleted file mode 100644
index f175a3e18..000000000
--- a/src/testbed/testbed_api_cmd_send_peer_ready.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- This file is part of GNUnet
- Copyright (C) 2021 GNUnet e.V.
-
- GNUnet is free software: you can redistribute it and/or modify it
- under the terms of the GNU Affero General Public License as published
- by the Free Software Foundation, either version 3 of the License,
- or (at your option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
- SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testing_api_cmd_send_peer_ready.c
- * @brief cmd to send a helper message if peer is ready.
- * @author t3sserakt
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_ng_lib.h"
-#include "testbed_helper.h"
-
-
-struct SendPeerReadyState
-{
- TESTBED_CMD_HELPER_write_cb write_message;
-
- struct GNUNET_CMDS_PEER_STARTED *reply;
-};
-
-
-static int
-send_peer_ready_traits (void *cls,
- const void **ret,
- const char *trait,
- unsigned int index)
-{
- return GNUNET_OK;
-}
-
-
-static void
-send_peer_ready_cleanup (void *cls,
- const struct GNUNET_TESTING_Command *cmd)
-{
- struct SendPeerReadyState *sprs = cls;
-
- GNUNET_free (sprs->reply);
- GNUNET_free (sprs);
-}
-
-
-static void
-send_peer_ready_run (void *cls,
- const struct GNUNET_TESTING_Command *cmd,
- struct GNUNET_TESTING_Interpreter *is)
-{
- struct SendPeerReadyState *sprs = cls;
- struct GNUNET_CMDS_PEER_STARTED *reply;
- size_t msg_length;
-
- msg_length = sizeof(struct GNUNET_CMDS_PEER_STARTED);
- reply = GNUNET_new (struct GNUNET_CMDS_PEER_STARTED);
- reply->header.type = htons (GNUNET_MESSAGE_TYPE_CMDS_HELPER_PEER_STARTED);
- reply->header.size = htons ((uint16_t) msg_length);
- sprs->reply = reply;
- sprs->write_message ((struct GNUNET_MessageHeader *) reply, msg_length);
-}
-
-
-/**
- * Create command.
- *
- * @param label name for command.
- * @return command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_send_peer_ready (const char *label,
- TESTBED_CMD_HELPER_write_cb write_message)
-{
- struct SendPeerReadyState *sprs;
-
- sprs = GNUNET_new (struct SendPeerReadyState);
- sprs->write_message = write_message;
-
- struct GNUNET_TESTING_Command cmd = {
- .cls = sprs,
- .label = label,
- .run = &send_peer_ready_run,
- .cleanup = &send_peer_ready_cleanup,
- .traits = &send_peer_ready_traits
- };
-
- return cmd;
-}
diff --git a/src/testbed/testbed_api_cmd_tng_connect.c
b/src/testbed/testbed_api_cmd_tng_connect.c
deleted file mode 100644
index e52cd3c76..000000000
--- a/src/testbed/testbed_api_cmd_tng_connect.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- This file is part of GNUnet
- Copyright (C) 2021 GNUnet e.V.
-
- GNUnet is free software: you can redistribute it and/or modify it
- under the terms of the GNU Affero General Public License as published
- by the Free Software Foundation, either version 3 of the License,
- or (at your option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
- SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-
-/**
- * @file testbed/testbed_api_cmd_peer.c
- * @brief Command to create a peer.
- * @author t3sserakt
- */
-
-
-static void
-tng_connect_run (void *cls,
- const struct GNUNET_TESTING_Command *cmd,
- struct GNUNET_TESTING_Interpreter *is)
-{
- struct TngConnectState *tcs = cls;
-
- tcs->ah = GNUNET_TRANSPORT_application_init (tcs->cfg);
-}
-
-struct GNUNET_TESTING_Command
-GNUNET_TESTBED_cmd_tng_connect (const char *label)
-{
- struct TngConnectState *tcs;
-
- ts = GNUNET_new (struct TngConnectState);
-
- struct GNUNET_TESTING_Command cmd = {
- .cls = tcs,
- .label = label,
- .run = &tng_connect_run,
- .cleanup = &tmg_connect_cleanup,
- .traits = &tng_connect_traits
- };
-
- return cmd;
-}
diff --git a/src/testbed/testbed_api_cmd_tng_service.c
b/src/testbed/testbed_api_cmd_tng_service.c
deleted file mode 100644
index cce2e14e3..000000000
--- a/src/testbed/testbed_api_cmd_tng_service.c
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- This file is part of GNUnet
- Copyright (C) 2021 GNUnet e.V.
-
- GNUnet is free software: you can redistribute it and/or modify it
- under the terms of the GNU Affero General Public License as published
- by the Free Software Foundation, either version 3 of the License,
- or (at your option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
- SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testbed/testbed_api_cmd_tng.c
- * @brief Command to start the transport service of a peer.
- * @author t3sserakt
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet-service-testbed.h"
-#include "testbed_api_hosts.h"
-#include "gnunet_testbed_ng_service.h"
-
-/**
- * Generic logging shortcut
- */
-#define LOG(kind, ...) \
- GNUNET_log (kind, __VA_ARGS__)
-
-
-/**
- * abort task to run on test timed out
- *
- * @param cls NULL
- * @param tc the task context
- */
-static void
-do_abort (void *cls)
-{
- struct TngState *ts = cls;
-
- if (GNUNET_NO == ts->service_ready)
- {
- LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n");
- ts->abort_task = NULL;
- GNUNET_TESTBED_shutdown_service (ts);
- }
-}
-
-/**
-*
-*
-* @param cls closure
-* @param cmd current CMD being cleaned up.
-*/
-static void
-tng_service_cleanup (void *cls,
- const struct GNUNET_TESTING_Command *cmd)
-{
- (void) cls;
-}
-
-/**
-*
-*
-* @param cls closure.
-* @param[out] ret result
-* @param trait name of the trait.
-* @param index index number of the object to offer.
-* @return #GNUNET_OK on success.
-*/
-static int
-tng_service_traits (void *cls,
- const void **ret,
- const char *trait,
- unsigned int index)
-{
- (void) cls;
- return GNUNET_OK;
-}
-
-
-static void *
-notify_connect (void *cls,
- const struct GNUNET_PeerIdentity *peer,
- struct GNUNET_MQ_Handle *mq)
-{
- struct TngState *ts = cls;
-
- if (NULL != emsg)
- {
- LOG (GNUNET_ERROR_TYPE_ERROR,
- "There was an error starting the transport subsystem: %s\n",
- emsg);
- }
- GNUNET_TESTING_interpreter_next (ps->is);
- return ts->nc (ts->cb_cls);
-
-}
-
-
-static void
-notify_disconnect (void *cls,
- const struct GNUNET_PeerIdentity *peer,
- void *handler_cls)
-{
-}
-
-
-
-
-/**
- * Adapter function called to establish a connection to
- * a service.
- *
- * @param cls closure
- * @param cfg configuration of the peer to connect to; will be available until
- * GNUNET_TESTBED_operation_done() is called on the operation returned
- * from GNUNET_TESTBED_service_connect()
- * @return service handle to return in 'op_result', NULL on error
- */
-static void *
-connect_adapter (void *cls,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
- struct TngState *ts = cls;
-
- service_handle = GNUNET_TRANSPORT_core_connect (cfg,
- ts->peer_identity,
- ts->handlers,
- ts,
- ¬ify_connect,
- ¬ify_disconnect);
- return service_handle;
-}
-
-
-/**
- * Adapter function called to destroy a connection to
- * a service.
- *
- * @param cls closure
- * @param op_result service handle returned from the connect adapter
- */
-static void
-disconnect_adapter (void *cls,
- void *op_result)
-{
-}
-
-/**
- * Callback to be called when a service connect operation is completed
- *
- * @param cls the callback closure from functions generating an operation
- * @param op the operation that has been finished
- * @param ca_result the service handle returned from
GNUNET_TESTBED_ConnectAdapter()
- * @param emsg error message in case the operation has failed; will be NULL if
- * operation has executed successfully.
- */
-static void
-service_connect_comp_cb (void *cls,
- struct GNUNET_TESTBED_Operation *op,
- void *ca_result,
- const char *emsg)
-{
- struct TngState *ts = cls;
-
- if (NULL != emsg)
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "An error occurred connecting to service %s\n",
- emsg);
- GNUNET_TESTBED_operation_done (ts->operation);
- }
-}
-
-
-/**
- * Callback to be called when the requested peer information is available
- *
- * @param cls the closure from GNUNET_TESTBED_peer_getinformation()
- * @param op the operation this callback corresponds to
- * @param pinfo the result; will be NULL if the operation has failed
- * @param emsg error message if the operation has failed;
- * NULL if the operation is successful
- */
-static void
-pi_cb (void *cls,
- struct GNUNET_TESTBED_Operation *op,
- const struct GNUNET_TESTBED_PeerInformation *pinfo,
- const char *emsg)
-{
- struct TngState *ts = cls;
-
- ts->peer_identity = pinfo->id;
- ts->operation =
- GNUNET_TESTBED_service_connect (NULL, peer, NULL,
- &service_connect_comp_cb, ts,
- &connect_adapter,
- &disconnect_adapter,
- ts);
-}
-
-
-static void
-tng_service_run (void *cls,
- const struct GNUNET_TESTING_Command *cmd,
- struct GNUNET_TESTING_Interpreter *is)
-{
- struct TngState *ts = cls;
- struct GNUNET_TESTBED_Peer *peer;
- const struct GNUNET_TESTING_Command *peer_cmd;
-
- ts->is = is;
- peer_cmd = GNUNET_TESTING_interpreter_lookup_command (
- ts->peer_label);
- GNUNET_TESTBED_get_trait_peer (peer_cmd,
- &peer);
-
- ts->operation = GNUNET_TESTBED_peer_get_information (peer,
-
GNUNET_TESTBED_PIT_IDENTITY,
- &pi_cb,
- ts);
-}
-
-/**
- * Shutdown nicely
- *
- * @param cs service state.
- */
-void
-GNUNET_TESTBED_shutdown_service (struct TngState *cs)
-{
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Shutting down...\n");
-}
-
-
-struct GNUNET_TESTING_Command
-GNUNET_TESTBED_cmd_tng_service (const char *label,
- const char *peer_label,
- const struct GNUNET_MQ_MessageHandler
*handlers,
- GNUNET_TRANSPORT_NotifyConnect nc,
- void *cb_cls)
-
-{
- struct TngState *ts;
-
- ts = GNUNET_new (struct TngState);
- ts->servicename = servicename;
- ts->peer_label = peer_label;
- ts->handlers = handlers;
- ts->nc = nc;
- ts->nd = nd;
- ts->cb_cls;
-
-
- struct GNUNET_TESTING_Command cmd = {
- .cls = ts,
- .label = label,
- .run = &tng_service_run,
- .cleanup = &tmg_service_cleanup,
- .traits = &tng_service_traits
- };
-
- return cmd;
-}
diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c
index d0a460fe6..1a8d9976d 100644
--- a/src/testbed/testbed_api_hosts.c
+++ b/src/testbed/testbed_api_hosts.c
@@ -964,10 +964,22 @@ gen_rsh_suffix_args (const char *const *append_args)
}
-void
-GNUNET_TESTBED_extract_cfg (struct GNUNET_TESTBED_Host *host, const struct
- GNUNET_MessageHeader *message)
+/**
+ * Functions with this signature are called whenever a
+ * complete message is received by the tokenizer.
+ *
+ * Do not call GNUNET_SERVER_mst_destroy in callback
+ *
+ * @param cls closure
+ * @param client identification of the client
+ * @param message the actual message
+ *
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR to stop further processing
+ */
+static int
+helper_mst (void *cls, const struct GNUNET_MessageHeader *message)
{
+ struct GNUNET_TESTBED_ControllerProc *cp = cls;
const struct GNUNET_TESTBED_HelperReply *msg;
const char *hostname;
char *config;
@@ -989,43 +1001,22 @@ GNUNET_TESTBED_extract_cfg (struct GNUNET_TESTBED_Host
*host, const struct
xconfig_size));
/* Replace the configuration template present in the host with the
controller's running configuration */
- GNUNET_CONFIGURATION_destroy (host->cfg);
- host->cfg = GNUNET_CONFIGURATION_create ();
- GNUNET_assert (GNUNET_CONFIGURATION_deserialize (host->cfg,
+ GNUNET_CONFIGURATION_destroy (cp->host->cfg);
+ cp->host->cfg = GNUNET_CONFIGURATION_create ();
+ GNUNET_assert (GNUNET_CONFIGURATION_deserialize (cp->host->cfg,
config,
config_size,
NULL));
GNUNET_free (config);
- if (NULL == (hostname = GNUNET_TESTBED_host_get_hostname (host)))
+ if (NULL == (hostname = GNUNET_TESTBED_host_get_hostname (cp->host)))
hostname = "localhost";
/* Change the hostname so that we can connect to it */
- GNUNET_CONFIGURATION_set_value_string (host->cfg,
+ GNUNET_CONFIGURATION_set_value_string (cp->host->cfg,
"testbed",
"hostname",
hostname);
- host->locked = GNUNET_NO;
-}
-
-/**
- * Functions with this signature are called whenever a
- * complete message is received by the tokenizer.
- *
- * Do not call GNUNET_SERVER_mst_destroy in callback
- *
- * @param cls closure
- * @param client identification of the client
- * @param message the actual message
- *
- * @return #GNUNET_OK on success, #GNUNET_SYSERR to stop further processing
- */
-static int
-helper_mst (void *cls, const struct GNUNET_MessageHeader *message)
-{
- struct GNUNET_TESTBED_ControllerProc *cp = cls;
- struct GNUNET_TESTBED_Host *host = cp->host;
-
- GNUNET_TESTBED_extract_cfg (host, message);
-
+ cp->host->locked = GNUNET_NO;
+ cp->host->controller_started = GNUNET_YES;
cp->cb (cp->cls, cp->host->cfg, GNUNET_OK);
return GNUNET_OK;
}
diff --git a/src/testbed/testbed_helper.h b/src/testbed/testbed_helper.h
index af90ce85d..817ad559d 100644
--- a/src/testbed/testbed_helper.h
+++ b/src/testbed/testbed_helper.h
@@ -84,60 +84,6 @@ struct GNUNET_TESTBED_HelperReply
* un-compressed */
};
-/**
- * Initialization message for gnunet-cmds-testbed to start cmd binary.
- */
-struct GNUNET_CMDS_HelperInit
-{
- /**
- * Type is GNUNET_MESSAGE_TYPE_CMDS_HELPER_INIT
- */
- struct GNUNET_MessageHeader header;
-
- /**
- *
- */
- uint16_t plugin_name_size GNUNET_PACKED;
-
- /* Followed by plugin name of the plugin running the test case. This is not
NULL
- * terminated */
-};
-
-/**
- * Reply message from cmds helper process
- */
-struct GNUNET_CMDS_HelperReply
-{
- /**
- * Type is GNUNET_MESSAGE_TYPE_CMDS_HELPER_REPLY
- */
- struct GNUNET_MessageHeader header;
-};
-
-struct GNUNET_CMDS_PEER_STARTED
-{
- /**
- * Type is GNUNET_MESSAGE_TYPE_CMDS_HELPER_PEER_STARTED
- */
- struct GNUNET_MessageHeader header;
-};
-
-struct GNUNET_CMDS_ALL_PEERS_STARTED
-{
- /**
- * Type is GNUNET_MESSAGE_TYPE_CMDS_HELPER_ALL_PEERS_STARTED
- */
- struct GNUNET_MessageHeader header;
-};
-
-struct GNUNET_CMDS_LOCAL_FINISHED
-{
- /**
- * Type is GNUNET_MESSAGE_TYPE_CMDS_HELPER_LOCAL_FINISHED
- */
- struct GNUNET_MessageHeader header;
-};
-
GNUNET_NETWORK_STRUCT_END
#endif
/* end of testbed_helper.h */
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 8b28e6e23..15469a310 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -11,10 +11,43 @@ pkgcfgdir= $(pkgdatadir)/config.d/
dist_pkgcfg_DATA = \
testing.conf
+libexec_PROGRAMS = \
+ gnunet-cmds-helper
+
+plugindir = $(libdir)/gnunet
+
+plugin_LTLIBRARIES = \
+ libgnunet_test_testing_plugin_testcmd.la
+
lib_LTLIBRARIES = \
libgnunettesting.la
+gnunet_cmds_helper_SOURCES = \
+ gnunet-cmds-helper.c
+gnunet_cmds_helper_LDADD = $(XLIB) \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettesting.la \
+ $(LTLIBINTL) $(Z_LIBS)
+
+libgnunet_test_testing_plugin_testcmd_la_SOURCES = \
+ test_testing_plugin_testcmd.c
+libgnunet_test_testing_plugin_testcmd_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/arm/libgnunetarm.la \
+ libgnunettesting.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(LTLIBINTL)
+libgnunet_test_testing_plugin_testcmd_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
libgnunettesting_la_SOURCES = \
+ testing_api_cmd_local_test_finished.c \
+ testing_api_cmd_send_peer_ready.c \
+ testing_api_cmd_block_until_all_peers_started.c \
+ testing_api_cmd_netjail_start.c \
+ testing_api_cmd_netjail_start_testsystem.c \
+ testing_api_cmd_netjail_stop_testsystem.c \
+ testing_api_cmd_netjail_stop.c \
testing.c testing.h \
testing_api_cmd_system_create.c \
testing_api_cmd_batch.c \
@@ -56,6 +89,7 @@ list_keys_LDADD = \
check_PROGRAMS = \
+ test_testing_api_cmd_netjail \
test_testing_hello_world \
test_testing_portreservation \
test_testing_servicestartup \
@@ -66,6 +100,7 @@ check_PROGRAMS = \
if ENABLE_TEST_RUN
AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset
XDG_CONFIG_HOME;
TESTS = \
+ test_testing_api_cmd_netjail \
test_testing_hello_world \
test_testing_portreservation \
test_testing_peerstartup \
@@ -73,6 +108,12 @@ TESTS = \
test_testing_servicestartup
endif
+test_testing_api_cmd_netjail_SOURCES = \
+ test_testing_api_cmd_netjail.c
+test_testing_api_cmd_netjail_LDADD = \
+ libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
test_testing_hello_world_SOURCES = \
test_testing_hello_world.c
test_testing_hello_world_LDADD = \
diff --git a/src/testbed/gnunet-cmds-helper.c b/src/testing/gnunet-cmds-helper.c
similarity index 98%
rename from src/testbed/gnunet-cmds-helper.c
rename to src/testing/gnunet-cmds-helper.c
index 4bc0656de..d9fcf3541 100644
--- a/src/testbed/gnunet-cmds-helper.c
+++ b/src/testing/gnunet-cmds-helper.c
@@ -39,9 +39,8 @@
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_testing_lib.h"
-#include "gnunet_testbed_service.h"
-#include "testbed_helper.h"
-#include "testbed_api.h"
+#include "gnunet_testing_ng_lib.h"
+#include "testing_cmds.h"
#include "gnunet_testing_plugin.h"
#include <zlib.h>
@@ -124,7 +123,7 @@ struct Plugin *plugin;
/**
* The process handle to the testbed service
-
+
static struct GNUNET_OS_Process *cmd_binary_process;*/
/**
@@ -284,7 +283,7 @@ child_death_task (void *cls)
pr = GNUNET_DISK_pipe_handle (sigpipe, GNUNET_DISK_PIPE_END_READ);
child_death_task_id = NULL;
- // consume the signal
+ // consume the signal
GNUNET_break (0 < GNUNET_DISK_file_read (pr, &c, sizeof(c)));
LOG_DEBUG ("Got SIGCHLD\n");
@@ -411,7 +410,7 @@ tokenizer_cb (void *cls, const struct GNUNET_MessageHeader
*message)
plugin = GNUNET_new (struct Plugin);
plugin->api = GNUNET_PLUGIN_load (plugin_name,
NULL);
- plugin->library_name = GNUNET_strdup (basename(plugin_name));
+ plugin->library_name = GNUNET_strdup (basename (plugin_name));
plugin->global_n = ni->global_n;
plugin->local_m = ni->local_m;
diff --git a/src/testbed/netjail_exec.sh b/src/testing/netjail_exec.sh
similarity index 100%
copy from src/testbed/netjail_exec.sh
copy to src/testing/netjail_exec.sh
diff --git a/src/testbed/netjail_start.sh b/src/testing/netjail_start.sh
similarity index 100%
copy from src/testbed/netjail_start.sh
copy to src/testing/netjail_start.sh
diff --git a/src/testbed/netjail_stop.sh b/src/testing/netjail_stop.sh
similarity index 100%
copy from src/testbed/netjail_stop.sh
copy to src/testing/netjail_stop.sh
diff --git a/src/testbed/test_testbed_api_cmd_netjail.c
b/src/testing/test_testing_api_cmd_netjail.c
similarity index 74%
rename from src/testbed/test_testbed_api_cmd_netjail.c
rename to src/testing/test_testing_api_cmd_netjail.c
index 8bb9e40e8..543642109 100644
--- a/src/testbed/test_testbed_api_cmd_netjail.c
+++ b/src/testing/test_testing_api_cmd_netjail.c
@@ -25,7 +25,6 @@
*/
#include "platform.h"
#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testbed_ng_service.h"
#include "gnunet_util_lib.h"
@@ -39,18 +38,18 @@ static void
run (void *cls)
{
struct GNUNET_TESTING_Command commands[] = {
- GNUNET_TESTBED_cmd_netjail_start ("netjail-start-1",
+ GNUNET_TESTING_cmd_netjail_start ("netjail-start-1",
"2",
"2"),
- GNUNET_TESTBED_cmd_netjail_start_testbed ("netjail-start-testbed-1",
- "2",
- "2",
- "libgnunet_plugin_testcmd"),
- GNUNET_TESTBED_cmd_stop_testbed ("stop-testbed",
- "netjail-start-testbed-1",
- "2",
- "2"),
- GNUNET_TESTBED_cmd_netjail_stop ("netjail-stop-1",
+ GNUNET_TESTING_cmd_netjail_start_testing_system ("netjail-start-testbed-1",
+ "2",
+ "2",
+
"libgnunet_plugin_testcmd"),
+ GNUNET_TESTING_cmd_stop_testing_system ("stop-testbed",
+ "netjail-start-testbed-1",
+ "2",
+ "2"),
+ GNUNET_TESTING_cmd_netjail_stop ("netjail-stop-1",
"2",
"2"),
GNUNET_TESTING_cmd_end ()
diff --git a/src/testbed/plugin_testcmd.c
b/src/testing/test_testing_plugin_testcmd.c
similarity index 96%
rename from src/testbed/plugin_testcmd.c
rename to src/testing/test_testing_plugin_testcmd.c
index e08ec067d..aeb0db5dc 100644
--- a/src/testbed/plugin_testcmd.c
+++ b/src/testing/test_testing_plugin_testcmd.c
@@ -26,7 +26,7 @@
#include "platform.h"
#include "gnunet_testing_ng_lib.h"
#include "gnunet_util_lib.h"
-#include "gnunet_testbed_ng_service.h"
+#include "gnunet_testing_ng_lib.h"
/**
* Generic logging shortcut
@@ -45,7 +45,7 @@ all_peers_started ()
}
static void
-start_testcase (TESTBED_CMD_HELPER_write_cb write_message, char *router_ip,
+start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
char *node_ip,
char *n,
char *m,
diff --git a/src/testbed/testbed_api_cmd_block_until_all_peers_started.c
b/src/testing/testing_api_cmd_block_until_all_peers_started.c
similarity index 100%
rename from src/testbed/testbed_api_cmd_block_until_all_peers_started.c
rename to src/testing/testing_api_cmd_block_until_all_peers_started.c
diff --git a/src/testbed/testbed_api_cmd_local_test_finished.c
b/src/testing/testing_api_cmd_local_test_finished.c
similarity index 96%
rename from src/testbed/testbed_api_cmd_local_test_finished.c
rename to src/testing/testing_api_cmd_local_test_finished.c
index b5f4b8b31..5b74d4e04 100644
--- a/src/testbed/testbed_api_cmd_local_test_finished.c
+++ b/src/testing/testing_api_cmd_local_test_finished.c
@@ -26,7 +26,7 @@
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_testing_ng_lib.h"
-#include "testbed_helper.h"
+#include "testing_cmds.h"
/**
* Generic logging shortcut
@@ -35,7 +35,7 @@
struct LocalFinishedState
{
- TESTBED_CMD_HELPER_write_cb write_message;
+ TESTING_CMD_HELPER_write_cb write_message;
struct GNUNET_CMDS_LOCAL_FINISHED *reply;
};
@@ -107,7 +107,7 @@ local_test_finished_finish (void *cls,
*/
struct GNUNET_TESTING_Command
GNUNET_TESTING_cmd_local_test_finished (const char *label,
- TESTBED_CMD_HELPER_write_cb
+ TESTING_CMD_HELPER_write_cb
write_message)
{
struct LocalFinishedState *lfs;
diff --git a/src/testbed/testbed_api_cmd_netjail_start.c
b/src/testing/testing_api_cmd_netjail_start.c
similarity index 93%
rename from src/testbed/testbed_api_cmd_netjail_start.c
rename to src/testing/testing_api_cmd_netjail_start.c
index 8edfb8b62..c82392a08 100644
--- a/src/testbed/testbed_api_cmd_netjail_start.c
+++ b/src/testing/testing_api_cmd_netjail_start.c
@@ -26,9 +26,8 @@
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testbed_ng_service.h"
-#define NETJAIL_START_SCRIPT "./../testbed/netjail_start.sh"
+#define NETJAIL_START_SCRIPT "./../testing/netjail_start.sh"
struct NetJailState
{
@@ -139,9 +138,10 @@ netjail_start_run (void *cls,
ns->local_m,
ns->global_n,
NULL};
- unsigned int helper_check = GNUNET_OS_check_helper_binary
(NETJAIL_START_SCRIPT,
- GNUNET_YES,
- NULL);
+ unsigned int helper_check = GNUNET_OS_check_helper_binary (
+ NETJAIL_START_SCRIPT,
+ GNUNET_YES,
+ NULL);
if (GNUNET_NO == helper_check)
{
@@ -193,7 +193,7 @@ netjail_start_finish (void *cls,
* @return command.
*/
struct GNUNET_TESTING_Command
-GNUNET_TESTBED_cmd_netjail_start (const char *label,
+GNUNET_TESTING_cmd_netjail_start (const char *label,
char *local_m,
char *global_n)
{
diff --git a/src/testbed/testbed_api_cmd_netjail_start_testbed.c
b/src/testing/testing_api_cmd_netjail_start_testsystem.c
similarity index 82%
copy from src/testbed/testbed_api_cmd_netjail_start_testbed.c
copy to src/testing/testing_api_cmd_netjail_start_testsystem.c
index db9cf7508..5c2f71168 100644
--- a/src/testbed/testbed_api_cmd_netjail_start_testbed.c
+++ b/src/testing/testing_api_cmd_netjail_start_testsystem.c
@@ -25,12 +25,9 @@
*/
#include "platform.h"
#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testbed_ng_service.h"
-#include "testbed_api.h"
-#include "testbed_api_hosts.h"
-#include "testbed_helper.h"
+#include "testing_cmds.h"
-#define NETJAIL_EXEC_SCRIPT "./../testbed/netjail_exec.sh"
+#define NETJAIL_EXEC_SCRIPT "./../testing/netjail_exec.sh"
struct HelperMessage;
@@ -87,23 +84,16 @@ struct NetJailState
unsigned int n_msg;
- unsigned int number_of_testbeds_started;
+ unsigned int number_of_testsystems_started;
unsigned int number_of_peers_started;
unsigned int number_of_local_test_finished;
- /**
- * The host where the controller is running
- */
- struct GNUNET_TESTBED_Host **host;
-
- unsigned int n_host;
-
char *plugin_name;
};
-struct TestbedCount
+struct TestingSystemCount
{
unsigned int count;
@@ -168,14 +158,14 @@ netjail_exec_traits (void *cls,
/**
- * Offer handles to testbed helper from trait
+ * Offer handles to testing cmd helper from trait
*
* @param cmd command to extract the message from.
* @param pt pointer to message.
* @return #GNUNET_OK on success.
*/
int
-GNUNET_TESTBED_get_trait_helper_handles (const struct
+GNUNET_TESTING_get_trait_helper_handles (const struct
GNUNET_TESTING_Command *cmd,
struct GNUNET_HELPER_Handle ***helper)
{
@@ -186,14 +176,14 @@ GNUNET_TESTBED_get_trait_helper_handles (const struct
}
/**
- * Offer handles to testbed helper from trait
+ * Offer messages received via testing cmd helper from trait
*
* @param cmd command to extract the message from.
* @param pt pointer to message.
* @return #GNUNET_OK on success.
*/
int
-GNUNET_TESTBED_get_trait_helper_messages (const struct
+GNUNET_TESTING_get_trait_helper_messages (const struct
GNUNET_TESTING_Command *cmd,
struct HelperMessage ***
hp_messages_head)
@@ -216,7 +206,7 @@ GNUNET_TESTBED_get_trait_helper_messages (const struct
static void
clear_msg (void *cls, int result)
{
- struct TestbedCount *tbc = cls;
+ struct TestingSystemCount *tbc = cls;
struct NetJailState *ns = tbc->ns;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -244,7 +234,7 @@ clear_msg (void *cls, int result)
static int
helper_mst (void *cls, const struct GNUNET_MessageHeader *message)
{
- struct TestbedCount *tbc = cls;
+ struct TestingSystemCount *tbc = cls;
struct NetJailState *ns = tbc->ns;
struct HelperMessage *hp_msg;
@@ -253,10 +243,9 @@ helper_mst (void *cls, const struct GNUNET_MessageHeader
*message)
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"helper_mst tbc->count: %d\n",
tbc->count);
- // GNUNET_TESTBED_extract_cfg (host, message);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received message from helper.\n");
- ns->number_of_testbeds_started++;
+ ns->number_of_testsystems_started++;
}
else if (GNUNET_MESSAGE_TYPE_CMDS_HELPER_PEER_STARTED == ntohs (
message->type))
@@ -320,57 +309,38 @@ create_helper_init_msg_ (char *m_char,
static void
-start_testbed (struct NetJailState *ns, struct
- GNUNET_CONFIGURATION_Handle *config,
- char *m_char,
- char *n_char)
+start_helper (struct NetJailState *ns, struct
+ GNUNET_CONFIGURATION_Handle *config,
+ char *m_char,
+ char *n_char)
{
// struct GNUNET_CONFIGURATION_Handle *cfg;
struct GNUNET_CMDS_HelperInit *msg;
- struct TestbedCount *tbc;
+ struct TestingSystemCount *tbc;
char *const script_argv[] = {NETJAIL_EXEC_SCRIPT,
m_char,
n_char,
-
GNUNET_OS_get_libexec_binary_path(HELPER_CMDS_BINARY),
+ GNUNET_OS_get_libexec_binary_path (
+ HELPER_CMDS_BINARY),
ns->global_n,
ns->local_m,
NULL};
unsigned int m = atoi (m_char);
unsigned int n = atoi (n_char);
- unsigned int helper_check = GNUNET_OS_check_helper_binary
(NETJAIL_EXEC_SCRIPT,
- GNUNET_YES,
- NULL);
+ unsigned int helper_check = GNUNET_OS_check_helper_binary (
+ NETJAIL_EXEC_SCRIPT,
+ GNUNET_YES,
+ NULL);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"m: %d n: %d\n",
m,
n);
- tbc = GNUNET_new (struct TestbedCount);
+ tbc = GNUNET_new (struct TestingSystemCount);
tbc->ns = ns;
tbc->count = (n - 1) * atoi (ns->local_m) + m;
- // cfg = GNUNET_CONFIGURATION_dup (config);
-
- // TODO We do not need this?
- /*GNUNET_array_append (ns->host, ns->n_host,
- GNUNET_TESTBED_host_create_with_id (tbc->count - 1,
- NULL,
- NULL,
- cfg,
- 0));*/
-
- /*if ((GNUNET_YES != GNUNET_DISK_file_test ("test_testbed_api.conf")) ||
- (GNUNET_SYSERR == GNUNET_CONFIGURATION_load (config,
- "test_testbed_api.conf")))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _ (
- "Unreadable or malformed configuration file `%s', exit
...\n"),
- "test_testbed_api.conf");
- }*/
-
-
if (GNUNET_NO == helper_check)
{
@@ -396,13 +366,13 @@ start_testbed (struct NetJailState *ns, struct
tbc));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "First using helper %d %d\n",
+ "First using helper %d %d\n",
tbc->count - 1,
ns->n_helper);
struct GNUNET_HELPER_Handle *helper = ns->helper[tbc->count - 1];
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "First using helper %d %d %p\n",
+ "First using helper %d %d %p\n",
tbc->count - 1,
ns->n_helper,
helper);
@@ -456,9 +426,9 @@ netjail_exec_run (void *cls,
{
sprintf (str_n, "%d", i);
sprintf (str_m, "%d", j);
- start_testbed (ns, config,
- str_m,
- str_n);
+ start_helper (ns, config,
+ str_m,
+ str_n);
}
}
}
@@ -475,7 +445,7 @@ netjail_start_finish (void *cls,
struct GNUNET_CMDS_ALL_PEERS_STARTED *reply;
size_t msg_length;
struct GNUNET_HELPER_Handle *helper;
- struct TestbedCount *tbc;
+ struct TestingSystemCount *tbc;
if (ns->number_of_local_test_finished == total_number)
{
@@ -483,11 +453,11 @@ netjail_start_finish (void *cls,
cont (cont_cls);
}
- if (ns->number_of_testbeds_started == total_number)
+ if (ns->number_of_testsystems_started == total_number)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"All helpers started!\n");
- ns->number_of_testbeds_started = 0;
+ ns->number_of_testsystems_started = 0;
}
if (ns->number_of_peers_started == total_number)
@@ -498,7 +468,7 @@ netjail_start_finish (void *cls,
for (int i = 1; i <= atoi (ns->global_n); i++) {
for (int j = 1; j <= atoi (ns->local_m); j++)
{
- tbc = GNUNET_new (struct TestbedCount);
+ tbc = GNUNET_new (struct TestingSystemCount);
tbc->ns = ns;
// TODO This needs to be more generic. As we send more messages back
and forth, we can not grow the arrays again and again, because this is to error
prone.
tbc->count = (i - 1) * atoi (ns->local_m) + j + total_number;
@@ -544,11 +514,11 @@ netjail_start_finish (void *cls,
* @return command.
*/
struct GNUNET_TESTING_Command
-GNUNET_TESTBED_cmd_netjail_start_testbed (const char *label,
- char *local_m,
- char *global_n,
- char *plugin_name,
- unsigned int *rv)
+GNUNET_TESTING_cmd_netjail_start_testing_system (const char *label,
+ char *local_m,
+ char *global_n,
+ char *plugin_name,
+ unsigned int *rv)
{
struct NetJailState *ns;
diff --git a/src/testbed/testbed_api_cmd_netjail_stop.c
b/src/testing/testing_api_cmd_netjail_stop.c
similarity index 92%
rename from src/testbed/testbed_api_cmd_netjail_stop.c
rename to src/testing/testing_api_cmd_netjail_stop.c
index 947384fed..710b4fbf4 100644
--- a/src/testbed/testbed_api_cmd_netjail_stop.c
+++ b/src/testing/testing_api_cmd_netjail_stop.c
@@ -26,10 +26,9 @@
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testbed_ng_service.h"
-#define NETJAIL_STOP_SCRIPT "./../testbed/netjail_stop.sh"
+#define NETJAIL_STOP_SCRIPT "./../testing/netjail_stop.sh"
struct GNUNET_ChildWaitHandle *cwh;
@@ -135,9 +134,10 @@ netjail_stop_run (void *cls,
ns->local_m,
ns->global_n,
NULL};
- unsigned int helper_check = GNUNET_OS_check_helper_binary
(NETJAIL_STOP_SCRIPT,
- GNUNET_YES,
- NULL);
+ unsigned int helper_check = GNUNET_OS_check_helper_binary (
+ NETJAIL_STOP_SCRIPT,
+ GNUNET_YES,
+ NULL);
if (GNUNET_NO == helper_check)
{
@@ -192,7 +192,7 @@ netjail_stop_finish (void *cls,
* @return command.
*/
struct GNUNET_TESTING_Command
-GNUNET_TESTBED_cmd_netjail_stop (const char *label,
+GNUNET_TESTING_cmd_netjail_stop (const char *label,
char *local_m,
char *global_n)
{
diff --git a/src/testbed/testbed_api_cmd_netjail_stop_testbed.c
b/src/testing/testing_api_cmd_netjail_stop_testsystem.c
similarity index 72%
rename from src/testbed/testbed_api_cmd_netjail_stop_testbed.c
rename to src/testing/testing_api_cmd_netjail_stop_testsystem.c
index 9a9d489a7..bed9f3ebf 100644
--- a/src/testbed/testbed_api_cmd_netjail_stop_testbed.c
+++ b/src/testing/testing_api_cmd_netjail_stop_testsystem.c
@@ -25,9 +25,7 @@
*/
#include "platform.h"
#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testbed_ng_service.h"
-#include "testbed_api.h"
-#include "testbed_api_hosts.h"
+#include "testing_cmds.h"
struct StopHelperState
@@ -53,8 +51,8 @@ struct StopHelperState
* @param cmd current CMD being cleaned up.
*/
static void
-stop_testbed_cleanup (void *cls,
- const struct GNUNET_TESTING_Command *cmd)
+stop_testing_system_cleanup (void *cls,
+ const struct GNUNET_TESTING_Command *cmd)
{
}
@@ -70,10 +68,10 @@ stop_testbed_cleanup (void *cls,
* @return #GNUNET_OK on success.
*/
static int
-stop_testbed_traits (void *cls,
- const void **ret,
- const char *trait,
- unsigned int index)
+stop_testing_system_traits (void *cls,
+ const void **ret,
+ const char *trait,
+ unsigned int index)
{
return GNUNET_OK;
}
@@ -87,9 +85,9 @@ stop_testbed_traits (void *cls,
* @param is interpreter state.
*/
static void
-stop_testbed_run (void *cls,
- const struct GNUNET_TESTING_Command *cmd,
- struct GNUNET_TESTING_Interpreter *is)
+stop_testing_system_run (void *cls,
+ const struct GNUNET_TESTING_Command *cmd,
+ struct GNUNET_TESTING_Interpreter *is)
{
struct StopHelperState *shs = cls;
struct GNUNET_HELPER_Handle **helper;
@@ -97,7 +95,7 @@ stop_testbed_run (void *cls,
start_helper_cmd = GNUNET_TESTING_interpreter_lookup_command (
shs->helper_start_label);
- GNUNET_TESTBED_get_trait_helper_handles (start_helper_cmd,
+ GNUNET_TESTING_get_trait_helper_handles (start_helper_cmd,
&helper);
for (int i = 1; i <= atoi (shs->global_n); i++) {
@@ -118,11 +116,11 @@ stop_testbed_run (void *cls,
* @return command.
*/
struct GNUNET_TESTING_Command
-GNUNET_TESTBED_cmd_stop_testbed (const char *label,
- const char *helper_start_label,
- char *local_m,
- char *global_n
- )
+GNUNET_TESTING_cmd_stop_testing_system (const char *label,
+ const char *helper_start_label,
+ char *local_m,
+ char *global_n
+ )
{
struct StopHelperState *shs;
@@ -134,9 +132,9 @@ GNUNET_TESTBED_cmd_stop_testbed (const char *label,
struct GNUNET_TESTING_Command cmd = {
.cls = shs,
.label = label,
- .run = &stop_testbed_run,
- .cleanup = &stop_testbed_cleanup,
- .traits = &stop_testbed_traits
+ .run = &stop_testing_system_run,
+ .cleanup = &stop_testing_system_cleanup,
+ .traits = &stop_testing_system_traits
};
return cmd;
diff --git a/src/testing/testing_api_cmd_send_peer_ready.c
b/src/testing/testing_api_cmd_send_peer_ready.c
index 27761c4d5..afe28de77 100644
--- a/src/testing/testing_api_cmd_send_peer_ready.c
+++ b/src/testing/testing_api_cmd_send_peer_ready.c
@@ -26,13 +26,12 @@
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_testing_ng_lib.h"
-#include "testbed_api.h"
-#include "testbed_helper.h"
+#include "testing_cmds.h"
struct SendPeerReadyState
{
- TESTBED_CMD_HELPER_write_cb write_message;
+ TESTING_CMD_HELPER_write_cb write_message;
struct GNUNET_CMDS_PEER_STARTED *reply;
};
@@ -68,7 +67,7 @@ send_peer_ready_run (void *cls,
struct GNUNET_CMDS_PEER_STARTED *reply;
size_t msg_length;
- msg_length = sizeof(struct GNUNET_CMDS_HelperInit);//
GNUNET_CMDS_PEER_STARTED);
+ msg_length = sizeof(struct GNUNET_CMDS_PEER_STARTED);
reply = GNUNET_new (struct GNUNET_CMDS_PEER_STARTED);
reply->header.type = htons (GNUNET_MESSAGE_TYPE_CMDS_HELPER_PEER_STARTED);
reply->header.size = htons ((uint16_t) msg_length);
@@ -85,7 +84,7 @@ send_peer_ready_run (void *cls,
*/
struct GNUNET_TESTING_Command
GNUNET_TESTING_cmd_send_peer_ready (const char *label,
- TESTBED_CMD_HELPER_write_cb write_message)
+ TESTING_CMD_HELPER_write_cb write_message)
{
struct SendPeerReadyState *sprs;
diff --git a/src/testbed/testbed_helper.h b/src/testing/testing_cmds.h
similarity index 53%
copy from src/testbed/testbed_helper.h
copy to src/testing/testing_cmds.h
index af90ce85d..7a5860aea 100644
--- a/src/testbed/testbed_helper.h
+++ b/src/testing/testing_cmds.h
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet
- Copyright (C) 2008--2013 GNUnet e.V.
+ Copyright (C) 2021 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -19,70 +19,17 @@
*/
/**
- * @file testbed/testbed_helper.h
- * @brief Message formats for communication between testbed api and
- * gnunet-helper-testbed process
- * @author Sree Harsha Totakura <sreeharsha@totakura.in>
+ * @file testing/testing_cmds.h
+ * @brief Message formats for communication between testing cmds helper and
testcase plugins.
+ * @author t3sserakt
*/
-#ifndef TESTBED_HELPER_H
-#define TESTBED_HELPER_H
+#ifndef TESTING_CMDS_H
+#define TESTING_CMDS_H
-GNUNET_NETWORK_STRUCT_BEGIN
-/**
- * Initialization message for gnunet-helper-testbed to start testbed service
- */
-struct GNUNET_TESTBED_HelperInit
-{
- /**
- * Type is GNUNET_MESSAGE_TYPE_TESTBED_HELPER_INIT
- */
- struct GNUNET_MessageHeader header;
-
- /**
- * The controller hostname size excluding the NULL termination character -
- * strlen (hostname); cannot be zero
- */
- uint16_t trusted_ip_size GNUNET_PACKED;
-
- /**
- * The hostname size excluding the NULL termination character - strlen
- * (hostname); cannot be zero
- */
- uint16_t hostname_size GNUNET_PACKED;
-
- /**
- * The size of the uncompressed configuration
- */
- uint16_t config_size GNUNET_PACKED;
-
- /* Followed by NULL terminated trusted ip */
+#define HELPER_CMDS_BINARY "gnunet-cmds-helper"
- /* Followed by hostname of the machine on which helper runs. This is not NULL
- * terminated */
-
- /* Followed by serialized and compressed configuration which should be
- * config_size long when un-compressed */
-};
-
-/**
- * Reply message from helper process
- */
-struct GNUNET_TESTBED_HelperReply
-{
- /**
- * Type is GNUNET_MESSAGE_TYPE_TESTBED_HELPER_REPLY
- */
- struct GNUNET_MessageHeader header;
-
- /**
- * Size of the uncompressed configuration
- */
- uint16_t config_size GNUNET_PACKED;
-
- /* Followed by compressed configuration which should be config_size long when
- * un-compressed */
-};
+GNUNET_NETWORK_STRUCT_BEGIN
/**
* Initialization message for gnunet-cmds-testbed to start cmd binary.
@@ -140,4 +87,4 @@ struct GNUNET_CMDS_LOCAL_FINISHED
GNUNET_NETWORK_STRUCT_END
#endif
-/* end of testbed_helper.h */
+/* end of testing_cmds.h */
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 0782a631b..0696188c5 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -398,20 +398,19 @@ plugin_LTLIBRARIES = \
$(HTTP_SERVER_PLUGIN_LA) \
$(HTTPS_SERVER_PLUGIN_LA) \
$(WLAN_PLUGIN_LA) \
- $(BT_PLUGIN_LA)
-# libgnunet_plugin_cmd_simple_send.la
-
-#libgnunet_plugin_cmd_simple_send_la_SOURCES = \
-# plugin_cmd_simple_send.c
-#libgnunet_plugin_cmd_simple_send_la_LIBADD = \
-# $(top_builddir)/src/util/libgnunetutil.la \
-# $(top_builddir)/src/testing/libgnunettesting.la \
-# $(top_builddir)/src/statistics/libgnunetstatistics.la \
-# $(top_builddir)/src/testbed/libgnunettestbed.la \
-# libgnunettransporttesting2.la \
-# $(LTLIBINTL)
-#libgnunet_plugin_cmd_simple_send_la_LDFLAGS = \
-# $(GN_PLUGIN_LDFLAGS)
+ $(BT_PLUGIN_LA) \
+ libgnunet_test_transport_plugin_cmd_simple_send.la
+
+libgnunet_test_transport_plugin_cmd_simple_send_la_SOURCES = \
+ test_transport_plugin_cmd_simple_send.c
+libgnunet_test_transport_plugin_cmd_simple_send_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ libgnunettransporttesting2.la \
+ $(LTLIBINTL)
+libgnunet_test_transport_plugin_cmd_simple_send_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
if HAVE_EXPERIMENTAL
plugin_LTLIBRARIES += libgnunet_plugin_transport_udp.la
diff --git a/src/transport/test_transport_api_cmd_simple_send.c
b/src/transport/test_transport_api_cmd_simple_send.c
index 26da53c47..13497366e 100644
--- a/src/transport/test_transport_api_cmd_simple_send.c
+++ b/src/transport/test_transport_api_cmd_simple_send.c
@@ -25,7 +25,6 @@
*/
#include "platform.h"
#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testbed_ng_service.h"
#include "gnunet_util_lib.h"
#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120)
@@ -43,19 +42,19 @@ static void
run (void *cls)
{
struct GNUNET_TESTING_Command commands[] = {
- GNUNET_TESTBED_cmd_netjail_start ("netjail-start-1",
+ GNUNET_TESTING_cmd_netjail_start ("netjail-start-1",
"2",
"1"),
- GNUNET_TESTBED_cmd_netjail_start_testbed ("netjail-start-testbed-1",
- "2",
- "1",
-
"libgnunet_plugin_cmd_simple_send",
- &rv),
- GNUNET_TESTBED_cmd_stop_testbed ("stop-testbed",
- "netjail-start-testbed-1",
- "2",
- "1"),
- GNUNET_TESTBED_cmd_netjail_stop ("netjail-stop-1",
+ GNUNET_TESTING_cmd_netjail_start_testing_system ("netjail-start-testbed-1",
+ "2",
+ "1",
+
"libgnunet_test_transport_plugin_cmd_simple_send",
+ &rv),
+ GNUNET_TESTING_cmd_stop_testing_system ("stop-testbed",
+ "netjail-start-testbed-1",
+ "2",
+ "1"),
+ GNUNET_TESTING_cmd_netjail_stop ("netjail-stop-1",
"2",
"1"),
GNUNET_TESTING_cmd_end ()
diff --git a/src/transport/plugin_cmd_simple_send.c
b/src/transport/test_transport_plugin_cmd_simple_send.c
similarity index 81%
rename from src/transport/plugin_cmd_simple_send.c
rename to src/transport/test_transport_plugin_cmd_simple_send.c
index 2a4a8c137..c4f7fcfe3 100644
--- a/src/transport/plugin_cmd_simple_send.c
+++ b/src/transport/test_transport_plugin_cmd_simple_send.c
@@ -1,19 +1,19 @@
/*
- This file is part of GNUnet
- Copyright (C) 2013, 2014 GNUnet e.V.
+ This file is part of GNUnet
+ Copyright (C) 2021 GNUnet e.V.
- GNUnet is free software: you can redistribute it and/or modify it
- under the terms of the GNU Affero General Public License as published
- by the Free Software Foundation, either version 3 of the License,
- or (at your option) any later version.
+ GNUnet is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License,
+ or (at your option) any later version.
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Affero General Public License for more details.
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Affero General Public License for more details.
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
SPDX-License-Identifier: AGPL3.0-or-later
*/
@@ -27,8 +27,6 @@
#include "gnunet_testing_ng_lib.h"
#include "gnunet_util_lib.h"
#include "gnunet_transport_application_service.h"
-// #include "gnunet_transport_service.h"
-#include "gnunet_testbed_ng_service.h"
#include "transport-testing2.h"
#include "transport-testing-cmds.h"
@@ -83,7 +81,7 @@ all_peers_started ()
}
static void
-start_testcase (TESTBED_CMD_HELPER_write_cb write_message, char *router_ip,
+start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
char *node_ip,
char *m,
char *n,
@@ -166,7 +164,7 @@ start_testcase (TESTBED_CMD_HELPER_write_cb write_message,
char *router_ip,
* @return the exported block API
*/
void *
-libgnunet_plugin_cmd_simple_send_init (void *cls)
+libgnunet_test_transport_plugin_cmd_simple_send_init (void *cls)
{
struct GNUNET_TESTING_PluginFunctions *api;
@@ -180,11 +178,11 @@ libgnunet_plugin_cmd_simple_send_init (void *cls)
/**
* Exit point from the plugin.
*
- * @param cls the return value from #libgnunet_plugin_block_test_init
+ * @param cls the return value from
#libgnunet_test_transport_plugin_block_test_init
* @return NULL
*/
void *
-libgnunet_plugin_cmd_simple_send_done (void *cls)
+libgnunet_test_transport_plugin_cmd_simple_send_done (void *cls)
{
struct GNUNET_TESTING_PluginFunctions *api = cls;
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [gnunet] branch master updated (0f00c0028 -> 32a8c505c),
gnunet <=