From 33a5d276ff045e45d05264a0c17a545ecd277548 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 21 Dec 2012 15:09:51 +0000 Subject: -renaming testing-new.h to testing.h, bumping library versions --- configure.ac | 4 +- src/ats/Makefile.am | 2 +- src/ats/test_ats_api_bandwidth_consumption.c | 2 +- src/ats/test_ats_api_performance.c | 2 +- src/ats/test_ats_api_scheduling_add_address.c | 2 +- src/ats/test_ats_api_scheduling_add_session.c | 2 +- src/ats/test_ats_api_scheduling_block_and_reset.c | 2 +- src/ats/test_ats_api_scheduling_check_min_bw_alt.c | 2 +- src/ats/test_ats_api_scheduling_destroy_address.c | 2 +- ...ats_api_scheduling_destroy_inbound_connection.c | 2 +- src/ats/test_ats_api_scheduling_destroy_session.c | 2 +- src/ats/test_ats_api_scheduling_init.c | 2 +- src/ats/test_ats_api_scheduling_min_bw.c | 2 +- src/ats/test_ats_api_scheduling_update_address.c | 2 +- src/ats/test_ats_simplistic.c | 2 +- src/ats/test_ats_simplistic_change_preference.c | 2 +- src/ats/test_ats_simplistic_switch_networks.c | 2 +- src/consensus/test_consensus_api.c | 2 +- src/core/test_core_api_send_to_self.c | 2 +- src/datacache/perf_datacache.c | 2 +- src/datacache/test_datacache.c | 2 +- src/datacache/test_datacache_quota.c | 2 +- src/datastore/perf_datastore_api.c | 2 +- src/datastore/perf_plugin_datastore.c | 2 +- src/datastore/test_datastore_api.c | 2 +- src/datastore/test_datastore_api_management.c | 2 +- src/datastore/test_plugin_datastore.c | 2 +- src/dht/Makefile.am | 2 +- src/dht/test_dht_api.c | 2 +- src/dns/Makefile.am | 2 +- src/fs/Makefile.am | 2 +- src/fs/test_fs_download.c | 2 +- src/fs/test_fs_download_persistence.c | 2 +- src/fs/test_fs_list_indexed.c | 2 +- src/fs/test_fs_namespace.c | 2 +- src/fs/test_fs_namespace_list_updateable.c | 2 +- src/fs/test_fs_publish.c | 2 +- src/fs/test_fs_publish_persistence.c | 2 +- src/fs/test_fs_search.c | 2 +- src/fs/test_fs_search_persistence.c | 2 +- src/fs/test_fs_search_probes.c | 2 +- src/fs/test_fs_start_stop.c | 2 +- src/fs/test_fs_unindex.c | 2 +- src/fs/test_fs_unindex_persistence.c | 2 +- src/gns/test_gns_cname_lookup.c | 2 +- src/gns/test_gns_dht_delegated_lookup.c | 2 +- src/gns/test_gns_dht_three_peers.c | 2 +- src/gns/test_gns_max_queries.c | 2 +- src/gns/test_gns_ns_lookup.c | 2 +- src/gns/test_gns_proxy.c | 2 +- src/gns/test_gns_pseu_shorten.c | 2 +- src/gns/test_gns_revocation.c | 2 +- src/gns/test_gns_simple_delegated_lookup.c | 2 +- src/gns/test_gns_simple_get_authority.c | 2 +- src/gns/test_gns_simple_lookup.c | 2 +- src/gns/test_gns_simple_mx_lookup.c | 2 +- src/gns/test_gns_simple_shorten.c | 2 +- src/gns/test_gns_simple_srv_lookup.c | 2 +- src/gns/test_gns_simple_zkey_lookup.c | 2 +- src/hello/Makefile.am | 2 +- src/include/Makefile.am | 1 - src/include/gnunet_common.h | 2 +- src/include/gnunet_testbed_service.h | 2 +- src/include/gnunet_testing_lib-new.h | 372 --------------------- src/include/gnunet_testing_lib.h | 372 +++++++++++++++++++++ src/lockmanager/test_lockmanager_api.c | 2 +- .../test_lockmanager_api_acquireretry.c | 2 +- src/lockmanager/test_lockmanager_api_lockrelease.c | 2 +- src/lockmanager/test_lockmanager_api_servercrash.c | 2 +- src/mesh/Makefile.am | 2 +- src/mesh/test_mesh_api.c | 2 +- src/mesh/test_mesh_local_1.c | 2 +- src/mesh/test_mesh_local_2.c | 2 +- src/mesh/test_mesh_local_traffic.c | 2 +- src/namestore/test_namestore_api.c | 2 +- src/namestore/test_namestore_api_create.c | 2 +- src/namestore/test_namestore_api_create_update.c | 2 +- src/namestore/test_namestore_api_lookup.c | 2 +- .../test_namestore_api_lookup_specific_type.c | 2 +- src/namestore/test_namestore_api_put.c | 2 +- src/namestore/test_namestore_api_remove.c | 2 +- ...test_namestore_api_remove_not_existing_record.c | 2 +- src/namestore/test_namestore_api_zone_iteration.c | 2 +- ...st_namestore_api_zone_iteration_specific_zone.c | 2 +- .../test_namestore_api_zone_iteration_stop.c | 2 +- src/namestore/test_namestore_api_zone_to_name.c | 2 +- src/namestore/test_plugin_namestore.c | 2 +- src/nat/Makefile.am | 2 +- src/nse/test_nse_api.c | 2 +- src/peerinfo/perf_peerinfo_api.c | 2 +- src/peerinfo/test_peerinfo_api.c | 2 +- src/pt/test_gns_vpn.c | 2 +- src/pt/test_gnunet_vpn.c | 2 +- src/regex/Makefile.am | 2 +- src/stream/Makefile.am | 2 +- src/stream/test_stream_big.c | 2 +- src/stream/test_stream_local.c | 2 +- src/stream/test_stream_sequence_wraparound.c | 2 +- src/testbed/gnunet-helper-testbed.c | 2 +- src/testbed/gnunet-service-testbed.c | 2 +- src/testbed/test_testbed_api.c | 2 +- src/testbed/test_testbed_api_2peers_1controller.c | 2 +- src/testbed/test_testbed_api_3peers_3controllers.c | 2 +- src/testbed/test_testbed_api_controllerlink.c | 2 +- src/testing/Makefile.am | 2 +- src/testing/gnunet-testing-run-service.c | 2 +- src/testing/gnunet-testing.c | 2 +- src/testing/test_testing_peerstartup.c | 2 +- src/testing/test_testing_portreservation.c | 2 +- src/testing/test_testing_servicestartup.c | 2 +- src/testing/testing.c | 2 +- src/transport/Makefile.am | 2 +- src/transport/transport-testing.h | 2 +- src/util/Makefile.am | 2 +- src/util/gnunet-ecc.c | 2 +- src/util/gnunet-rsa.c | 2 +- 116 files changed, 486 insertions(+), 487 deletions(-) delete mode 100644 src/include/gnunet_testing_lib-new.h create mode 100644 src/include/gnunet_testing_lib.h diff --git a/configure.ac b/configure.ac index 369941f02..fbe2fee8f 100644 --- a/configure.ac +++ b/configure.ac @@ -22,13 +22,13 @@ # AC_PREREQ(2.61) # Checks for programs. -AC_INIT([gnunet], [0.9.4],[bug-gnunet@gnu.org]) +AC_INIT([gnunet], [0.9.5],[bug-gnunet@gnu.org]) AC_CANONICAL_TARGET AC_CANONICAL_HOST AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE([gnunet], [0.9.4]) +AM_INIT_AUTOMAKE([gnunet], [0.9.5]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_CONFIG_HEADERS([gnunet_config.h]) AH_TOP([#define _GNU_SOURCE 1]) diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am index 398be5282..9a6b58cb1 100644 --- a/src/ats/Makefile.am +++ b/src/ats/Makefile.am @@ -35,7 +35,7 @@ libgnunetats_la_LIBADD = \ libgnunetats_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) \ - -version-info 3:0:3 + -version-info 4:0:0 libexec_PROGRAMS = \ diff --git a/src/ats/test_ats_api_bandwidth_consumption.c b/src/ats/test_ats_api_bandwidth_consumption.c index 5b1b2df45..772d044a5 100644 --- a/src/ats/test_ats_api_bandwidth_consumption.c +++ b/src/ats/test_ats_api_bandwidth_consumption.c @@ -26,7 +26,7 @@ */ #include "platform.h" #include "gnunet_ats_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "ats.h" #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10) diff --git a/src/ats/test_ats_api_performance.c b/src/ats/test_ats_api_performance.c index 99231aa89..64737d8ba 100644 --- a/src/ats/test_ats_api_performance.c +++ b/src/ats/test_ats_api_performance.c @@ -25,7 +25,7 @@ */ #include "platform.h" #include "gnunet_ats_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "ats.h" #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10) diff --git a/src/ats/test_ats_api_scheduling_add_address.c b/src/ats/test_ats_api_scheduling_add_address.c index 79e28d10b..f7ee1951b 100644 --- a/src/ats/test_ats_api_scheduling_add_address.c +++ b/src/ats/test_ats_api_scheduling_add_address.c @@ -25,7 +25,7 @@ */ #include "platform.h" #include "gnunet_ats_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "ats.h" #include "test_ats_api_common.h" diff --git a/src/ats/test_ats_api_scheduling_add_session.c b/src/ats/test_ats_api_scheduling_add_session.c index 92ddc6ae7..939448460 100644 --- a/src/ats/test_ats_api_scheduling_add_session.c +++ b/src/ats/test_ats_api_scheduling_add_session.c @@ -25,7 +25,7 @@ */ #include "platform.h" #include "gnunet_ats_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "ats.h" #include "test_ats_api_common.h" diff --git a/src/ats/test_ats_api_scheduling_block_and_reset.c b/src/ats/test_ats_api_scheduling_block_and_reset.c index 82c859a6e..b799a5de3 100644 --- a/src/ats/test_ats_api_scheduling_block_and_reset.c +++ b/src/ats/test_ats_api_scheduling_block_and_reset.c @@ -27,7 +27,7 @@ */ #include "platform.h" #include "gnunet_ats_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "ats.h" #include "test_ats_api_common.h" diff --git a/src/ats/test_ats_api_scheduling_check_min_bw_alt.c b/src/ats/test_ats_api_scheduling_check_min_bw_alt.c index ccb100b5d..fcd58cf9d 100644 --- a/src/ats/test_ats_api_scheduling_check_min_bw_alt.c +++ b/src/ats/test_ats_api_scheduling_check_min_bw_alt.c @@ -32,7 +32,7 @@ */ #include "platform.h" #include "gnunet_ats_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "ats.h" #include "test_ats_api_common.h" diff --git a/src/ats/test_ats_api_scheduling_destroy_address.c b/src/ats/test_ats_api_scheduling_destroy_address.c index ee847eec7..93b90dae8 100644 --- a/src/ats/test_ats_api_scheduling_destroy_address.c +++ b/src/ats/test_ats_api_scheduling_destroy_address.c @@ -26,7 +26,7 @@ */ #include "platform.h" #include "gnunet_ats_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "ats.h" #include "test_ats_api_common.h" diff --git a/src/ats/test_ats_api_scheduling_destroy_inbound_connection.c b/src/ats/test_ats_api_scheduling_destroy_inbound_connection.c index bcfc6e81d..fe9885978 100644 --- a/src/ats/test_ats_api_scheduling_destroy_inbound_connection.c +++ b/src/ats/test_ats_api_scheduling_destroy_inbound_connection.c @@ -29,7 +29,7 @@ */ #include "platform.h" #include "gnunet_ats_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "ats.h" #include "test_ats_api_common.h" diff --git a/src/ats/test_ats_api_scheduling_destroy_session.c b/src/ats/test_ats_api_scheduling_destroy_session.c index c783f0a9d..9467bdc59 100644 --- a/src/ats/test_ats_api_scheduling_destroy_session.c +++ b/src/ats/test_ats_api_scheduling_destroy_session.c @@ -29,7 +29,7 @@ */ #include "platform.h" #include "gnunet_ats_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "ats.h" #include "test_ats_api_common.h" diff --git a/src/ats/test_ats_api_scheduling_init.c b/src/ats/test_ats_api_scheduling_init.c index 7ed7c36ee..bd96a4df7 100644 --- a/src/ats/test_ats_api_scheduling_init.c +++ b/src/ats/test_ats_api_scheduling_init.c @@ -26,7 +26,7 @@ */ #include "platform.h" #include "gnunet_ats_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "ats.h" #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) diff --git a/src/ats/test_ats_api_scheduling_min_bw.c b/src/ats/test_ats_api_scheduling_min_bw.c index 2635db891..5a59c23bb 100644 --- a/src/ats/test_ats_api_scheduling_min_bw.c +++ b/src/ats/test_ats_api_scheduling_min_bw.c @@ -25,7 +25,7 @@ */ #include "platform.h" #include "gnunet_ats_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "ats.h" #include "test_ats_api_common.h" diff --git a/src/ats/test_ats_api_scheduling_update_address.c b/src/ats/test_ats_api_scheduling_update_address.c index 0801e6eba..2f52d64ae 100644 --- a/src/ats/test_ats_api_scheduling_update_address.c +++ b/src/ats/test_ats_api_scheduling_update_address.c @@ -26,7 +26,7 @@ */ #include "platform.h" #include "gnunet_ats_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "ats.h" #include "test_ats_api_common.h" diff --git a/src/ats/test_ats_simplistic.c b/src/ats/test_ats_simplistic.c index 643099485..a24c77e0f 100644 --- a/src/ats/test_ats_simplistic.c +++ b/src/ats/test_ats_simplistic.c @@ -32,7 +32,7 @@ */ #include "platform.h" #include "gnunet_ats_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "ats.h" #include "test_ats_api_common.h" diff --git a/src/ats/test_ats_simplistic_change_preference.c b/src/ats/test_ats_simplistic_change_preference.c index e8f430ce1..f004385d1 100644 --- a/src/ats/test_ats_simplistic_change_preference.c +++ b/src/ats/test_ats_simplistic_change_preference.c @@ -32,7 +32,7 @@ */ #include "platform.h" #include "gnunet_ats_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "ats.h" #include "test_ats_api_common.h" diff --git a/src/ats/test_ats_simplistic_switch_networks.c b/src/ats/test_ats_simplistic_switch_networks.c index 4d0fc0ecc..47a4e44cb 100644 --- a/src/ats/test_ats_simplistic_switch_networks.c +++ b/src/ats/test_ats_simplistic_switch_networks.c @@ -25,7 +25,7 @@ */ #include "platform.h" #include "gnunet_ats_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "ats.h" #include "test_ats_api_common.h" diff --git a/src/consensus/test_consensus_api.c b/src/consensus/test_consensus_api.c index 53f04c8b1..8a263171f 100644 --- a/src/consensus/test_consensus_api.c +++ b/src/consensus/test_consensus_api.c @@ -24,7 +24,7 @@ #include "platform.h" #include "gnunet_util_lib.h" #include "gnunet_consensus_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" static struct GNUNET_CONSENSUS_Handle *consensus1; diff --git a/src/core/test_core_api_send_to_self.c b/src/core/test_core_api_send_to_self.c index 626c5e15e..c56e227e5 100644 --- a/src/core/test_core_api_send_to_self.c +++ b/src/core/test_core_api_send_to_self.c @@ -25,7 +25,7 @@ */ #include "platform.h" #include "gnunet_util_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_protocols.h" #include "gnunet_core_service.h" #include "gnunet_constants.h" diff --git a/src/datacache/perf_datacache.c b/src/datacache/perf_datacache.c index e30ae869d..84775a314 100644 --- a/src/datacache/perf_datacache.c +++ b/src/datacache/perf_datacache.c @@ -25,7 +25,7 @@ #include "platform.h" #include "gnunet_util_lib.h" #include "gnunet_datacache_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include diff --git a/src/datacache/test_datacache.c b/src/datacache/test_datacache.c index 5162924f7..8c429cc7a 100644 --- a/src/datacache/test_datacache.c +++ b/src/datacache/test_datacache.c @@ -25,7 +25,7 @@ #include "platform.h" #include "gnunet_util_lib.h" #include "gnunet_datacache_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #define ASSERT(x) do { if (! (x)) { printf("Error at %s:%d\n", __FILE__, __LINE__); goto FAILURE;} } while (0) diff --git a/src/datacache/test_datacache_quota.c b/src/datacache/test_datacache_quota.c index cac4d1878..0400b5051 100644 --- a/src/datacache/test_datacache_quota.c +++ b/src/datacache/test_datacache_quota.c @@ -25,7 +25,7 @@ #include "platform.h" #include "gnunet_util_lib.h" #include "gnunet_datacache_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #define ASSERT(x) do { if (! (x)) { printf("Error at %s:%d\n", __FILE__, __LINE__); goto FAILURE;} } while (0) diff --git a/src/datastore/perf_datastore_api.c b/src/datastore/perf_datastore_api.c index db59365b6..cf21ebe44 100644 --- a/src/datastore/perf_datastore_api.c +++ b/src/datastore/perf_datastore_api.c @@ -36,7 +36,7 @@ #include "gnunet_util_lib.h" #include "gnunet_protocols.h" #include "gnunet_datastore_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include /** diff --git a/src/datastore/perf_plugin_datastore.c b/src/datastore/perf_plugin_datastore.c index 111e57b59..bf15d961e 100644 --- a/src/datastore/perf_plugin_datastore.c +++ b/src/datastore/perf_plugin_datastore.c @@ -27,7 +27,7 @@ #include "gnunet_util_lib.h" #include "gnunet_protocols.h" #include "gnunet_datastore_plugin.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include /** diff --git a/src/datastore/test_datastore_api.c b/src/datastore/test_datastore_api.c index 15e6afa4a..66ba416af 100644 --- a/src/datastore/test_datastore_api.c +++ b/src/datastore/test_datastore_api.c @@ -30,7 +30,7 @@ #include "gnunet_util_lib.h" #include "gnunet_protocols.h" #include "gnunet_datastore_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" /** diff --git a/src/datastore/test_datastore_api_management.c b/src/datastore/test_datastore_api_management.c index b8f042e50..9eae32f4a 100644 --- a/src/datastore/test_datastore_api_management.c +++ b/src/datastore/test_datastore_api_management.c @@ -26,7 +26,7 @@ #include "gnunet_util_lib.h" #include "gnunet_protocols.h" #include "gnunet_datastore_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" /** diff --git a/src/datastore/test_plugin_datastore.c b/src/datastore/test_plugin_datastore.c index 5aba51123..adfacef0c 100644 --- a/src/datastore/test_plugin_datastore.c +++ b/src/datastore/test_plugin_datastore.c @@ -27,7 +27,7 @@ #include "gnunet_util_lib.h" #include "gnunet_protocols.h" #include "gnunet_datastore_plugin.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" /** * Number of put operations to perform. diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am index b6d3317eb..6bbc19188 100644 --- a/src/dht/Makefile.am +++ b/src/dht/Makefile.am @@ -32,7 +32,7 @@ libgnunetdht_la_LIBADD = \ $(LTLIBINTL) libgnunetdht_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) $(WINFLAGS) \ - -version-info 1:1:1 + -version-info 2:0:2 plugin_LTLIBRARIES = \ diff --git a/src/dht/test_dht_api.c b/src/dht/test_dht_api.c index 04a0cf26d..b1c39e893 100644 --- a/src/dht/test_dht_api.c +++ b/src/dht/test_dht_api.c @@ -27,7 +27,7 @@ #include "platform.h" #include "gnunet_util_lib.h" #include "gnunet_hello_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_dht_service.h" diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am index 9b28422ac..068d16fd9 100644 --- a/src/dns/Makefile.am +++ b/src/dns/Makefile.am @@ -89,7 +89,7 @@ libgnunetdnsparser_la_LIBADD = \ -lidn libgnunetdnsparser_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) \ - -version-info 0:0:0 + -version-info 1:0:1 libgnunetdnsstub_la_SOURCES = \ dnsstub.c diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index 291f3612b..84c0a61d9 100644 --- a/src/fs/Makefile.am +++ b/src/fs/Makefile.am @@ -52,7 +52,7 @@ libgnunetfs_la_LIBADD = \ libgnunetfs_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) $(WINFLAGS) \ - -version-info 2:2:0 + -version-info 3:0:1 libgnunetfstest_a_SOURCES = \ diff --git a/src/fs/test_fs_download.c b/src/fs/test_fs_download.c index e1c2fbd68..a62cf23a0 100644 --- a/src/fs/test_fs_download.c +++ b/src/fs/test_fs_download.c @@ -27,7 +27,7 @@ #include "platform.h" #include "gnunet_util_lib.h" #include "gnunet_fs_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include /** diff --git a/src/fs/test_fs_download_persistence.c b/src/fs/test_fs_download_persistence.c index a5f014db5..d5883874d 100644 --- a/src/fs/test_fs_download_persistence.c +++ b/src/fs/test_fs_download_persistence.c @@ -25,7 +25,7 @@ */ #include "platform.h" #include "gnunet_util_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_fs_service.h" /** diff --git a/src/fs/test_fs_list_indexed.c b/src/fs/test_fs_list_indexed.c index 3166bf980..91dad7ca9 100644 --- a/src/fs/test_fs_list_indexed.c +++ b/src/fs/test_fs_list_indexed.c @@ -29,7 +29,7 @@ */ #include "platform.h" #include "gnunet_util_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_fs_service.h" /** diff --git a/src/fs/test_fs_namespace.c b/src/fs/test_fs_namespace.c index 69fead2d6..e4ac4931e 100644 --- a/src/fs/test_fs_namespace.c +++ b/src/fs/test_fs_namespace.c @@ -25,7 +25,7 @@ */ #include "platform.h" #include "gnunet_util_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_fs_service.h" diff --git a/src/fs/test_fs_namespace_list_updateable.c b/src/fs/test_fs_namespace_list_updateable.c index 10e5c9be7..dc17ce458 100644 --- a/src/fs/test_fs_namespace_list_updateable.c +++ b/src/fs/test_fs_namespace_list_updateable.c @@ -25,7 +25,7 @@ */ #include "platform.h" #include "gnunet_util_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_fs_service.h" diff --git a/src/fs/test_fs_publish.c b/src/fs/test_fs_publish.c index 622dd5a42..e51d6e5d4 100644 --- a/src/fs/test_fs_publish.c +++ b/src/fs/test_fs_publish.c @@ -25,7 +25,7 @@ */ #include "platform.h" #include "gnunet_util_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_fs_service.h" /** diff --git a/src/fs/test_fs_publish_persistence.c b/src/fs/test_fs_publish_persistence.c index 985732739..577831a28 100644 --- a/src/fs/test_fs_publish_persistence.c +++ b/src/fs/test_fs_publish_persistence.c @@ -24,7 +24,7 @@ */ #include "platform.h" #include "gnunet_util_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_fs_service.h" diff --git a/src/fs/test_fs_search.c b/src/fs/test_fs_search.c index 9a6ba90a4..cf4a9cb41 100644 --- a/src/fs/test_fs_search.c +++ b/src/fs/test_fs_search.c @@ -24,7 +24,7 @@ */ #include "platform.h" #include "gnunet_util_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_fs_service.h" diff --git a/src/fs/test_fs_search_persistence.c b/src/fs/test_fs_search_persistence.c index e2f97a5e1..d66c5ec8e 100644 --- a/src/fs/test_fs_search_persistence.c +++ b/src/fs/test_fs_search_persistence.c @@ -24,7 +24,7 @@ */ #include "platform.h" #include "gnunet_util_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_fs_service.h" diff --git a/src/fs/test_fs_search_probes.c b/src/fs/test_fs_search_probes.c index e69251d40..0b02532e8 100644 --- a/src/fs/test_fs_search_probes.c +++ b/src/fs/test_fs_search_probes.c @@ -25,7 +25,7 @@ */ #include "platform.h" #include "gnunet_util_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_fs_service.h" diff --git a/src/fs/test_fs_start_stop.c b/src/fs/test_fs_start_stop.c index a1f595a2d..463274e48 100644 --- a/src/fs/test_fs_start_stop.c +++ b/src/fs/test_fs_start_stop.c @@ -25,7 +25,7 @@ #include "platform.h" #include "gnunet_util_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_fs_service.h" diff --git a/src/fs/test_fs_unindex.c b/src/fs/test_fs_unindex.c index 0ff22ab29..6b89dcad8 100644 --- a/src/fs/test_fs_unindex.c +++ b/src/fs/test_fs_unindex.c @@ -26,7 +26,7 @@ #include "platform.h" #include "gnunet_util_lib.h" #include "gnunet_fs_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" /** diff --git a/src/fs/test_fs_unindex_persistence.c b/src/fs/test_fs_unindex_persistence.c index dba9d23d6..3e2cd9810 100644 --- a/src/fs/test_fs_unindex_persistence.c +++ b/src/fs/test_fs_unindex_persistence.c @@ -25,7 +25,7 @@ */ #include "platform.h" #include "gnunet_util_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_fs_service.h" /** diff --git a/src/gns/test_gns_cname_lookup.c b/src/gns/test_gns_cname_lookup.c index 643a79033..6870e897a 100644 --- a/src/gns/test_gns_cname_lookup.c +++ b/src/gns/test_gns_cname_lookup.c @@ -23,7 +23,7 @@ * @author Martin Schanzenbach */ #include "platform.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_core_service.h" #include "block_dns.h" #include "gnunet_signatures.h" diff --git a/src/gns/test_gns_dht_delegated_lookup.c b/src/gns/test_gns_dht_delegated_lookup.c index f9531751a..1eb77d821 100644 --- a/src/gns/test_gns_dht_delegated_lookup.c +++ b/src/gns/test_gns_dht_delegated_lookup.c @@ -23,7 +23,7 @@ * */ #include "platform.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_core_service.h" #include "block_gns.h" #include "gnunet_signatures.h" diff --git a/src/gns/test_gns_dht_three_peers.c b/src/gns/test_gns_dht_three_peers.c index ecfe36e44..5791e399f 100644 --- a/src/gns/test_gns_dht_three_peers.c +++ b/src/gns/test_gns_dht_three_peers.c @@ -30,7 +30,7 @@ #include "platform.h" #include "gnunet_common.h" #include "gnunet_disk_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_testbed_service.h" #include "gnunet_core_service.h" #include "gnunet_dht_service.h" diff --git a/src/gns/test_gns_max_queries.c b/src/gns/test_gns_max_queries.c index aadd1a8fa..00caf8335 100644 --- a/src/gns/test_gns_max_queries.c +++ b/src/gns/test_gns_max_queries.c @@ -23,7 +23,7 @@ * in particular query replacement and clean shutdown */ #include "platform.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_core_service.h" #include "block_dns.h" #include "gns.h" diff --git a/src/gns/test_gns_ns_lookup.c b/src/gns/test_gns_ns_lookup.c index f0a43ce18..42d8f683c 100644 --- a/src/gns/test_gns_ns_lookup.c +++ b/src/gns/test_gns_ns_lookup.c @@ -23,7 +23,7 @@ * @author Martin Schanzenbach */ #include "platform.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_core_service.h" #include "block_dns.h" #include "gnunet_signatures.h" diff --git a/src/gns/test_gns_proxy.c b/src/gns/test_gns_proxy.c index 4fcd2fd56..1b904cec9 100644 --- a/src/gns/test_gns_proxy.c +++ b/src/gns/test_gns_proxy.c @@ -28,7 +28,7 @@ #include #include "gnunet_namestore_service.h" #include "gnunet_gns_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_os_lib.h" #define PORT 8080 diff --git a/src/gns/test_gns_pseu_shorten.c b/src/gns/test_gns_pseu_shorten.c index c7d8cfc0f..5e2f1fc11 100644 --- a/src/gns/test_gns_pseu_shorten.c +++ b/src/gns/test_gns_pseu_shorten.c @@ -23,7 +23,7 @@ * */ #include "platform.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_core_service.h" #include "block_gns.h" #include "gnunet_signatures.h" diff --git a/src/gns/test_gns_revocation.c b/src/gns/test_gns_revocation.c index a6bbd9ad1..8e677880a 100644 --- a/src/gns/test_gns_revocation.c +++ b/src/gns/test_gns_revocation.c @@ -23,7 +23,7 @@ * */ #include "platform.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_core_service.h" #include "block_dns.h" #include "gnunet_signatures.h" diff --git a/src/gns/test_gns_simple_delegated_lookup.c b/src/gns/test_gns_simple_delegated_lookup.c index c01bd8cce..393ddfb0e 100644 --- a/src/gns/test_gns_simple_delegated_lookup.c +++ b/src/gns/test_gns_simple_delegated_lookup.c @@ -37,7 +37,7 @@ * the peers. */ #include "platform.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_core_service.h" #include "block_dns.h" #include "gnunet_signatures.h" diff --git a/src/gns/test_gns_simple_get_authority.c b/src/gns/test_gns_simple_get_authority.c index 66d93d6a2..111f8f1f9 100644 --- a/src/gns/test_gns_simple_get_authority.c +++ b/src/gns/test_gns_simple_get_authority.c @@ -23,7 +23,7 @@ * */ #include "platform.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_core_service.h" #include "block_dns.h" #include "gnunet_signatures.h" diff --git a/src/gns/test_gns_simple_lookup.c b/src/gns/test_gns_simple_lookup.c index 8204b03eb..96283df5b 100644 --- a/src/gns/test_gns_simple_lookup.c +++ b/src/gns/test_gns_simple_lookup.c @@ -23,7 +23,7 @@ * @author Martin Schanzenbach */ #include "platform.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_core_service.h" #include "block_dns.h" #include "gnunet_signatures.h" diff --git a/src/gns/test_gns_simple_mx_lookup.c b/src/gns/test_gns_simple_mx_lookup.c index d2ca08c75..cfaea67ad 100644 --- a/src/gns/test_gns_simple_mx_lookup.c +++ b/src/gns/test_gns_simple_mx_lookup.c @@ -23,7 +23,7 @@ * */ #include "platform.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_core_service.h" #include "block_dns.h" #include "gnunet_signatures.h" diff --git a/src/gns/test_gns_simple_shorten.c b/src/gns/test_gns_simple_shorten.c index 649dea59b..c6d49f82f 100644 --- a/src/gns/test_gns_simple_shorten.c +++ b/src/gns/test_gns_simple_shorten.c @@ -23,7 +23,7 @@ * */ #include "platform.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_core_service.h" #include "block_dns.h" #include "gnunet_signatures.h" diff --git a/src/gns/test_gns_simple_srv_lookup.c b/src/gns/test_gns_simple_srv_lookup.c index 564179d19..40e5aec8d 100644 --- a/src/gns/test_gns_simple_srv_lookup.c +++ b/src/gns/test_gns_simple_srv_lookup.c @@ -23,7 +23,7 @@ * */ #include "platform.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_core_service.h" #include "block_dns.h" #include "gnunet_signatures.h" diff --git a/src/gns/test_gns_simple_zkey_lookup.c b/src/gns/test_gns_simple_zkey_lookup.c index eaf97b9cc..dd1a3f7bd 100644 --- a/src/gns/test_gns_simple_zkey_lookup.c +++ b/src/gns/test_gns_simple_zkey_lookup.c @@ -23,7 +23,7 @@ * */ #include "platform.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_core_service.h" #include "block_dns.h" #include "gnunet_signatures.h" diff --git a/src/hello/Makefile.am b/src/hello/Makefile.am index 18cb6b29c..fd5a41bea 100644 --- a/src/hello/Makefile.am +++ b/src/hello/Makefile.am @@ -18,7 +18,7 @@ libgnunethello_la_LIBADD = \ $(LTLIBINTL) libgnunethello_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) \ - -version-info 0:0:0 + -version-info 1:0:1 noinst_PROGRAMS = \ gnunet-hello diff --git a/src/include/Makefile.am b/src/include/Makefile.am index d95a670fe..1272a2fff 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am @@ -80,7 +80,6 @@ gnunetinclude_HEADERS = \ gnunet_strings_lib.h \ gnunet_testbed_service.h \ gnunet_testing_lib.h \ - gnunet_testing_lib-new.h \ gnunet_time_lib.h \ gnunet_transport_service.h \ gnunet_transport_plugin.h \ diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h index 6732d19ea..470069419 100644 --- a/src/include/gnunet_common.h +++ b/src/include/gnunet_common.h @@ -57,7 +57,7 @@ extern "C" /** * Version of the API (for entire gnunetutil.so library). */ -#define GNUNET_UTIL_VERSION 0x00090400 +#define GNUNET_UTIL_VERSION 0x00090500 /** * Named constants for return values. The following diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h index a5bda3754..8e5e9a47c 100644 --- a/src/include/gnunet_testbed_service.h +++ b/src/include/gnunet_testbed_service.h @@ -29,7 +29,7 @@ #define GNUNET_TESTBED_SERVICE_H #include "gnunet_util_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #ifdef __cplusplus extern "C" diff --git a/src/include/gnunet_testing_lib-new.h b/src/include/gnunet_testing_lib-new.h deleted file mode 100644 index 6eac07acb..000000000 --- a/src/include/gnunet_testing_lib-new.h +++ /dev/null @@ -1,372 +0,0 @@ -/* - This file is part of GNUnet - (C) 2008, 2009, 2012 Christian Grothoff (and other contributing authors) - - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - */ - -/** - * @file include/gnunet_testing_lib-new.h - * @brief convenience API for writing testcases for GNUnet; - * can start/stop one or more peers on a system; - * testing is responsible for managing private keys, - * ports and paths; it is a low-level library that - * does not support higher-level functions such as - * P2P connection, topology management or distributed - * testbed maintenance (those are in gnunet_testbed_service.h) - * @author Christian Grothoff - */ - -#ifndef GNUNET_TESTING_LIB_NEW_H -#define GNUNET_TESTING_LIB_NEW_H - -#include "gnunet_util_lib.h" -#include "gnunet_statistics_service.h" - -#ifdef __cplusplus -extern "C" -{ -#if 0 /* keep Emacsens' auto-indent happy */ -} -#endif -#endif - -#define GNUNET_TESTING_HOSTKEYFILESIZE 914 - -/** - * Handle for a system on which GNUnet peers are executed; - * a system is used for reserving unique paths and ports. - */ -struct GNUNET_TESTING_System; - - -/** - * Handle for a GNUnet peer controlled by testing. - */ -struct GNUNET_TESTING_Peer; - - -/** - * Create a system handle. There must only be one system handle per operating - * system. Uses a default range for allowed ports. Ports are still tested for - * availability. - * - * @param testdir only the directory name without any path. This is used for all - * service homes; the directory will be created in a temporary location - * depending on the underlying OS - * @param trusted_ip the ip address which will be set as TRUSTED HOST in all - * service configurations generated to allow control connections from - * this ip. This can either be a single ip address or a network address - * in CIDR notation. - * @param hostname the hostname of the system we are using for testing; NULL for - * localhost - * @return handle to this system, NULL on error - */ -struct GNUNET_TESTING_System * -GNUNET_TESTING_system_create (const char *testdir, - const char *trusted_ip, - const char *hostname); - - -/** - * Create a system handle. There must only be one system - * handle per operating system. Use this function directly - * if multiple system objects are created for the same host - * (only really useful when testing --- or to make the port - * range configureable). - * - * @param testdir only the directory name without any path. This is used for - * all service homes; the directory will be created in a temporary - * location depending on the underlying OS - * @param trusted_ip the ip address which will be set as TRUSTED HOST in all - * service configurations generated to allow control connections from - * this ip. This can either be a single ip address or a network address - * in CIDR notation. - * @param controller hostname of the controlling host, - * service configurations are modified to allow - * control connections from this host; can be NULL - * @param hostname the hostname of the system we are using for testing; NULL for - * localhost - * @param lowport lowest port number this system is allowed to allocate (inclusive) - * @param highport highest port number this system is allowed to allocate (exclusive) - * @return handle to this system, NULL on error - */ -struct GNUNET_TESTING_System * -GNUNET_TESTING_system_create_with_portrange (const char *testdir, - const char *trusted_ip, - const char *hostname, - uint16_t lowport, - uint16_t highport); - - -/** - * Free system resources. - * - * @param system system to be freed - * @param remove_paths should the 'testdir' and all subdirectories - * be removed (clean up on shutdown)? - */ -void -GNUNET_TESTING_system_destroy (struct GNUNET_TESTING_System *system, - int remove_paths); - - -/** - * Testing includes a number of pre-created hostkeys for - * faster peer startup. This function can be used to - * access the n-th key of those pre-created hostkeys; note - * that these keys are ONLY useful for testing and not - * secure as the private keys are part of the public - * GNUnet source code. - * - * This is primarily a helper function used internally - * by 'GNUNET_TESTING_peer_configure'. - * - * @param system the testing system handle - * @param key_number desired pre-created hostkey to obtain - * @param id set to the peer's identity (hash of the public - * key; if NULL, GNUNET_SYSERR is returned immediately - * @return NULL on error (not enough keys) - */ -struct GNUNET_CRYPTO_RsaPrivateKey * -GNUNET_TESTING_hostkey_get (const struct GNUNET_TESTING_System *system, - uint32_t key_number, - struct GNUNET_PeerIdentity *id); - - -/** - * Reserve a TCP or UDP port for a peer. - * - * @param system system to use for reservation tracking - * @param is_tcp GNUNET_YES for TCP ports, GNUNET_NO for UDP - * @return 0 if no free port was available - */ -uint16_t -GNUNET_TESTING_reserve_port (struct GNUNET_TESTING_System *system, - int is_tcp); - - -/** - * Release reservation of a TCP or UDP port for a peer - * (used during GNUNET_TESTING_peer_destroy). - * - * @param system system to use for reservation tracking - * @param is_tcp GNUNET_YES for TCP ports, GNUNET_NO for UDP - * @param port reserved port to release - */ -void -GNUNET_TESTING_release_port (struct GNUNET_TESTING_System *system, - int is_tcp, - uint16_t port); - - -/** - * Create a new configuration using the given configuration as a template; - * ports and paths will be modified to select available ports on the local - * system. The default configuration will be available in PATHS section under - * the option DEFAULTCONFIG after the call. SERVICE_HOME is also set in PATHS - * section to the temporary directory specific to this configuration. If we run - * out of "*port" numbers, return SYSERR. - * - * This is primarily a helper function used internally - * by 'GNUNET_TESTING_peer_configure'. - * - * @param system system to use to coordinate resource usage - * @param cfg template configuration to update - * @return GNUNET_OK on success, GNUNET_SYSERR on error - the configuration will - * be incomplete and should not be used there upon - */ -int -GNUNET_TESTING_configuration_create (struct GNUNET_TESTING_System *system, - struct GNUNET_CONFIGURATION_Handle *cfg); -// FIXME: add dual to 'release' ports again... - - -/** - * Configure a GNUnet peer. GNUnet must be installed on the local - * system and available in the PATH. - * - * @param system system to use to coordinate resource usage - * @param cfg configuration to use; will be UPDATED (to reflect needed - * changes in port numbers and paths) - * @param key_number number of the hostkey to use for the peer - * @param id identifier for the daemon, will be set, can be NULL - * @param emsg set to freshly allocated error message (set to NULL on success), - * can be NULL - * @return handle to the peer, NULL on error - */ -struct GNUNET_TESTING_Peer * -GNUNET_TESTING_peer_configure (struct GNUNET_TESTING_System *system, - struct GNUNET_CONFIGURATION_Handle *cfg, - uint32_t key_number, - struct GNUNET_PeerIdentity *id, - char **emsg); - - -/** - * Obtain the peer identity from a peer handle. - * - * @param peer peer handle for which we want the peer's identity - * @param id identifier for the daemon, will be set - */ -void -GNUNET_TESTING_peer_get_identity (const struct GNUNET_TESTING_Peer *peer, - struct GNUNET_PeerIdentity *id); - - -/** - * Start the peer. - * - * @param peer peer to start - * @return GNUNET_OK on success, GNUNET_SYSERR on error (i.e. peer already running) - */ -int -GNUNET_TESTING_peer_start (struct GNUNET_TESTING_Peer *peer); - - -/** - * Stop the peer. - * - * @param peer peer to stop - * @return GNUNET_OK on success, GNUNET_SYSERR on error (i.e. peer not running) - */ -int -GNUNET_TESTING_peer_stop (struct GNUNET_TESTING_Peer *peer); - - -/** - * Destroy the peer. Releases resources locked during peer configuration. - * If the peer is still running, it will be stopped AND a warning will be - * printed (users of the API should stop the peer explicitly first). - * - * @param peer peer to destroy - */ -void -GNUNET_TESTING_peer_destroy (struct GNUNET_TESTING_Peer *peer); - - -/** - * Sends SIGTERM to the peer's main process - * - * @param peer the handle to the peer - * @return GNUNET_OK if successful; GNUNET_SYSERR if the main process is NULL - * or upon any error while sending SIGTERM - */ -int -GNUNET_TESTING_peer_kill (struct GNUNET_TESTING_Peer *peer); - - -/** - * Waits for a peer to terminate. The peer's main process will also be destroyed. - * - * @param peer the handle to the peer - * @return GNUNET_OK if successful; GNUNET_SYSERR if the main process is NULL - * or upon any error while waiting - */ -int -GNUNET_TESTING_peer_wait (struct GNUNET_TESTING_Peer *peer); - - -/** - * Signature of the 'main' function for a (single-peer) testcase that - * is run using 'GNUNET_TESTING_peer_run'. - * - * @param cls closure - * @param cfg configuration of the peer that was started - * @param peer identity of the peer that was created - */ -typedef void (*GNUNET_TESTING_TestMain)(void *cls, - const struct GNUNET_CONFIGURATION_Handle *cfg, - struct GNUNET_TESTING_Peer *peer); - - -/** - * Start a single peer and run a test using the testing library. - * Starts a peer using the given configuration and then invokes the - * given callback. This function ALSO initializes the scheduler loop - * and should thus be called directly from "main". The testcase - * should self-terminate by invoking 'GNUNET_SCHEDULER_shutdown'. - * - * @param testdir only the directory name without any path. This is used for - * all service homes; the directory will be created in a temporary - * location depending on the underlying OS - * @param cfgfilename name of the configuration file to use; - * use NULL to only run with defaults - * @param tm main function of the testcase - * @param tm_cls closure for 'tm' - * @return 0 on success, 1 on error - */ -int -GNUNET_TESTING_peer_run (const char *testdir, - const char *cfgfilename, - GNUNET_TESTING_TestMain tm, - void *tm_cls); - - -/** - * Start a single service (no ARM, except of course if the given - * service name is 'arm') and run a test using the testing library. - * Starts a service using the given configuration and then invokes the - * given callback. This function ALSO initializes the scheduler loop - * and should thus be called directly from "main". The testcase - * should self-terminate by invoking 'GNUNET_SCHEDULER_shutdown'. - * - * This function is useful if the testcase is for a single service - * and if that service doesn't itself depend on other services. - * - * @param testdir only the directory name without any path. This is used for - * all service homes; the directory will be created in a temporary - * location depending on the underlying OS - * @param service_name name of the service to run - * @param cfgfilename name of the configuration file to use; - * use NULL to only run with defaults - * @param tm main function of the testcase - * @param tm_cls closure for 'tm' - * @return 0 on success, 1 on error - */ -int -GNUNET_TESTING_service_run (const char *testdir, - const char *service_name, - const char *cfgfilename, - GNUNET_TESTING_TestMain tm, - void *tm_cls); - - -/** - * Sometimes we use the binary name to determine which specific - * test to run. In those cases, the string after the last "_" - * in 'argv[0]' specifies a string that determines the configuration - * file or plugin to use. - * - * This function returns the respective substring, taking care - * of issues such as binaries ending in '.exe' on W32. - * - * @param argv0 the name of the binary - * @return string between the last '_' and the '.exe' (or the end of the string), - * NULL if argv0 has no '_' - */ -char * -GNUNET_TESTING_get_testname_from_underscore (const char *argv0); - - -#if 0 /* keep Emacsens' auto-indent happy */ -{ -#endif -#ifdef __cplusplus -} -#endif - -#endif diff --git a/src/include/gnunet_testing_lib.h b/src/include/gnunet_testing_lib.h new file mode 100644 index 000000000..c34166b2e --- /dev/null +++ b/src/include/gnunet_testing_lib.h @@ -0,0 +1,372 @@ +/* + This file is part of GNUnet + (C) 2008, 2009, 2012 Christian Grothoff (and other contributing authors) + + GNUnet is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 3, 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 + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with GNUnet; see the file COPYING. If not, write to the + Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. + */ + +/** + * @file include/gnunet_testing_lib.h + * @brief convenience API for writing testcases for GNUnet; + * can start/stop one or more peers on a system; + * testing is responsible for managing private keys, + * ports and paths; it is a low-level library that + * does not support higher-level functions such as + * P2P connection, topology management or distributed + * testbed maintenance (those are in gnunet_testbed_service.h) + * @author Christian Grothoff + */ + +#ifndef GNUNET_TESTING_LIB_H +#define GNUNET_TESTING_LIB_H + +#include "gnunet_util_lib.h" +#include "gnunet_statistics_service.h" + +#ifdef __cplusplus +extern "C" +{ +#if 0 /* keep Emacsens' auto-indent happy */ +} +#endif +#endif + +#define GNUNET_TESTING_HOSTKEYFILESIZE 914 + +/** + * Handle for a system on which GNUnet peers are executed; + * a system is used for reserving unique paths and ports. + */ +struct GNUNET_TESTING_System; + + +/** + * Handle for a GNUnet peer controlled by testing. + */ +struct GNUNET_TESTING_Peer; + + +/** + * Create a system handle. There must only be one system handle per operating + * system. Uses a default range for allowed ports. Ports are still tested for + * availability. + * + * @param testdir only the directory name without any path. This is used for all + * service homes; the directory will be created in a temporary location + * depending on the underlying OS + * @param trusted_ip the ip address which will be set as TRUSTED HOST in all + * service configurations generated to allow control connections from + * this ip. This can either be a single ip address or a network address + * in CIDR notation. + * @param hostname the hostname of the system we are using for testing; NULL for + * localhost + * @return handle to this system, NULL on error + */ +struct GNUNET_TESTING_System * +GNUNET_TESTING_system_create (const char *testdir, + const char *trusted_ip, + const char *hostname); + + +/** + * Create a system handle. There must only be one system + * handle per operating system. Use this function directly + * if multiple system objects are created for the same host + * (only really useful when testing --- or to make the port + * range configureable). + * + * @param testdir only the directory name without any path. This is used for + * all service homes; the directory will be created in a temporary + * location depending on the underlying OS + * @param trusted_ip the ip address which will be set as TRUSTED HOST in all + * service configurations generated to allow control connections from + * this ip. This can either be a single ip address or a network address + * in CIDR notation. + * @param controller hostname of the controlling host, + * service configurations are modified to allow + * control connections from this host; can be NULL + * @param hostname the hostname of the system we are using for testing; NULL for + * localhost + * @param lowport lowest port number this system is allowed to allocate (inclusive) + * @param highport highest port number this system is allowed to allocate (exclusive) + * @return handle to this system, NULL on error + */ +struct GNUNET_TESTING_System * +GNUNET_TESTING_system_create_with_portrange (const char *testdir, + const char *trusted_ip, + const char *hostname, + uint16_t lowport, + uint16_t highport); + + +/** + * Free system resources. + * + * @param system system to be freed + * @param remove_paths should the 'testdir' and all subdirectories + * be removed (clean up on shutdown)? + */ +void +GNUNET_TESTING_system_destroy (struct GNUNET_TESTING_System *system, + int remove_paths); + + +/** + * Testing includes a number of pre-created hostkeys for + * faster peer startup. This function can be used to + * access the n-th key of those pre-created hostkeys; note + * that these keys are ONLY useful for testing and not + * secure as the private keys are part of the public + * GNUnet source code. + * + * This is primarily a helper function used internally + * by 'GNUNET_TESTING_peer_configure'. + * + * @param system the testing system handle + * @param key_number desired pre-created hostkey to obtain + * @param id set to the peer's identity (hash of the public + * key; if NULL, GNUNET_SYSERR is returned immediately + * @return NULL on error (not enough keys) + */ +struct GNUNET_CRYPTO_RsaPrivateKey * +GNUNET_TESTING_hostkey_get (const struct GNUNET_TESTING_System *system, + uint32_t key_number, + struct GNUNET_PeerIdentity *id); + + +/** + * Reserve a TCP or UDP port for a peer. + * + * @param system system to use for reservation tracking + * @param is_tcp GNUNET_YES for TCP ports, GNUNET_NO for UDP + * @return 0 if no free port was available + */ +uint16_t +GNUNET_TESTING_reserve_port (struct GNUNET_TESTING_System *system, + int is_tcp); + + +/** + * Release reservation of a TCP or UDP port for a peer + * (used during GNUNET_TESTING_peer_destroy). + * + * @param system system to use for reservation tracking + * @param is_tcp GNUNET_YES for TCP ports, GNUNET_NO for UDP + * @param port reserved port to release + */ +void +GNUNET_TESTING_release_port (struct GNUNET_TESTING_System *system, + int is_tcp, + uint16_t port); + + +/** + * Create a new configuration using the given configuration as a template; + * ports and paths will be modified to select available ports on the local + * system. The default configuration will be available in PATHS section under + * the option DEFAULTCONFIG after the call. SERVICE_HOME is also set in PATHS + * section to the temporary directory specific to this configuration. If we run + * out of "*port" numbers, return SYSERR. + * + * This is primarily a helper function used internally + * by 'GNUNET_TESTING_peer_configure'. + * + * @param system system to use to coordinate resource usage + * @param cfg template configuration to update + * @return GNUNET_OK on success, GNUNET_SYSERR on error - the configuration will + * be incomplete and should not be used there upon + */ +int +GNUNET_TESTING_configuration_create (struct GNUNET_TESTING_System *system, + struct GNUNET_CONFIGURATION_Handle *cfg); +// FIXME: add dual to 'release' ports again... + + +/** + * Configure a GNUnet peer. GNUnet must be installed on the local + * system and available in the PATH. + * + * @param system system to use to coordinate resource usage + * @param cfg configuration to use; will be UPDATED (to reflect needed + * changes in port numbers and paths) + * @param key_number number of the hostkey to use for the peer + * @param id identifier for the daemon, will be set, can be NULL + * @param emsg set to freshly allocated error message (set to NULL on success), + * can be NULL + * @return handle to the peer, NULL on error + */ +struct GNUNET_TESTING_Peer * +GNUNET_TESTING_peer_configure (struct GNUNET_TESTING_System *system, + struct GNUNET_CONFIGURATION_Handle *cfg, + uint32_t key_number, + struct GNUNET_PeerIdentity *id, + char **emsg); + + +/** + * Obtain the peer identity from a peer handle. + * + * @param peer peer handle for which we want the peer's identity + * @param id identifier for the daemon, will be set + */ +void +GNUNET_TESTING_peer_get_identity (const struct GNUNET_TESTING_Peer *peer, + struct GNUNET_PeerIdentity *id); + + +/** + * Start the peer. + * + * @param peer peer to start + * @return GNUNET_OK on success, GNUNET_SYSERR on error (i.e. peer already running) + */ +int +GNUNET_TESTING_peer_start (struct GNUNET_TESTING_Peer *peer); + + +/** + * Stop the peer. + * + * @param peer peer to stop + * @return GNUNET_OK on success, GNUNET_SYSERR on error (i.e. peer not running) + */ +int +GNUNET_TESTING_peer_stop (struct GNUNET_TESTING_Peer *peer); + + +/** + * Destroy the peer. Releases resources locked during peer configuration. + * If the peer is still running, it will be stopped AND a warning will be + * printed (users of the API should stop the peer explicitly first). + * + * @param peer peer to destroy + */ +void +GNUNET_TESTING_peer_destroy (struct GNUNET_TESTING_Peer *peer); + + +/** + * Sends SIGTERM to the peer's main process + * + * @param peer the handle to the peer + * @return GNUNET_OK if successful; GNUNET_SYSERR if the main process is NULL + * or upon any error while sending SIGTERM + */ +int +GNUNET_TESTING_peer_kill (struct GNUNET_TESTING_Peer *peer); + + +/** + * Waits for a peer to terminate. The peer's main process will also be destroyed. + * + * @param peer the handle to the peer + * @return GNUNET_OK if successful; GNUNET_SYSERR if the main process is NULL + * or upon any error while waiting + */ +int +GNUNET_TESTING_peer_wait (struct GNUNET_TESTING_Peer *peer); + + +/** + * Signature of the 'main' function for a (single-peer) testcase that + * is run using 'GNUNET_TESTING_peer_run'. + * + * @param cls closure + * @param cfg configuration of the peer that was started + * @param peer identity of the peer that was created + */ +typedef void (*GNUNET_TESTING_TestMain)(void *cls, + const struct GNUNET_CONFIGURATION_Handle *cfg, + struct GNUNET_TESTING_Peer *peer); + + +/** + * Start a single peer and run a test using the testing library. + * Starts a peer using the given configuration and then invokes the + * given callback. This function ALSO initializes the scheduler loop + * and should thus be called directly from "main". The testcase + * should self-terminate by invoking 'GNUNET_SCHEDULER_shutdown'. + * + * @param testdir only the directory name without any path. This is used for + * all service homes; the directory will be created in a temporary + * location depending on the underlying OS + * @param cfgfilename name of the configuration file to use; + * use NULL to only run with defaults + * @param tm main function of the testcase + * @param tm_cls closure for 'tm' + * @return 0 on success, 1 on error + */ +int +GNUNET_TESTING_peer_run (const char *testdir, + const char *cfgfilename, + GNUNET_TESTING_TestMain tm, + void *tm_cls); + + +/** + * Start a single service (no ARM, except of course if the given + * service name is 'arm') and run a test using the testing library. + * Starts a service using the given configuration and then invokes the + * given callback. This function ALSO initializes the scheduler loop + * and should thus be called directly from "main". The testcase + * should self-terminate by invoking 'GNUNET_SCHEDULER_shutdown'. + * + * This function is useful if the testcase is for a single service + * and if that service doesn't itself depend on other services. + * + * @param testdir only the directory name without any path. This is used for + * all service homes; the directory will be created in a temporary + * location depending on the underlying OS + * @param service_name name of the service to run + * @param cfgfilename name of the configuration file to use; + * use NULL to only run with defaults + * @param tm main function of the testcase + * @param tm_cls closure for 'tm' + * @return 0 on success, 1 on error + */ +int +GNUNET_TESTING_service_run (const char *testdir, + const char *service_name, + const char *cfgfilename, + GNUNET_TESTING_TestMain tm, + void *tm_cls); + + +/** + * Sometimes we use the binary name to determine which specific + * test to run. In those cases, the string after the last "_" + * in 'argv[0]' specifies a string that determines the configuration + * file or plugin to use. + * + * This function returns the respective substring, taking care + * of issues such as binaries ending in '.exe' on W32. + * + * @param argv0 the name of the binary + * @return string between the last '_' and the '.exe' (or the end of the string), + * NULL if argv0 has no '_' + */ +char * +GNUNET_TESTING_get_testname_from_underscore (const char *argv0); + + +#if 0 /* keep Emacsens' auto-indent happy */ +{ +#endif +#ifdef __cplusplus +} +#endif + +#endif diff --git a/src/lockmanager/test_lockmanager_api.c b/src/lockmanager/test_lockmanager_api.c index eafde89b6..dd9d48fa7 100644 --- a/src/lockmanager/test_lockmanager_api.c +++ b/src/lockmanager/test_lockmanager_api.c @@ -27,7 +27,7 @@ #include "platform.h" #include "gnunet_util_lib.h" #include "gnunet_lockmanager_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" /** * Generic logging shortcut diff --git a/src/lockmanager/test_lockmanager_api_acquireretry.c b/src/lockmanager/test_lockmanager_api_acquireretry.c index 443246bb7..d2c88e5ca 100644 --- a/src/lockmanager/test_lockmanager_api_acquireretry.c +++ b/src/lockmanager/test_lockmanager_api_acquireretry.c @@ -28,7 +28,7 @@ #include "platform.h" #include "gnunet_util_lib.h" #include "gnunet_lockmanager_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" /** * Generic logging shorthand diff --git a/src/lockmanager/test_lockmanager_api_lockrelease.c b/src/lockmanager/test_lockmanager_api_lockrelease.c index 7f8fe5781..ba4881af8 100644 --- a/src/lockmanager/test_lockmanager_api_lockrelease.c +++ b/src/lockmanager/test_lockmanager_api_lockrelease.c @@ -26,7 +26,7 @@ #include "platform.h" #include "gnunet_util_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_lockmanager_service.h" /** diff --git a/src/lockmanager/test_lockmanager_api_servercrash.c b/src/lockmanager/test_lockmanager_api_servercrash.c index 3235e4db7..a37d614a8 100644 --- a/src/lockmanager/test_lockmanager_api_servercrash.c +++ b/src/lockmanager/test_lockmanager_api_servercrash.c @@ -27,7 +27,7 @@ #include "platform.h" #include "gnunet_util_lib.h" #include "gnunet_lockmanager_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" /** * Generic logging shorthand diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am index ab75378ed..41f8c0444 100644 --- a/src/mesh/Makefile.am +++ b/src/mesh/Makefile.am @@ -54,7 +54,7 @@ libgnunetmesh_la_LIBADD = \ $(LTLIBINTL) libgnunetmesh_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) $(WINFLAGS) \ - -version-info 1:0:0 + -version-info 2:0:1 libgnunetmeshblock_la_SOURCES = \ mesh_block_lib.c mesh_block_lib.h diff --git a/src/mesh/test_mesh_api.c b/src/mesh/test_mesh_api.c index dcac19085..349ec80f0 100644 --- a/src/mesh/test_mesh_api.c +++ b/src/mesh/test_mesh_api.c @@ -25,7 +25,7 @@ */ #include "platform.h" #include "gnunet_util_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_dht_service.h" #include "gnunet_mesh_service.h" diff --git a/src/mesh/test_mesh_local_1.c b/src/mesh/test_mesh_local_1.c index d143f0913..4f40688f5 100644 --- a/src/mesh/test_mesh_local_1.c +++ b/src/mesh/test_mesh_local_1.c @@ -27,7 +27,7 @@ #include "platform.h" #include "gnunet_util_lib.h" #include "gnunet_dht_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_mesh_service.h" diff --git a/src/mesh/test_mesh_local_2.c b/src/mesh/test_mesh_local_2.c index d4b5e004b..935c3b2eb 100644 --- a/src/mesh/test_mesh_local_2.c +++ b/src/mesh/test_mesh_local_2.c @@ -26,7 +26,7 @@ #include "platform.h" #include "gnunet_util_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_dht_service.h" #include "gnunet_mesh_service.h" diff --git a/src/mesh/test_mesh_local_traffic.c b/src/mesh/test_mesh_local_traffic.c index b422c64e8..cd54ea8eb 100644 --- a/src/mesh/test_mesh_local_traffic.c +++ b/src/mesh/test_mesh_local_traffic.c @@ -27,7 +27,7 @@ #include "platform.h" #include "gnunet_util_lib.h" #include "gnunet_mesh_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5) diff --git a/src/namestore/test_namestore_api.c b/src/namestore/test_namestore_api.c index c0b20268b..c290673fa 100644 --- a/src/namestore/test_namestore_api.c +++ b/src/namestore/test_namestore_api.c @@ -24,7 +24,7 @@ #include "platform.h" #include "gnunet_common.h" #include "gnunet_namestore_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #define TEST_RECORD_TYPE 1234 diff --git a/src/namestore/test_namestore_api_create.c b/src/namestore/test_namestore_api_create.c index 63e403c06..8bdf1338d 100644 --- a/src/namestore/test_namestore_api_create.c +++ b/src/namestore/test_namestore_api_create.c @@ -24,7 +24,7 @@ #include "platform.h" #include "gnunet_common.h" #include "gnunet_namestore_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "namestore.h" #include "gnunet_signatures.h" diff --git a/src/namestore/test_namestore_api_create_update.c b/src/namestore/test_namestore_api_create_update.c index 8998cabab..2a5c45e75 100644 --- a/src/namestore/test_namestore_api_create_update.c +++ b/src/namestore/test_namestore_api_create_update.c @@ -24,7 +24,7 @@ #include "platform.h" #include "gnunet_common.h" #include "gnunet_namestore_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "namestore.h" #include "gnunet_signatures.h" diff --git a/src/namestore/test_namestore_api_lookup.c b/src/namestore/test_namestore_api_lookup.c index 53e4626e5..7d2f86e86 100644 --- a/src/namestore/test_namestore_api_lookup.c +++ b/src/namestore/test_namestore_api_lookup.c @@ -24,7 +24,7 @@ #include "platform.h" #include "gnunet_common.h" #include "gnunet_namestore_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "namestore.h" #include "gnunet_signatures.h" diff --git a/src/namestore/test_namestore_api_lookup_specific_type.c b/src/namestore/test_namestore_api_lookup_specific_type.c index be45d938e..4d2aa1cfe 100644 --- a/src/namestore/test_namestore_api_lookup_specific_type.c +++ b/src/namestore/test_namestore_api_lookup_specific_type.c @@ -24,7 +24,7 @@ #include "platform.h" #include "gnunet_common.h" #include "gnunet_namestore_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "namestore.h" #include "gnunet_signatures.h" diff --git a/src/namestore/test_namestore_api_put.c b/src/namestore/test_namestore_api_put.c index d15d22f31..e4bc5e4bb 100644 --- a/src/namestore/test_namestore_api_put.c +++ b/src/namestore/test_namestore_api_put.c @@ -24,7 +24,7 @@ #include "platform.h" #include "gnunet_common.h" #include "gnunet_namestore_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "namestore.h" #define RECORDS 5 diff --git a/src/namestore/test_namestore_api_remove.c b/src/namestore/test_namestore_api_remove.c index f2bcf0e66..8583e69c9 100644 --- a/src/namestore/test_namestore_api_remove.c +++ b/src/namestore/test_namestore_api_remove.c @@ -24,7 +24,7 @@ #include "platform.h" #include "gnunet_common.h" #include "gnunet_namestore_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "namestore.h" #include "gnunet_signatures.h" diff --git a/src/namestore/test_namestore_api_remove_not_existing_record.c b/src/namestore/test_namestore_api_remove_not_existing_record.c index 54a273b9b..973cf94e4 100644 --- a/src/namestore/test_namestore_api_remove_not_existing_record.c +++ b/src/namestore/test_namestore_api_remove_not_existing_record.c @@ -24,7 +24,7 @@ #include "platform.h" #include "gnunet_common.h" #include "gnunet_namestore_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "namestore.h" #include "gnunet_signatures.h" diff --git a/src/namestore/test_namestore_api_zone_iteration.c b/src/namestore/test_namestore_api_zone_iteration.c index 08224c1d8..e61fb67d4 100644 --- a/src/namestore/test_namestore_api_zone_iteration.c +++ b/src/namestore/test_namestore_api_zone_iteration.c @@ -24,7 +24,7 @@ #include "platform.h" #include "gnunet_common.h" #include "gnunet_namestore_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "namestore.h" diff --git a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c index 3f6eb7bfb..7adf3fe2a 100644 --- a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c +++ b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c @@ -23,7 +23,7 @@ */ #include "platform.h" #include "gnunet_common.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_namestore_service.h" #include "namestore.h" diff --git a/src/namestore/test_namestore_api_zone_iteration_stop.c b/src/namestore/test_namestore_api_zone_iteration_stop.c index d858b94c0..dcb6f8c7d 100644 --- a/src/namestore/test_namestore_api_zone_iteration_stop.c +++ b/src/namestore/test_namestore_api_zone_iteration_stop.c @@ -23,7 +23,7 @@ */ #include "platform.h" #include "gnunet_common.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_namestore_service.h" #include "namestore.h" diff --git a/src/namestore/test_namestore_api_zone_to_name.c b/src/namestore/test_namestore_api_zone_to_name.c index 641aff970..85620719d 100644 --- a/src/namestore/test_namestore_api_zone_to_name.c +++ b/src/namestore/test_namestore_api_zone_to_name.c @@ -24,7 +24,7 @@ #include "platform.h" #include "gnunet_common.h" #include "gnunet_namestore_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "namestore.h" #include "gnunet_signatures.h" diff --git a/src/namestore/test_plugin_namestore.c b/src/namestore/test_plugin_namestore.c index 45cce861f..ea0bc781c 100644 --- a/src/namestore/test_plugin_namestore.c +++ b/src/namestore/test_plugin_namestore.c @@ -25,7 +25,7 @@ #include "platform.h" #include "gnunet_util_lib.h" #include "gnunet_namestore_plugin.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #define ASSERT(x) do { if (! (x)) { printf("Error at %s:%d\n", __FILE__, __LINE__); goto FAILURE;} } while (0) diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am index 3a40340a8..1b57ab63e 100644 --- a/src/nat/Makefile.am +++ b/src/nat/Makefile.am @@ -64,7 +64,7 @@ libgnunetnat_la_LIBADD = \ libgnunetnat_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) $(WINFLAGS) \ - -version-info 0:1:0 + -version-info 1:0:1 check_PROGRAMS = \ test_nat \ diff --git a/src/nse/test_nse_api.c b/src/nse/test_nse_api.c index 01fdb406e..171595b79 100644 --- a/src/nse/test_nse_api.c +++ b/src/nse/test_nse_api.c @@ -24,7 +24,7 @@ #include "platform.h" #include "gnunet_util_lib.h" #include "gnunet_nse_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" static struct GNUNET_NSE_Handle *h; diff --git a/src/peerinfo/perf_peerinfo_api.c b/src/peerinfo/perf_peerinfo_api.c index 24424282f..991773cad 100755 --- a/src/peerinfo/perf_peerinfo_api.c +++ b/src/peerinfo/perf_peerinfo_api.c @@ -27,7 +27,7 @@ #include "platform.h" #include "gnunet_hello_lib.h" #include "gnunet_util_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_peerinfo_service.h" #include "peerinfo.h" #include diff --git a/src/peerinfo/test_peerinfo_api.c b/src/peerinfo/test_peerinfo_api.c index a00f13f74..f3ab731f4 100644 --- a/src/peerinfo/test_peerinfo_api.c +++ b/src/peerinfo/test_peerinfo_api.c @@ -30,7 +30,7 @@ #include "gnunet_hello_lib.h" #include "gnunet_util_lib.h" #include "gnunet_peerinfo_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "peerinfo.h" static struct GNUNET_PEERINFO_IteratorContext *ic; diff --git a/src/pt/test_gns_vpn.c b/src/pt/test_gns_vpn.c index dd21f9dcd..6fe1e63a2 100644 --- a/src/pt/test_gns_vpn.c +++ b/src/pt/test_gns_vpn.c @@ -28,7 +28,7 @@ #include #include "gnunet_namestore_service.h" #include "gnunet_gns_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #define PORT 8080 #define TEST_DOMAIN "www.gads" diff --git a/src/pt/test_gnunet_vpn.c b/src/pt/test_gnunet_vpn.c index 6f6723d72..d938f7991 100644 --- a/src/pt/test_gnunet_vpn.c +++ b/src/pt/test_gnunet_vpn.c @@ -27,7 +27,7 @@ #include #include #include "gnunet_vpn_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #define PORT 48080 diff --git a/src/regex/Makefile.am b/src/regex/Makefile.am index 8440e7ae3..f6ab33abf 100644 --- a/src/regex/Makefile.am +++ b/src/regex/Makefile.am @@ -17,7 +17,7 @@ libgnunetregex_la_LIBADD = -lm \ $(top_builddir)/src/util/libgnunetutil.la libgnunetregex_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) \ - -version-info 0:0:0 + -version-info 1:1:0 if HAVE_MYSQL noinst_mysql_progs = \ diff --git a/src/stream/Makefile.am b/src/stream/Makefile.am index 16c4f78b2..77f2d6d59 100644 --- a/src/stream/Makefile.am +++ b/src/stream/Makefile.am @@ -20,7 +20,7 @@ libgnunetstream_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la $(XLIB) libgnunetstream_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) \ - -version-info 0:0:0 + -version-info 1:0:0 if HAVE_BENCHMARKS STREAM_BENCHMARKS = \ diff --git a/src/stream/test_stream_big.c b/src/stream/test_stream_big.c index a923f374c..06d2a494c 100644 --- a/src/stream/test_stream_big.c +++ b/src/stream/test_stream_big.c @@ -29,7 +29,7 @@ #include "platform.h" #include "gnunet_util_lib.h" #include "gnunet_stream_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #define LOG(kind, ...) \ GNUNET_log (kind, __VA_ARGS__); diff --git a/src/stream/test_stream_local.c b/src/stream/test_stream_local.c index 587c56ceb..f3c8aaec0 100644 --- a/src/stream/test_stream_local.c +++ b/src/stream/test_stream_local.c @@ -30,7 +30,7 @@ #include "gnunet_util_lib.h" #include "gnunet_mesh_service.h" #include "gnunet_stream_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" /** * Relative seconds shorthand diff --git a/src/stream/test_stream_sequence_wraparound.c b/src/stream/test_stream_sequence_wraparound.c index ac230f2b3..bbe9f1a08 100644 --- a/src/stream/test_stream_sequence_wraparound.c +++ b/src/stream/test_stream_sequence_wraparound.c @@ -29,7 +29,7 @@ #include "platform.h" #include "gnunet_util_lib.h" #include "gnunet_stream_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" /** * Generic logging shorthand diff --git a/src/testbed/gnunet-helper-testbed.c b/src/testbed/gnunet-helper-testbed.c index 97409c451..8f94d5ce5 100644 --- a/src/testbed/gnunet-helper-testbed.c +++ b/src/testbed/gnunet-helper-testbed.c @@ -32,7 +32,7 @@ #include "platform.h" #include "gnunet_util_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_testbed_service.h" #include "testbed_helper.h" #include "testbed_api.h" diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c index 292ffdfa1..17520a246 100644 --- a/src/testbed/gnunet-service-testbed.c +++ b/src/testbed/gnunet-service-testbed.c @@ -36,7 +36,7 @@ #include "testbed.h" #include "testbed_api.h" #include "testbed_api_hosts.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" /** * Generic logging diff --git a/src/testbed/test_testbed_api.c b/src/testbed/test_testbed_api.c index 694d06274..310b2f36c 100644 --- a/src/testbed/test_testbed_api.c +++ b/src/testbed/test_testbed_api.c @@ -27,7 +27,7 @@ #include "platform.h" #include "gnunet_util_lib.h" #include "gnunet_dht_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_testbed_service.h" /** diff --git a/src/testbed/test_testbed_api_2peers_1controller.c b/src/testbed/test_testbed_api_2peers_1controller.c index 99e83f8ee..4de15fc8d 100644 --- a/src/testbed/test_testbed_api_2peers_1controller.c +++ b/src/testbed/test_testbed_api_2peers_1controller.c @@ -27,7 +27,7 @@ #include "platform.h" #include "gnunet_util_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_testbed_service.h" diff --git a/src/testbed/test_testbed_api_3peers_3controllers.c b/src/testbed/test_testbed_api_3peers_3controllers.c index c29c732d3..376881c8e 100644 --- a/src/testbed/test_testbed_api_3peers_3controllers.c +++ b/src/testbed/test_testbed_api_3peers_3controllers.c @@ -44,7 +44,7 @@ #include "platform.h" #include "gnunet_util_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_testbed_service.h" diff --git a/src/testbed/test_testbed_api_controllerlink.c b/src/testbed/test_testbed_api_controllerlink.c index 9e8745fc6..10235b884 100644 --- a/src/testbed/test_testbed_api_controllerlink.c +++ b/src/testbed/test_testbed_api_controllerlink.c @@ -39,7 +39,7 @@ #include "platform.h" #include "gnunet_util_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "gnunet_testbed_service.h" /** diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am index ea1c1b1a7..2b0cb9879 100644 --- a/src/testing/Makefile.am +++ b/src/testing/Makefile.am @@ -24,7 +24,7 @@ libgnunettesting_la_LIBADD = \ $(LTLIBINTL) libgnunettesting_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) \ - -version-info 1:0:0 + -version-info 2:0:1 bin_PROGRAMS = \ gnunet-testing-run-service \ diff --git a/src/testing/gnunet-testing-run-service.c b/src/testing/gnunet-testing-run-service.c index 988b67e4f..ed60a409b 100644 --- a/src/testing/gnunet-testing-run-service.c +++ b/src/testing/gnunet-testing-run-service.c @@ -36,7 +36,7 @@ */ #include "platform.h" #include "gnunet_util_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #define LOG(kind,...) \ GNUNET_log_from (kind, "gnunet-testing", __VA_ARGS__) diff --git a/src/testing/gnunet-testing.c b/src/testing/gnunet-testing.c index 8f7c6393d..28c5be965 100644 --- a/src/testing/gnunet-testing.c +++ b/src/testing/gnunet-testing.c @@ -25,7 +25,7 @@ */ #include "platform.h" #include "gnunet_util_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #define HOSTKEYFILESIZE 914 diff --git a/src/testing/test_testing_peerstartup.c b/src/testing/test_testing_peerstartup.c index e08f7a2b2..fb3967ce0 100644 --- a/src/testing/test_testing_peerstartup.c +++ b/src/testing/test_testing_peerstartup.c @@ -28,7 +28,7 @@ #include "platform.h" #include "gnunet_configuration_lib.h" #include "gnunet_os_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #define LOG(kind,...) \ GNUNET_log (kind, __VA_ARGS__) diff --git a/src/testing/test_testing_portreservation.c b/src/testing/test_testing_portreservation.c index 98690fc1c..21ef51ffd 100644 --- a/src/testing/test_testing_portreservation.c +++ b/src/testing/test_testing_portreservation.c @@ -27,7 +27,7 @@ #include "platform.h" #include "gnunet_util_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #define LOG(kind,...) \ GNUNET_log (kind, __VA_ARGS__) diff --git a/src/testing/test_testing_servicestartup.c b/src/testing/test_testing_servicestartup.c index 0a69892b6..adb7181c1 100644 --- a/src/testing/test_testing_servicestartup.c +++ b/src/testing/test_testing_servicestartup.c @@ -25,7 +25,7 @@ */ #include "platform.h" #include "gnunet_scheduler_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #define LOG(kind,...) \ diff --git a/src/testing/testing.c b/src/testing/testing.c index cac81b28b..dd80f6ea5 100644 --- a/src/testing/testing.c +++ b/src/testing/testing.c @@ -31,7 +31,7 @@ */ #include "platform.h" #include "gnunet_util_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #define LOG(kind,...) \ GNUNET_log_from (kind, "testing-api", __VA_ARGS__) diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 43e023907..ef5517e01 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -109,7 +109,7 @@ libgnunettransport_la_LIBADD = \ $(GN_LIBINTL) libgnunettransport_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) $(WINFLAGS) \ - -version-info 1:1:0 + -version-info 2:0:0 libexec_PROGRAMS = \ $(WLAN_BIN) \ diff --git a/src/transport/transport-testing.h b/src/transport/transport-testing.h index 0b1f24591..d064ac574 100644 --- a/src/transport/transport-testing.h +++ b/src/transport/transport-testing.h @@ -31,7 +31,7 @@ #include "gnunet_program_lib.h" #include "gnunet_container_lib.h" #include "gnunet_transport_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #define GNUNET_TRANSPORT_TESTING_ConnectRequest void * diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 217229688..e9bb41555 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -119,7 +119,7 @@ libgnunetutil_la_LIBADD = \ libgnunetutil_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) \ - -version-info 9:0:0 + -version-info 10:0:1 libexec_PROGRAMS = \ diff --git a/src/util/gnunet-ecc.c b/src/util/gnunet-ecc.c index ad6b68a95..b19fc1998 100644 --- a/src/util/gnunet-ecc.c +++ b/src/util/gnunet-ecc.c @@ -25,7 +25,7 @@ */ #include "platform.h" #include "gnunet_util_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include diff --git a/src/util/gnunet-rsa.c b/src/util/gnunet-rsa.c index 597093ab1..917ee50f4 100644 --- a/src/util/gnunet-rsa.c +++ b/src/util/gnunet-rsa.c @@ -25,7 +25,7 @@ */ #include "platform.h" #include "gnunet_util_lib.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include -- cgit v1.2.3