From a5d0694571db763efd0787a680168492f325b2e6 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 4 Oct 2011 13:24:22 +0000 Subject: [PATCH] LRN: Use GNUNET_EXTRA_LOGGING to manage compile-time logging calls (#1805). --- src/arm/arm.h | 2 +- src/arm/gnunet-service-arm_interceptor.c | 2 +- src/arm/test_arm_api.c | 2 +- src/arm/test_exponential_backoff.c | 2 +- src/arm/test_gnunet_service_manager.c | 2 +- src/ats-test/perf_transport_ats.c | 2 +- src/ats-test/test_transport_ats_multiple_peers.c | 2 +- src/ats/ats_api.c | 2 +- src/ats/gnunet-service-transport_ats.h | 4 ++-- src/ats/test_ats_api.c | 4 ++-- src/ats/test_ats_api_update_address.c | 4 ++-- src/block/plugin_block_dht.c | 2 +- src/block/plugin_block_dns.c | 2 +- src/block/plugin_block_fs.c | 2 +- src/block/plugin_block_template.c | 2 +- src/block/plugin_block_test.c | 2 +- src/block/test_block.c | 4 ++-- src/chat/chat.c | 2 +- src/chat/gnunet-service-chat.c | 2 +- src/chat/test_chat.c | 2 +- src/chat/test_chat_private.c | 2 +- src/core/core.h | 4 ++-- src/core/gnunet-service-core.c | 4 ++-- src/core/test_core_api.c | 2 +- src/core/test_core_api_preferences.c | 2 +- src/core/test_core_api_reliability.c | 2 +- src/core/test_core_api_start_only.c | 2 +- src/core/test_core_quota_compliance.c | 4 ++-- src/datacache/perf_datacache.c | 2 +- src/datacache/plugin_datacache_mysql.c | 2 +- src/datacache/plugin_datacache_postgres.c | 2 +- src/datacache/plugin_datacache_sqlite.c | 2 +- src/datacache/test_datacache.c | 2 +- src/datacache/test_datacache_quota.c | 2 +- src/datastore/datastore.h | 2 +- src/datastore/perf_datastore_api.c | 2 +- src/datastore/perf_plugin_datastore.c | 2 +- src/datastore/plugin_datastore_mysql.c | 2 +- src/datastore/plugin_datastore_postgres.c | 2 +- src/datastore/plugin_datastore_sqlite.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/dht_api.c | 2 +- src/dht/test_dht_api.c | 4 ++-- src/dht/test_dht_multipeer.c | 2 +- src/dht/test_dht_twopeer.c | 2 +- src/dht/test_dht_twopeer_get_put.c | 2 +- src/dht/test_dht_twopeer_path_tracking.c | 2 +- src/dht/test_dht_twopeer_put_get.c | 2 +- src/dv/dv.h | 14 +++++++------- src/dv/plugin_transport_dv.c | 2 +- src/dv/test_transport_api_dv.c | 2 +- src/fragmentation/test_fragmentation.c | 2 +- src/fs/fs_download.c | 2 +- src/fs/fs_namespace.c | 2 +- src/fs/fs_publish.c | 2 +- src/fs/fs_search.c | 2 +- src/fs/fs_tree.c | 2 +- src/fs/fs_unindex.c | 2 +- src/fs/gnunet-service-fs.h | 2 +- src/fs/gnunet-service-fs_push.c | 2 +- src/fs/perf_gnunet_service_fs_p2p.c | 2 +- src/fs/perf_gnunet_service_fs_p2p_trust.c | 2 +- src/fs/test_fs.c | 2 +- src/fs/test_fs_download.c | 2 +- src/fs/test_fs_download_indexed.c | 2 +- src/fs/test_fs_download_persistence.c | 2 +- src/fs/test_fs_download_recursive.c | 2 +- src/fs/test_fs_file_information.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_ranking.c | 2 +- src/fs/test_fs_start_stop.c | 2 +- src/fs/test_fs_test_lib.c | 2 +- src/fs/test_fs_unindex.c | 2 +- src/fs/test_fs_unindex_persistence.c | 2 +- src/fs/test_gnunet_service_fs_migration.c | 2 +- src/fs/test_gnunet_service_fs_p2p.c | 2 +- src/hello/test_hello.c | 4 ++-- src/hostlist/gnunet-daemon-hostlist.h | 2 +- src/hostlist/hostlist-client.c | 2 +- src/hostlist/hostlist-server.c | 2 +- src/hostlist/test_gnunet_daemon_hostlist.c | 2 +- .../test_gnunet_daemon_hostlist_learning.c | 2 +- .../test_gnunet_daemon_hostlist_reconnect.c | 2 +- src/nat/nat.h | 2 +- src/nat/test_nat.c | 2 +- src/nat/test_nat_mini.c | 2 +- src/nat/test_nat_test.c | 2 +- src/nse/gnunet-nse-profiler.c | 2 +- src/nse/nse.h | 2 +- src/nse/test_nse_multipeer.c | 2 +- src/peerinfo/peerinfo.h | 2 +- src/statistics/statistics.h | 2 +- src/statistics/test_statistics_api.c | 2 +- src/statistics/test_statistics_api_loop.c | 2 +- src/statistics/test_statistics_api_watch.c | 2 +- src/template/test_template_api.c | 2 +- src/testing/test_testing_connect.c | 2 +- src/testing/test_testing_group.c | 2 +- src/testing/test_testing_peergroup.c | 2 +- src/testing/test_testing_topology.c | 2 +- src/testing/test_testing_topology_blacklist.c | 2 +- src/testing/testing.c | 4 ++-- src/testing/testing_group.c | 6 +++--- src/topology/test_gnunet_daemon_topology.c | 2 +- .../gnunet-transport-connect-running-peers.c | 4 ++-- src/transport/plugin_transport_http.h | 2 +- src/transport/plugin_transport_smtp.c | 2 +- src/transport/plugin_transport_tcp.c | 4 ++-- src/transport/plugin_transport_template.c | 2 +- src/transport/plugin_transport_udp.c | 2 +- src/transport/plugin_transport_unix.c | 2 +- src/transport/plugin_transport_wlan.c | 6 +++--- src/transport/test_plugin_transport.c | 2 +- src/transport/test_plugin_transport_http.c | 4 ++-- src/transport/test_plugin_transport_https.c | 4 ++-- src/transport/test_plugin_transport_udp.c | 2 +- src/transport/test_quota_compliance.c | 8 ++++---- src/transport/test_transport_api.c | 4 ++-- src/transport/test_transport_api_disconnect.c | 4 ++-- src/transport/test_transport_api_limited_sockets.c | 4 ++-- src/transport/test_transport_api_reliability.c | 2 +- src/transport/test_transport_api_timeout.c | 4 ++-- src/transport/test_transport_api_unreliability.c | 4 ++-- .../test_transport_api_unreliability_constant.c | 4 ++-- src/transport/test_transport_startonly.c | 4 ++-- src/transport/test_transport_testing.c | 4 ++-- src/transport/transport.h | 8 ++++---- src/util/bandwidth.c | 2 +- src/util/client.c | 2 +- src/util/connection.c | 2 +- src/util/disk.c | 4 ++-- src/util/load.c | 2 +- src/util/network.c | 4 ++-- src/util/resolver.h | 2 +- src/util/scheduler.c | 4 ++-- src/util/server.c | 2 +- src/util/server_mst.c | 2 +- src/util/server_nc.c | 2 +- src/util/service.c | 2 +- src/util/test_client.c | 2 +- src/util/test_configuration.c | 2 +- src/util/test_connection.c | 2 +- src/util/test_connection_addressing.c | 2 +- src/util/test_connection_receive_cancel.c | 2 +- src/util/test_connection_timeout.c | 2 +- src/util/test_connection_timeout_no_connect.c | 2 +- src/util/test_connection_transmit_cancel.c | 2 +- src/util/test_os_start_process.c | 2 +- src/util/test_peer.c | 2 +- src/util/test_plugin.c | 2 +- src/util/test_resolver_api.c | 2 +- src/util/test_scheduler.c | 2 +- src/util/test_scheduler_delay.c | 2 +- src/util/test_server.c | 2 +- src/util/test_server_disconnect.c | 2 +- src/util/test_server_with_client.c | 2 +- src/util/test_server_with_client_unix.c | 2 +- src/util/test_service.c | 2 +- src/util/test_strings.c | 2 +- src/util/test_time.c | 2 +- 168 files changed, 209 insertions(+), 209 deletions(-) diff --git a/src/arm/arm.h b/src/arm/arm.h index af5e405d8..f20562c20 100644 --- a/src/arm/arm.h +++ b/src/arm/arm.h @@ -31,6 +31,6 @@ * This option will turn on the DEBUG loglevel for * all processes controlled by this ARM! */ -#define DEBUG_ARM GNUNET_NO +#define DEBUG_ARM GNUNET_EXTRA_LOGGING #endif diff --git a/src/arm/gnunet-service-arm_interceptor.c b/src/arm/gnunet-service-arm_interceptor.c index 837f67d4d..24dd4ad25 100644 --- a/src/arm/gnunet-service-arm_interceptor.c +++ b/src/arm/gnunet-service-arm_interceptor.c @@ -37,7 +37,7 @@ #include "gnunet-service-arm.h" -#define DEBUG_SERVICE_MANAGER GNUNET_NO +#define DEBUG_SERVICE_MANAGER GNUNET_EXTRA_LOGGING #define BUFFER_SIZE (64 * 1024) diff --git a/src/arm/test_arm_api.c b/src/arm/test_arm_api.c index 11c245ea1..5fbbaa6b1 100644 --- a/src/arm/test_arm_api.c +++ b/src/arm/test_arm_api.c @@ -30,7 +30,7 @@ #include "gnunet_program_lib.h" #include "gnunet_resolver_service.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/arm/test_exponential_backoff.c b/src/arm/test_exponential_backoff.c index 778a4b84c..ec2f4545d 100644 --- a/src/arm/test_exponential_backoff.c +++ b/src/arm/test_exponential_backoff.c @@ -28,7 +28,7 @@ #include "gnunet_program_lib.h" #include "gnunet_protocols.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES #define LOG_BACKOFF GNUNET_NO #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10) diff --git a/src/arm/test_gnunet_service_manager.c b/src/arm/test_gnunet_service_manager.c index 4f863ed19..100e1569c 100644 --- a/src/arm/test_gnunet_service_manager.c +++ b/src/arm/test_gnunet_service_manager.c @@ -39,7 +39,7 @@ #define START_ARM GNUNET_YES -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING static int ret = 1; diff --git a/src/ats-test/perf_transport_ats.c b/src/ats-test/perf_transport_ats.c index 0be15d255..e148c9384 100644 --- a/src/ats-test/perf_transport_ats.c +++ b/src/ats-test/perf_transport_ats.c @@ -26,7 +26,7 @@ #include "gauger.h" #include -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define EXECS 5 diff --git a/src/ats-test/test_transport_ats_multiple_peers.c b/src/ats-test/test_transport_ats_multiple_peers.c index fbc148e10..fe317696a 100644 --- a/src/ats-test/test_transport_ats_multiple_peers.c +++ b/src/ats-test/test_transport_ats_multiple_peers.c @@ -30,7 +30,7 @@ #include "gauger.h" #include "gnunet-service-transport_ats.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define NUM_PEERS 11 #define MEASUREMENTS 5 diff --git a/src/ats/ats_api.c b/src/ats/ats_api.c index 633d71c20..f7f3c9552 100644 --- a/src/ats/ats_api.c +++ b/src/ats/ats_api.c @@ -33,7 +33,7 @@ #include "platform.h" #include "gnunet_ats_service.h" -#define DEBUG_ATS GNUNET_NO +#define DEBUG_ATS GNUNET_EXTRA_LOGGING // NOTE: this implementation is simply supposed // to implement a simplistic strategy in-process; diff --git a/src/ats/gnunet-service-transport_ats.h b/src/ats/gnunet-service-transport_ats.h index 550f218a9..4af1bdc4c 100644 --- a/src/ats/gnunet-service-transport_ats.h +++ b/src/ats/gnunet-service-transport_ats.h @@ -41,8 +41,8 @@ * ATS defines */ -#define DEBUG_ATS GNUNET_NO -#define VERBOSE_ATS GNUNET_NO +#define DEBUG_ATS GNUNET_EXTRA_LOGGING +#define VERBOSE_ATS GNUNET_EXTRA_LOGGING /* Minimum time between to calculations*/ diff --git a/src/ats/test_ats_api.c b/src/ats/test_ats_api.c index 0d4d65e94..42d485994 100644 --- a/src/ats/test_ats_api.c +++ b/src/ats/test_ats_api.c @@ -33,9 +33,9 @@ #include "platform.h" #include "gnunet_ats_service.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING -#define VERBOSE_ARM GNUNET_NO +#define VERBOSE_ARM GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/ats/test_ats_api_update_address.c b/src/ats/test_ats_api_update_address.c index 1c6351fcd..556f13ce4 100644 --- a/src/ats/test_ats_api_update_address.c +++ b/src/ats/test_ats_api_update_address.c @@ -34,9 +34,9 @@ #include "gnunet_ats_service.h" #include "gnunet_transport_service.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING -#define VERBOSE_ARM GNUNET_NO +#define VERBOSE_ARM GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/block/plugin_block_dht.c b/src/block/plugin_block_dht.c index 331eea4f6..c58615b72 100644 --- a/src/block/plugin_block_dht.c +++ b/src/block/plugin_block_dht.c @@ -31,7 +31,7 @@ #include "gnunet_hello_lib.h" #include "gnunet_block_plugin.h" -#define DEBUG_DHT GNUNET_NO +#define DEBUG_DHT GNUNET_EXTRA_LOGGING /** diff --git a/src/block/plugin_block_dns.c b/src/block/plugin_block_dns.c index e20370685..22fae2c17 100644 --- a/src/block/plugin_block_dns.c +++ b/src/block/plugin_block_dns.c @@ -29,7 +29,7 @@ #include "block_dns.h" #include "gnunet_signatures.h" -#define DEBUG_DHT GNUNET_NO +#define DEBUG_DHT GNUNET_EXTRA_LOGGING /** * Function called to validate a reply or a request. For diff --git a/src/block/plugin_block_fs.c b/src/block/plugin_block_fs.c index 28a56526b..5a0e90a92 100644 --- a/src/block/plugin_block_fs.c +++ b/src/block/plugin_block_fs.c @@ -29,7 +29,7 @@ #include "block_fs.h" #include "gnunet_signatures.h" -#define DEBUG_FS_BLOCK GNUNET_NO +#define DEBUG_FS_BLOCK GNUNET_EXTRA_LOGGING /** * Number of bits we set per entry in the bloomfilter. diff --git a/src/block/plugin_block_template.c b/src/block/plugin_block_template.c index 7ce3004eb..6ed675dc9 100644 --- a/src/block/plugin_block_template.c +++ b/src/block/plugin_block_template.c @@ -27,7 +27,7 @@ #include "platform.h" #include "gnunet_block_plugin.h" -#define DEBUG_TEMPLATE GNUNET_NO +#define DEBUG_TEMPLATE GNUNET_EXTRA_LOGGING /** diff --git a/src/block/plugin_block_test.c b/src/block/plugin_block_test.c index 76853a1f0..0c769b837 100644 --- a/src/block/plugin_block_test.c +++ b/src/block/plugin_block_test.c @@ -28,7 +28,7 @@ #include "platform.h" #include "gnunet_block_plugin.h" -#define DEBUG_TEST GNUNET_NO +#define DEBUG_TEST GNUNET_EXTRA_LOGGING /** diff --git a/src/block/test_block.c b/src/block/test_block.c index f7a3422e0..d1d3edb96 100644 --- a/src/block/test_block.c +++ b/src/block/test_block.c @@ -25,9 +25,9 @@ #include "platform.h" #include "gnunet_block_lib.h" -#define DEBUG GNUNET_NO +#define DEBUG GNUNET_EXTRA_LOGGING -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING static int test_fs (struct GNUNET_BLOCK_Context *ctx) diff --git a/src/chat/chat.c b/src/chat/chat.c index b51d29b9c..ae73b96a5 100644 --- a/src/chat/chat.c +++ b/src/chat/chat.c @@ -32,7 +32,7 @@ #include "gnunet_signatures.h" #include "chat.h" -#define DEBUG_CHAT GNUNET_NO +#define DEBUG_CHAT GNUNET_EXTRA_LOGGING #define NICK_IDENTITY_PREFIX ".chat_identity_" diff --git a/src/chat/gnunet-service-chat.c b/src/chat/gnunet-service-chat.c index c41ec9095..ed8dfb9e9 100644 --- a/src/chat/gnunet-service-chat.c +++ b/src/chat/gnunet-service-chat.c @@ -33,7 +33,7 @@ #include "gnunet_signatures.h" #include "chat.h" -#define DEBUG_CHAT_SERVICE GNUNET_NO +#define DEBUG_CHAT_SERVICE GNUNET_EXTRA_LOGGING #define MAX_TRANSMIT_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60) #define EXPECTED_NEIGHBOUR_COUNT 16 #define QUEUE_SIZE 16 diff --git a/src/chat/test_chat.c b/src/chat/test_chat.c index 7cf8b19cf..b4e14f081 100644 --- a/src/chat/test_chat.c +++ b/src/chat/test_chat.c @@ -37,7 +37,7 @@ #include "gnunet_arm_service.h" #include "gnunet_chat_service.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/chat/test_chat_private.c b/src/chat/test_chat_private.c index acec5bcf0..03968975c 100644 --- a/src/chat/test_chat_private.c +++ b/src/chat/test_chat_private.c @@ -30,7 +30,7 @@ #include "gnunet_arm_service.h" #include "gnunet_chat_service.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/core/core.h b/src/core/core.h index 37580bb82..17a4c8fd4 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -30,12 +30,12 @@ /** * General core debugging. */ -#define DEBUG_CORE GNUNET_NO +#define DEBUG_CORE GNUNET_EXTRA_LOGGING /** * Debugging interaction core-clients. */ -#define DEBUG_CORE_CLIENT GNUNET_NO +#define DEBUG_CORE_CLIENT GNUNET_EXTRA_LOGGING /** * Definition of bits in the InitMessage's options field that specify diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c index c74f1f666..4a9790b08 100644 --- a/src/core/gnunet-service-core.c +++ b/src/core/gnunet-service-core.c @@ -44,9 +44,9 @@ #include "core.h" -#define DEBUG_HANDSHAKE GNUNET_NO +#define DEBUG_HANDSHAKE GNUNET_EXTRA_LOGGING -#define DEBUG_CORE_QUOTA GNUNET_NO +#define DEBUG_CORE_QUOTA GNUNET_EXTRA_LOGGING /** * Receive and send buffer windows grow over time. For diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c index 894e4f642..1566840e8 100644 --- a/src/core/test_core_api.c +++ b/src/core/test_core_api.c @@ -34,7 +34,7 @@ #include "gnunet_scheduler_lib.h" #include "gnunet_transport_service.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/core/test_core_api_preferences.c b/src/core/test_core_api_preferences.c index d3364463a..6730e3701 100644 --- a/src/core/test_core_api_preferences.c +++ b/src/core/test_core_api_preferences.c @@ -31,7 +31,7 @@ #include "gnunet_scheduler_lib.h" #include "gnunet_transport_service.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/core/test_core_api_reliability.c b/src/core/test_core_api_reliability.c index ad6e6a761..7224581d7 100644 --- a/src/core/test_core_api_reliability.c +++ b/src/core/test_core_api_reliability.c @@ -36,7 +36,7 @@ #include "gnunet_transport_service.h" #include -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/core/test_core_api_start_only.c b/src/core/test_core_api_start_only.c index ca301f51e..ff4b564bf 100644 --- a/src/core/test_core_api_start_only.c +++ b/src/core/test_core_api_start_only.c @@ -31,7 +31,7 @@ #include "gnunet_program_lib.h" #include "gnunet_scheduler_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define TIMEOUT 3 diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c index 90a140d46..c909892e1 100644 --- a/src/core/test_core_quota_compliance.c +++ b/src/core/test_core_quota_compliance.c @@ -33,8 +33,8 @@ #include "gnunet_transport_service.h" #include "gnunet_statistics_service.h" -#define VERBOSE GNUNET_NO -#define DEBUG_TRANSMISSION GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING +#define DEBUG_TRANSMISSION GNUNET_EXTRA_LOGGING #define SYMMETRIC 0 #define ASYMMETRIC_SEND_LIMITED 1 diff --git a/src/datacache/perf_datacache.c b/src/datacache/perf_datacache.c index fd3e23b92..6fc0a7217 100644 --- a/src/datacache/perf_datacache.c +++ b/src/datacache/perf_datacache.c @@ -27,7 +27,7 @@ #include "gnunet_datacache_lib.h" #include -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define ASSERT(x) do { if (! (x)) { printf("Error at %s:%d\n", __FILE__, __LINE__); goto FAILURE;} } while (0) diff --git a/src/datacache/plugin_datacache_mysql.c b/src/datacache/plugin_datacache_mysql.c index b9954faf9..cf282dbdc 100644 --- a/src/datacache/plugin_datacache_mysql.c +++ b/src/datacache/plugin_datacache_mysql.c @@ -82,7 +82,7 @@ #include "gnunet_datacache_plugin.h" #include -#define DEBUG_DATACACHE_MYSQL GNUNET_NO +#define DEBUG_DATACACHE_MYSQL GNUNET_EXTRA_LOGGING /** * Estimate of the per-entry overhead (including indices). diff --git a/src/datacache/plugin_datacache_postgres.c b/src/datacache/plugin_datacache_postgres.c index 0f7dd8904..e05fbf2d3 100644 --- a/src/datacache/plugin_datacache_postgres.c +++ b/src/datacache/plugin_datacache_postgres.c @@ -28,7 +28,7 @@ #include "gnunet_datacache_plugin.h" #include -#define DEBUG_POSTGRES GNUNET_NO +#define DEBUG_POSTGRES GNUNET_EXTRA_LOGGING /** * Per-entry overhead estimate diff --git a/src/datacache/plugin_datacache_sqlite.c b/src/datacache/plugin_datacache_sqlite.c index 2b36e5b60..d7b77ac52 100644 --- a/src/datacache/plugin_datacache_sqlite.c +++ b/src/datacache/plugin_datacache_sqlite.c @@ -28,7 +28,7 @@ #include "gnunet_datacache_plugin.h" #include -#define DEBUG_DATACACHE_SQLITE GNUNET_NO +#define DEBUG_DATACACHE_SQLITE GNUNET_EXTRA_LOGGING /** * How much overhead do we assume per entry in the diff --git a/src/datacache/test_datacache.c b/src/datacache/test_datacache.c index abf0209d8..6c70807c1 100644 --- a/src/datacache/test_datacache.c +++ b/src/datacache/test_datacache.c @@ -26,7 +26,7 @@ #include "gnunet_util_lib.h" #include "gnunet_datacache_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #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 6a05e61fb..d3681da8e 100644 --- a/src/datacache/test_datacache_quota.c +++ b/src/datacache/test_datacache_quota.c @@ -26,7 +26,7 @@ #include "gnunet_util_lib.h" #include "gnunet_datacache_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define ASSERT(x) do { if (! (x)) { printf("Error at %s:%d\n", __FILE__, __LINE__); goto FAILURE;} } while (0) diff --git a/src/datastore/datastore.h b/src/datastore/datastore.h index 1dcf7bb4b..fa8352d24 100644 --- a/src/datastore/datastore.h +++ b/src/datastore/datastore.h @@ -27,7 +27,7 @@ #ifndef DATASTORE_H #define DATASTORE_H -#define DEBUG_DATASTORE GNUNET_NO +#define DEBUG_DATASTORE GNUNET_EXTRA_LOGGING #include "gnunet_util_lib.h" diff --git a/src/datastore/perf_datastore_api.c b/src/datastore/perf_datastore_api.c index 07df6a691..1ba215374 100644 --- a/src/datastore/perf_datastore_api.c +++ b/src/datastore/perf_datastore_api.c @@ -38,7 +38,7 @@ #include "gnunet_datastore_service.h" #include -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING /** * How long until we give up on transmitting the message? diff --git a/src/datastore/perf_plugin_datastore.c b/src/datastore/perf_plugin_datastore.c index ac3be4d5c..8f552c4eb 100644 --- a/src/datastore/perf_plugin_datastore.c +++ b/src/datastore/perf_plugin_datastore.c @@ -29,7 +29,7 @@ #include "gnunet_datastore_plugin.h" #include -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING /** * Target datastore size (in bytes). Realistic sizes are diff --git a/src/datastore/plugin_datastore_mysql.c b/src/datastore/plugin_datastore_mysql.c index 0448b7299..1048a370f 100644 --- a/src/datastore/plugin_datastore_mysql.c +++ b/src/datastore/plugin_datastore_mysql.c @@ -121,7 +121,7 @@ #include "gnunet_util_lib.h" #include -#define DEBUG_MYSQL GNUNET_NO +#define DEBUG_MYSQL GNUNET_EXTRA_LOGGING #define MAX_DATUM_SIZE 65536 diff --git a/src/datastore/plugin_datastore_postgres.c b/src/datastore/plugin_datastore_postgres.c index 3c37325da..0b781485f 100644 --- a/src/datastore/plugin_datastore_postgres.c +++ b/src/datastore/plugin_datastore_postgres.c @@ -28,7 +28,7 @@ #include "gnunet_datastore_plugin.h" #include -#define DEBUG_POSTGRES GNUNET_NO +#define DEBUG_POSTGRES GNUNET_EXTRA_LOGGING /** * After how many ms "busy" should a DB operation fail for good? diff --git a/src/datastore/plugin_datastore_sqlite.c b/src/datastore/plugin_datastore_sqlite.c index 931202707..318c22cf5 100644 --- a/src/datastore/plugin_datastore_sqlite.c +++ b/src/datastore/plugin_datastore_sqlite.c @@ -31,7 +31,7 @@ /** * Enable or disable logging debug messages. */ -#define DEBUG_SQLITE GNUNET_NO +#define DEBUG_SQLITE GNUNET_EXTRA_LOGGING /** * We allocate items on the stack at times. To prevent a stack diff --git a/src/datastore/test_datastore_api.c b/src/datastore/test_datastore_api.c index 47b1945ad..b1dd0e5de 100644 --- a/src/datastore/test_datastore_api.c +++ b/src/datastore/test_datastore_api.c @@ -31,7 +31,7 @@ #include "gnunet_protocols.h" #include "gnunet_datastore_service.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define START_DATASTORE GNUNET_YES diff --git a/src/datastore/test_datastore_api_management.c b/src/datastore/test_datastore_api_management.c index 72348e28c..cb04d31d1 100644 --- a/src/datastore/test_datastore_api_management.c +++ b/src/datastore/test_datastore_api_management.c @@ -28,7 +28,7 @@ #include "gnunet_protocols.h" #include "gnunet_datastore_service.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING /** * How long until we give up on transmitting the message? diff --git a/src/datastore/test_plugin_datastore.c b/src/datastore/test_plugin_datastore.c index 373e8f453..3504945ae 100644 --- a/src/datastore/test_plugin_datastore.c +++ b/src/datastore/test_plugin_datastore.c @@ -28,7 +28,7 @@ #include "gnunet_protocols.h" #include "gnunet_datastore_plugin.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING /** * Number of put operations to perform. diff --git a/src/dht/dht_api.c b/src/dht/dht_api.c index 2e89cf3eb..100a94523 100644 --- a/src/dht/dht_api.c +++ b/src/dht/dht_api.c @@ -34,7 +34,7 @@ #include "gnunet_dht_service.h" #include "dht.h" -#define DEBUG_DHT_API GNUNET_NO +#define DEBUG_DHT_API GNUNET_EXTRA_LOGGING /** * Entry in our list of messages to be (re-)transmitted. diff --git a/src/dht/test_dht_api.c b/src/dht/test_dht_api.c index 87e08d840..51f7d947c 100644 --- a/src/dht/test_dht_api.c +++ b/src/dht/test_dht_api.c @@ -34,9 +34,9 @@ #include "gnunet_dht_service.h" #include "gnunet_hello_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING -#define VERBOSE_ARM GNUNET_NO +#define VERBOSE_ARM GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/dht/test_dht_multipeer.c b/src/dht/test_dht_multipeer.c index 75a7b42b5..296a19bca 100644 --- a/src/dht/test_dht_multipeer.c +++ b/src/dht/test_dht_multipeer.c @@ -28,7 +28,7 @@ #include "gnunet_dht_service.h" /* DEFINES */ -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING /* Timeout for entire testcase */ #define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 30) diff --git a/src/dht/test_dht_twopeer.c b/src/dht/test_dht_twopeer.c index 9f13f5136..8947739c4 100644 --- a/src/dht/test_dht_twopeer.c +++ b/src/dht/test_dht_twopeer.c @@ -28,7 +28,7 @@ #include "gnunet_dht_service.h" /* DEFINES */ -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define MAX_GET_ATTEMPTS 10 diff --git a/src/dht/test_dht_twopeer_get_put.c b/src/dht/test_dht_twopeer_get_put.c index 86ce546cc..2a79c9ffb 100644 --- a/src/dht/test_dht_twopeer_get_put.c +++ b/src/dht/test_dht_twopeer_get_put.c @@ -44,7 +44,7 @@ #include "gnunet_signatures.h" /* DEFINES */ -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING /* Timeout for entire testcase */ #define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 40) diff --git a/src/dht/test_dht_twopeer_path_tracking.c b/src/dht/test_dht_twopeer_path_tracking.c index 5be36c4a1..f2d86e38e 100644 --- a/src/dht/test_dht_twopeer_path_tracking.c +++ b/src/dht/test_dht_twopeer_path_tracking.c @@ -28,7 +28,7 @@ #include "gnunet_dht_service.h" /* DEFINES */ -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING /* Timeout for entire testcase */ #define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 5) diff --git a/src/dht/test_dht_twopeer_put_get.c b/src/dht/test_dht_twopeer_put_get.c index 197a05006..44009c257 100644 --- a/src/dht/test_dht_twopeer_put_get.c +++ b/src/dht/test_dht_twopeer_put_get.c @@ -44,7 +44,7 @@ #include "gnunet_signatures.h" /* DEFINES */ -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING /* Timeout for entire testcase */ #define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 5) diff --git a/src/dv/dv.h b/src/dv/dv.h index 1d4912f84..5690cf6cc 100644 --- a/src/dv/dv.h +++ b/src/dv/dv.h @@ -28,13 +28,13 @@ #include "gnunet_common.h" -#define DEBUG_DV_GOSSIP GNUNET_NO -#define DEBUG_DV_GOSSIP_SEND GNUNET_NO -#define DEBUG_DV_GOSSIP_RECEIPT GNUNET_NO -#define DEBUG_DV_MESSAGES GNUNET_NO -#define DEBUG_DV GNUNET_NO -#define DEBUG_DV_PEER_NUMBERS GNUNET_NO -#define DEBUG_MESSAGE_DROP GNUNET_NO +#define DEBUG_DV_GOSSIP GNUNET_EXTRA_LOGGING +#define DEBUG_DV_GOSSIP_SEND GNUNET_EXTRA_LOGGING +#define DEBUG_DV_GOSSIP_RECEIPT GNUNET_EXTRA_LOGGING +#define DEBUG_DV_MESSAGES GNUNET_EXTRA_LOGGING +#define DEBUG_DV GNUNET_EXTRA_LOGGING +#define DEBUG_DV_PEER_NUMBERS GNUNET_EXTRA_LOGGING +#define DEBUG_MESSAGE_DROP GNUNET_EXTRA_LOGGING typedef void (*GNUNET_DV_MessageReceivedHandler) (void *cls, struct GNUNET_PeerIdentity * diff --git a/src/dv/plugin_transport_dv.c b/src/dv/plugin_transport_dv.c index bd73e7e20..feb8a2e57 100644 --- a/src/dv/plugin_transport_dv.c +++ b/src/dv/plugin_transport_dv.c @@ -37,7 +37,7 @@ #include "gnunet_transport_plugin.h" #include "dv.h" -#define DEBUG_TEMPLATE GNUNET_NO +#define DEBUG_TEMPLATE GNUNET_EXTRA_LOGGING /** * Encapsulation of all of the state of the plugin. diff --git a/src/dv/test_transport_api_dv.c b/src/dv/test_transport_api_dv.c index 83035911c..0e8444bd4 100644 --- a/src/dv/test_transport_api_dv.c +++ b/src/dv/test_transport_api_dv.c @@ -25,7 +25,7 @@ #include "gnunet_testing_lib.h" #include "gnunet_core_service.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define TEST_ALL GNUNET_NO diff --git a/src/fragmentation/test_fragmentation.c b/src/fragmentation/test_fragmentation.c index b04b28385..14901cf68 100644 --- a/src/fragmentation/test_fragmentation.c +++ b/src/fragmentation/test_fragmentation.c @@ -25,7 +25,7 @@ #include "platform.h" #include "gnunet_fragmentation_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define DETAILS GNUNET_NO diff --git a/src/fs/fs_download.c b/src/fs/fs_download.c index ba4461986..af889d804 100644 --- a/src/fs/fs_download.c +++ b/src/fs/fs_download.c @@ -31,7 +31,7 @@ #include "fs.h" #include "fs_tree.h" -#define DEBUG_DOWNLOAD GNUNET_NO +#define DEBUG_DOWNLOAD GNUNET_EXTRA_LOGGING /** * Determine if the given download (options and meta data) should cause diff --git a/src/fs/fs_namespace.c b/src/fs/fs_namespace.c index 7475896a8..7b2d5071c 100644 --- a/src/fs/fs_namespace.c +++ b/src/fs/fs_namespace.c @@ -30,7 +30,7 @@ #include "gnunet_fs_service.h" #include "fs.h" -#define DEBUG_NAMESPACE GNUNET_NO +#define DEBUG_NAMESPACE GNUNET_EXTRA_LOGGING /** * Return the name of the directory in which we store diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c index b286d41ca..4f27abae4 100644 --- a/src/fs/fs_publish.c +++ b/src/fs/fs_publish.c @@ -34,7 +34,7 @@ #include "fs.h" #include "fs_tree.h" -#define DEBUG_PUBLISH GNUNET_NO +#define DEBUG_PUBLISH GNUNET_EXTRA_LOGGING /** diff --git a/src/fs/fs_search.c b/src/fs/fs_search.c index 10cce3f1f..93a787477 100644 --- a/src/fs/fs_search.c +++ b/src/fs/fs_search.c @@ -30,7 +30,7 @@ #include "gnunet_protocols.h" #include "fs.h" -#define DEBUG_SEARCH GNUNET_NO +#define DEBUG_SEARCH GNUNET_EXTRA_LOGGING /** * Fill in all of the generic fields for a search event and diff --git a/src/fs/fs_tree.c b/src/fs/fs_tree.c index 60e80efbb..fc04446c9 100644 --- a/src/fs/fs_tree.c +++ b/src/fs/fs_tree.c @@ -27,7 +27,7 @@ #include "platform.h" #include "fs_tree.h" -#define DEBUG_TREE GNUNET_NO +#define DEBUG_TREE GNUNET_EXTRA_LOGGING /** * Context for an ECRS-based file encoder that computes diff --git a/src/fs/fs_unindex.c b/src/fs/fs_unindex.c index a37a39a78..8dab62051 100644 --- a/src/fs/fs_unindex.c +++ b/src/fs/fs_unindex.c @@ -31,7 +31,7 @@ #include "fs.h" #include "fs_tree.h" -#define DEBUG_UNINDEX GNUNET_NO +#define DEBUG_UNINDEX GNUNET_EXTRA_LOGGING /** * Function called by the tree encoder to obtain diff --git a/src/fs/gnunet-service-fs.h b/src/fs/gnunet-service-fs.h index ef2eebc8d..8ba90dd22 100644 --- a/src/fs/gnunet-service-fs.h +++ b/src/fs/gnunet-service-fs.h @@ -35,7 +35,7 @@ #define DEBUG_FS GNUNET_YES -#define DEBUG_FS_CLIENT GNUNET_NO +#define DEBUG_FS_CLIENT GNUNET_EXTRA_LOGGING /** diff --git a/src/fs/gnunet-service-fs_push.c b/src/fs/gnunet-service-fs_push.c index acdba81f0..515446117 100644 --- a/src/fs/gnunet-service-fs_push.c +++ b/src/fs/gnunet-service-fs_push.c @@ -31,7 +31,7 @@ #include "gnunet-service-fs_push.h" -#define DEBUG_FS_MIGRATION GNUNET_NO +#define DEBUG_FS_MIGRATION GNUNET_EXTRA_LOGGING /** * How long must content remain valid for us to consider it for migration? diff --git a/src/fs/perf_gnunet_service_fs_p2p.c b/src/fs/perf_gnunet_service_fs_p2p.c index 0bf05d0ce..bff884e32 100644 --- a/src/fs/perf_gnunet_service_fs_p2p.c +++ b/src/fs/perf_gnunet_service_fs_p2p.c @@ -27,7 +27,7 @@ #include "fs_test_lib.h" #include "gnunet_testing_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING /** * File-size we use for testing. diff --git a/src/fs/perf_gnunet_service_fs_p2p_trust.c b/src/fs/perf_gnunet_service_fs_p2p_trust.c index 64ddee638..9f5a36b7e 100644 --- a/src/fs/perf_gnunet_service_fs_p2p_trust.c +++ b/src/fs/perf_gnunet_service_fs_p2p_trust.c @@ -47,7 +47,7 @@ #include "fs_test_lib.h" #include "gnunet_testing_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING /** * File-size we use for testing. diff --git a/src/fs/test_fs.c b/src/fs/test_fs.c index 9aee89e85..6e9581d17 100644 --- a/src/fs/test_fs.c +++ b/src/fs/test_fs.c @@ -28,7 +28,7 @@ #include "gnunet_util.h" #include "gnunet_fsui_lib.h" -#define DEBUG_VERBOSE GNUNET_NO +#define DEBUG_VERBOSE GNUNET_EXTRA_LOGGING #define CHECK(a) if (!(a)) { ok = GNUNET_NO; GNUNET_GE_BREAK(NULL, 0); goto FAILURE; } diff --git a/src/fs/test_fs_download.c b/src/fs/test_fs_download.c index 10f4c0ce4..19ef6e76a 100644 --- a/src/fs/test_fs_download.c +++ b/src/fs/test_fs_download.c @@ -30,7 +30,7 @@ #include "gnunet_fs_service.h" #include -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/fs/test_fs_download_indexed.c b/src/fs/test_fs_download_indexed.c index 1811b325d..3f932f783 100644 --- a/src/fs/test_fs_download_indexed.c +++ b/src/fs/test_fs_download_indexed.c @@ -30,7 +30,7 @@ #include "gnunet_fs_service.h" #include -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/fs/test_fs_download_persistence.c b/src/fs/test_fs_download_persistence.c index c26a60978..9bc37235e 100644 --- a/src/fs/test_fs_download_persistence.c +++ b/src/fs/test_fs_download_persistence.c @@ -29,7 +29,7 @@ #include "gnunet_arm_service.h" #include "gnunet_fs_service.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/fs/test_fs_download_recursive.c b/src/fs/test_fs_download_recursive.c index d350dcae8..cede523ec 100644 --- a/src/fs/test_fs_download_recursive.c +++ b/src/fs/test_fs_download_recursive.c @@ -29,7 +29,7 @@ #include "gnunet_util.h" #include "gnunet_fsui_lib.h" -#define DEBUG_VERBOSE GNUNET_NO +#define DEBUG_VERBOSE GNUNET_EXTRA_LOGGING #define CHECK(a) if (!(a)) { ok = GNUNET_NO; GNUNET_GE_BREAK(ectx, 0); goto FAILURE; } diff --git a/src/fs/test_fs_file_information.c b/src/fs/test_fs_file_information.c index db5a8448a..a459c565f 100644 --- a/src/fs/test_fs_file_information.c +++ b/src/fs/test_fs_file_information.c @@ -36,7 +36,7 @@ #include "gnunet_util_lib.h" #include "gnunet_fs_service.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING /** * File-size we use for testing. diff --git a/src/fs/test_fs_list_indexed.c b/src/fs/test_fs_list_indexed.c index b86506f8d..870f51a4a 100644 --- a/src/fs/test_fs_list_indexed.c +++ b/src/fs/test_fs_list_indexed.c @@ -33,7 +33,7 @@ #include "gnunet_arm_service.h" #include "gnunet_fs_service.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/fs/test_fs_namespace.c b/src/fs/test_fs_namespace.c index ae2f77806..b1221eb82 100644 --- a/src/fs/test_fs_namespace.c +++ b/src/fs/test_fs_namespace.c @@ -28,7 +28,7 @@ #include "gnunet_arm_service.h" #include "gnunet_fs_service.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/fs/test_fs_namespace_list_updateable.c b/src/fs/test_fs_namespace_list_updateable.c index 1ad2fb5ac..5f6ead36b 100644 --- a/src/fs/test_fs_namespace_list_updateable.c +++ b/src/fs/test_fs_namespace_list_updateable.c @@ -28,7 +28,7 @@ #include "gnunet_arm_service.h" #include "gnunet_fs_service.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/fs/test_fs_publish.c b/src/fs/test_fs_publish.c index 3db0a7c62..81ec3dd7f 100644 --- a/src/fs/test_fs_publish.c +++ b/src/fs/test_fs_publish.c @@ -30,7 +30,7 @@ #include "gnunet_arm_service.h" #include "gnunet_fs_service.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/fs/test_fs_publish_persistence.c b/src/fs/test_fs_publish_persistence.c index eab0aa650..145ef0ca9 100644 --- a/src/fs/test_fs_publish_persistence.c +++ b/src/fs/test_fs_publish_persistence.c @@ -29,7 +29,7 @@ #include "gnunet_arm_service.h" #include "gnunet_fs_service.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/fs/test_fs_search.c b/src/fs/test_fs_search.c index d8e592b6f..9d9825e2f 100644 --- a/src/fs/test_fs_search.c +++ b/src/fs/test_fs_search.c @@ -29,7 +29,7 @@ #include "gnunet_arm_service.h" #include "gnunet_fs_service.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/fs/test_fs_search_persistence.c b/src/fs/test_fs_search_persistence.c index 335b1bee3..74ba9659a 100644 --- a/src/fs/test_fs_search_persistence.c +++ b/src/fs/test_fs_search_persistence.c @@ -29,7 +29,7 @@ #include "gnunet_arm_service.h" #include "gnunet_fs_service.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/fs/test_fs_search_ranking.c b/src/fs/test_fs_search_ranking.c index 53522c6fe..6da936342 100644 --- a/src/fs/test_fs_search_ranking.c +++ b/src/fs/test_fs_search_ranking.c @@ -28,7 +28,7 @@ #include "gnunet_util.h" #include "gnunet_fsui_lib.h" -#define CHECK_VERBOSE GNUNET_NO +#define CHECK_VERBOSE GNUNET_EXTRA_LOGGING #define CHECK(a) if (!(a)) { ok = GNUNET_NO; GNUNET_GE_BREAK(NULL, 0); goto FAILURE; } diff --git a/src/fs/test_fs_start_stop.c b/src/fs/test_fs_start_stop.c index c65ad2fc1..23678fbf9 100644 --- a/src/fs/test_fs_start_stop.c +++ b/src/fs/test_fs_start_stop.c @@ -29,7 +29,7 @@ #include "gnunet_arm_service.h" #include "gnunet_fs_service.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/fs/test_fs_test_lib.c b/src/fs/test_fs_test_lib.c index 589abb3fb..8f0bc1c87 100644 --- a/src/fs/test_fs_test_lib.c +++ b/src/fs/test_fs_test_lib.c @@ -26,7 +26,7 @@ #include "platform.h" #include "fs_test_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING /** * File-size we use for testing. diff --git a/src/fs/test_fs_unindex.c b/src/fs/test_fs_unindex.c index 99913fbcf..9b21cd651 100644 --- a/src/fs/test_fs_unindex.c +++ b/src/fs/test_fs_unindex.c @@ -29,7 +29,7 @@ #include "gnunet_arm_service.h" #include "gnunet_fs_service.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/fs/test_fs_unindex_persistence.c b/src/fs/test_fs_unindex_persistence.c index 69623ac7c..0529aacfa 100644 --- a/src/fs/test_fs_unindex_persistence.c +++ b/src/fs/test_fs_unindex_persistence.c @@ -28,7 +28,7 @@ #include "gnunet_arm_service.h" #include "gnunet_fs_service.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/fs/test_gnunet_service_fs_migration.c b/src/fs/test_gnunet_service_fs_migration.c index 3d6735cc4..5d8aa21ef 100644 --- a/src/fs/test_gnunet_service_fs_migration.c +++ b/src/fs/test_gnunet_service_fs_migration.c @@ -27,7 +27,7 @@ #include "fs_test_lib.h" #include "gnunet_testing_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING /** * File-size we use for testing. diff --git a/src/fs/test_gnunet_service_fs_p2p.c b/src/fs/test_gnunet_service_fs_p2p.c index 17b7ec181..434dd3ce5 100644 --- a/src/fs/test_gnunet_service_fs_p2p.c +++ b/src/fs/test_gnunet_service_fs_p2p.c @@ -26,7 +26,7 @@ #include "platform.h" #include "fs_test_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING /** * File-size we use for testing. diff --git a/src/hello/test_hello.c b/src/hello/test_hello.c index c9bf96791..b6cdfcf66 100644 --- a/src/hello/test_hello.c +++ b/src/hello/test_hello.c @@ -25,9 +25,9 @@ #include "platform.h" #include "gnunet_hello_lib.h" -#define DEBUG GNUNET_NO +#define DEBUG GNUNET_EXTRA_LOGGING -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING static size_t diff --git a/src/hostlist/gnunet-daemon-hostlist.h b/src/hostlist/gnunet-daemon-hostlist.h index 961247307..8c9824e0c 100644 --- a/src/hostlist/gnunet-daemon-hostlist.h +++ b/src/hostlist/gnunet-daemon-hostlist.h @@ -39,7 +39,7 @@ /** * General hostlist daemon debugging. */ -#define DEBUG_HOSTLIST GNUNET_NO +#define DEBUG_HOSTLIST GNUNET_EXTRA_LOGGING #define MAX_URL_LEN 1000 #define MAX_BYTES_PER_HOSTLISTS 500000 diff --git a/src/hostlist/hostlist-client.c b/src/hostlist/hostlist-client.c index 85c691172..3343b7a49 100644 --- a/src/hostlist/hostlist-client.c +++ b/src/hostlist/hostlist-client.c @@ -36,7 +36,7 @@ #include "gnunet_common.h" #include "gnunet_bio_lib.h" -#define DEBUG_HOSTLIST_CLIENT GNUNET_NO +#define DEBUG_HOSTLIST_CLIENT GNUNET_EXTRA_LOGGING /** diff --git a/src/hostlist/hostlist-server.c b/src/hostlist/hostlist-server.c index bfe0b4b0e..633824c41 100644 --- a/src/hostlist/hostlist-server.c +++ b/src/hostlist/hostlist-server.c @@ -32,7 +32,7 @@ #include "gnunet-daemon-hostlist.h" #include "gnunet_resolver_service.h" -#define DEBUG_HOSTLIST_SERVER GNUNET_NO +#define DEBUG_HOSTLIST_SERVER GNUNET_EXTRA_LOGGING /** * Handle to the HTTP server as provided by libmicrohttpd for IPv6. diff --git a/src/hostlist/test_gnunet_daemon_hostlist.c b/src/hostlist/test_gnunet_daemon_hostlist.c index b6d0a1736..09410e14d 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist.c +++ b/src/hostlist/test_gnunet_daemon_hostlist.c @@ -27,7 +27,7 @@ #include "gnunet_arm_service.h" #include "gnunet_transport_service.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c index 2538e42fb..b68a93af0 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c +++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c @@ -30,7 +30,7 @@ #include "gnunet_resolver_service.h" #include "gnunet_statistics_service.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c index 7280d85f9..ae5c1b6dd 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c +++ b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c @@ -28,7 +28,7 @@ #include "gnunet_arm_service.h" #include "gnunet_transport_service.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/nat/nat.h b/src/nat/nat.h index dbb5263d4..a32fe0908 100644 --- a/src/nat/nat.h +++ b/src/nat/nat.h @@ -28,7 +28,7 @@ #define NAT_H #include "gnunet_util_lib.h" -#define DEBUG_NAT GNUNET_NO +#define DEBUG_NAT GNUNET_EXTRA_LOGGING /** * Request to test NAT traversal. diff --git a/src/nat/test_nat.c b/src/nat/test_nat.c index 784fc6cc7..19631af08 100644 --- a/src/nat/test_nat.c +++ b/src/nat/test_nat.c @@ -41,7 +41,7 @@ #include "gnunet_nat_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING /** diff --git a/src/nat/test_nat_mini.c b/src/nat/test_nat_mini.c index 2c6da3b57..d4027ffcb 100644 --- a/src/nat/test_nat_mini.c +++ b/src/nat/test_nat_mini.c @@ -36,7 +36,7 @@ #include "gnunet_nat_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING /* Time to wait before stopping NAT, in seconds */ #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5) diff --git a/src/nat/test_nat_test.c b/src/nat/test_nat_test.c index b3fb64221..0786bb04b 100644 --- a/src/nat/test_nat_test.c +++ b/src/nat/test_nat_test.c @@ -31,7 +31,7 @@ #include "gnunet_nat_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING /** diff --git a/src/nse/gnunet-nse-profiler.c b/src/nse/gnunet-nse-profiler.c index 9342480c2..a18a13fbd 100644 --- a/src/nse/gnunet-nse-profiler.c +++ b/src/nse/gnunet-nse-profiler.c @@ -29,7 +29,7 @@ #include "gnunet_testing_lib.h" #include "gnunet_nse_service.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING struct NSEPeer { diff --git a/src/nse/nse.h b/src/nse/nse.h index 38cafafa3..536834573 100644 --- a/src/nse/nse.h +++ b/src/nse/nse.h @@ -33,7 +33,7 @@ /** * Generate debug-level log messages? */ -#define DEBUG_NSE GNUNET_NO +#define DEBUG_NSE GNUNET_EXTRA_LOGGING /** * Network size estimate sent from the service diff --git a/src/nse/test_nse_multipeer.c b/src/nse/test_nse_multipeer.c index 1db00415f..4b4dbe7b9 100644 --- a/src/nse/test_nse_multipeer.c +++ b/src/nse/test_nse_multipeer.c @@ -29,7 +29,7 @@ #include "gnunet_testing_lib.h" #include "gnunet_nse_service.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define NUM_PEERS 4 diff --git a/src/peerinfo/peerinfo.h b/src/peerinfo/peerinfo.h index 87860097a..992dde782 100644 --- a/src/peerinfo/peerinfo.h +++ b/src/peerinfo/peerinfo.h @@ -27,7 +27,7 @@ #include "gnunet_time_lib.h" #include "gnunet_peerinfo_service.h" -#define DEBUG_PEERINFO GNUNET_NO +#define DEBUG_PEERINFO GNUNET_EXTRA_LOGGING /** * Message requesting a listing of all known peers, diff --git a/src/statistics/statistics.h b/src/statistics/statistics.h index 14dd45d82..a65dff147 100644 --- a/src/statistics/statistics.h +++ b/src/statistics/statistics.h @@ -27,7 +27,7 @@ #include "gnunet_common.h" -#define DEBUG_STATISTICS GNUNET_NO +#define DEBUG_STATISTICS GNUNET_EXTRA_LOGGING /** * Statistics message. Contains how long the system is up diff --git a/src/statistics/test_statistics_api.c b/src/statistics/test_statistics_api.c index 39a71a79e..efaf2d2ee 100644 --- a/src/statistics/test_statistics_api.c +++ b/src/statistics/test_statistics_api.c @@ -29,7 +29,7 @@ #include "gnunet_scheduler_lib.h" #include "gnunet_statistics_service.h" -#define DEBUG_STATISTICS GNUNET_NO +#define DEBUG_STATISTICS GNUNET_EXTRA_LOGGING #define START_SERVICE GNUNET_YES diff --git a/src/statistics/test_statistics_api_loop.c b/src/statistics/test_statistics_api_loop.c index eb739b752..f468c4ed8 100644 --- a/src/statistics/test_statistics_api_loop.c +++ b/src/statistics/test_statistics_api_loop.c @@ -29,7 +29,7 @@ #include "gnunet_scheduler_lib.h" #include "gnunet_statistics_service.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define START_SERVICE GNUNET_YES diff --git a/src/statistics/test_statistics_api_watch.c b/src/statistics/test_statistics_api_watch.c index cea495836..14e7e1704 100644 --- a/src/statistics/test_statistics_api_watch.c +++ b/src/statistics/test_statistics_api_watch.c @@ -29,7 +29,7 @@ #include "gnunet_scheduler_lib.h" #include "gnunet_statistics_service.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define START_SERVICE GNUNET_YES diff --git a/src/template/test_template_api.c b/src/template/test_template_api.c index b98785116..9302d0700 100644 --- a/src/template/test_template_api.c +++ b/src/template/test_template_api.c @@ -24,7 +24,7 @@ #include "platform.h" #include "gnunet_common.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING static int check () diff --git a/src/testing/test_testing_connect.c b/src/testing/test_testing_connect.c index a31449a71..5ace31f82 100644 --- a/src/testing/test_testing_connect.c +++ b/src/testing/test_testing_connect.c @@ -24,7 +24,7 @@ #include "platform.h" #include "gnunet_testing_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING /** * How long until we give up on connecting the peers? diff --git a/src/testing/test_testing_group.c b/src/testing/test_testing_group.c index f5df45b19..0ed01cb51 100644 --- a/src/testing/test_testing_group.c +++ b/src/testing/test_testing_group.c @@ -24,7 +24,7 @@ #include "platform.h" #include "gnunet_testing_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define NUM_PEERS 4 diff --git a/src/testing/test_testing_peergroup.c b/src/testing/test_testing_peergroup.c index 061a0ca75..8b8d32973 100644 --- a/src/testing/test_testing_peergroup.c +++ b/src/testing/test_testing_peergroup.c @@ -24,7 +24,7 @@ #include "platform.h" #include "gnunet_testing_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define NUM_PEERS 4 diff --git a/src/testing/test_testing_topology.c b/src/testing/test_testing_topology.c index 27ad0a24c..152b5cdcc 100644 --- a/src/testing/test_testing_topology.c +++ b/src/testing/test_testing_topology.c @@ -26,7 +26,7 @@ #include "gnunet_core_service.h" #include "gnunet_os_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define PROGRESS_BARS GNUNET_YES diff --git a/src/testing/test_testing_topology_blacklist.c b/src/testing/test_testing_topology_blacklist.c index d60e3a8fb..046cb2ca5 100644 --- a/src/testing/test_testing_topology_blacklist.c +++ b/src/testing/test_testing_topology_blacklist.c @@ -25,7 +25,7 @@ #include "gnunet_testing_lib.h" #include "gnunet_core_service.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING /** * How long until we fail the whole testcase? diff --git a/src/testing/testing.c b/src/testing/testing.c index 335457dcb..2e1dceb68 100644 --- a/src/testing/testing.c +++ b/src/testing/testing.c @@ -37,9 +37,9 @@ #include "gnunet_transport_service.h" #include "gnunet_hello_lib.h" -#define DEBUG_TESTING GNUNET_NO +#define DEBUG_TESTING GNUNET_EXTRA_LOGGING -#define DEBUG_TESTING_RECONNECT GNUNET_NO +#define DEBUG_TESTING_RECONNECT GNUNET_EXTRA_LOGGING /** * Hack to deal with initial HELLO's being often devoid of addresses. diff --git a/src/testing/testing_group.c b/src/testing/testing_group.c index 0813bd431..f4d789ca9 100644 --- a/src/testing/testing_group.c +++ b/src/testing/testing_group.c @@ -30,11 +30,11 @@ #include "gnunet_testing_lib.h" #include "gnunet_core_service.h" -#define VERBOSE_TESTING GNUNET_NO +#define VERBOSE_TESTING GNUNET_EXTRA_LOGGING -#define VERBOSE_TOPOLOGY GNUNET_NO +#define VERBOSE_TOPOLOGY GNUNET_EXTRA_LOGGING -#define DEBUG_CHURN GNUNET_NO +#define DEBUG_CHURN GNUNET_EXTRA_LOGGING #define USE_START_HELPER GNUNET_YES diff --git a/src/topology/test_gnunet_daemon_topology.c b/src/topology/test_gnunet_daemon_topology.c index 49990788a..9d8f1633d 100644 --- a/src/topology/test_gnunet_daemon_topology.c +++ b/src/topology/test_gnunet_daemon_topology.c @@ -24,7 +24,7 @@ #include "platform.h" #include "gnunet_testing_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define NUM_PEERS 2 diff --git a/src/transport/gnunet-transport-connect-running-peers.c b/src/transport/gnunet-transport-connect-running-peers.c index aac63cb35..3542f8521 100644 --- a/src/transport/gnunet-transport-connect-running-peers.c +++ b/src/transport/gnunet-transport-connect-running-peers.c @@ -36,9 +36,9 @@ #include "transport.h" #include "transport-testing.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING -#define VERBOSE_ARM GNUNET_NO +#define VERBOSE_ARM GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/transport/plugin_transport_http.h b/src/transport/plugin_transport_http.h index 11584553a..9b057d1b0 100644 --- a/src/transport/plugin_transport_http.h +++ b/src/transport/plugin_transport_http.h @@ -45,7 +45,7 @@ #define DEBUG_HTTP GNUNET_YES #define VERBOSE_SERVER GNUNET_YES #define VERBOSE_CLIENT GNUNET_YES -#define VERBOSE_CURL GNUNET_NO +#define VERBOSE_CURL GNUNET_EXTRA_LOGGING #if BUILD_HTTPS #define LIBGNUNET_PLUGIN_TRANSPORT_INIT libgnunet_plugin_transport_https_init diff --git a/src/transport/plugin_transport_smtp.c b/src/transport/plugin_transport_smtp.c index 260045602..fa11a9b6d 100644 --- a/src/transport/plugin_transport_smtp.c +++ b/src/transport/plugin_transport_smtp.c @@ -40,7 +40,7 @@ */ #define SMTP_MESSAGE_SIZE 65528 -#define DEBUG_SMTP GNUNET_NO +#define DEBUG_SMTP GNUNET_EXTRA_LOGGING #define FILTER_STRING_SIZE 64 diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c index af253f964..20e4bda50 100644 --- a/src/transport/plugin_transport_tcp.c +++ b/src/transport/plugin_transport_tcp.c @@ -39,9 +39,9 @@ #include "gnunet_transport_plugin.h" #include "transport.h" -#define DEBUG_TCP GNUNET_NO +#define DEBUG_TCP GNUNET_EXTRA_LOGGING -#define DEBUG_TCP_NAT GNUNET_NO +#define DEBUG_TCP_NAT GNUNET_EXTRA_LOGGING /** * Initial handshake message for a session. diff --git a/src/transport/plugin_transport_template.c b/src/transport/plugin_transport_template.c index 3ad8014c5..7110f9c88 100644 --- a/src/transport/plugin_transport_template.c +++ b/src/transport/plugin_transport_template.c @@ -33,7 +33,7 @@ #include "gnunet_transport_service.h" #include "gnunet_transport_plugin.h" -#define DEBUG_TEMPLATE GNUNET_NO +#define DEBUG_TEMPLATE GNUNET_EXTRA_LOGGING /** * After how long do we expire an address that we diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c index 752dd6f3d..a63c7d3e5 100644 --- a/src/transport/plugin_transport_udp.c +++ b/src/transport/plugin_transport_udp.c @@ -38,7 +38,7 @@ #include "gnunet_transport_plugin.h" #include "transport.h" -#define DEBUG_UDP GNUNET_NO +#define DEBUG_UDP GNUNET_EXTRA_LOGGING /** * MTU for fragmentation subsystem. Should be conservative since diff --git a/src/transport/plugin_transport_unix.c b/src/transport/plugin_transport_unix.c index 59c42e1f6..b927214bd 100644 --- a/src/transport/plugin_transport_unix.c +++ b/src/transport/plugin_transport_unix.c @@ -42,7 +42,7 @@ #include "gnunet_transport_plugin.h" #include "transport.h" -#define DEBUG_UNIX GNUNET_NO +#define DEBUG_UNIX GNUNET_EXTRA_LOGGING #define DETAILS GNUNET_NO #define MAX_PROBES 20 diff --git a/src/transport/plugin_transport_wlan.c b/src/transport/plugin_transport_wlan.c index 81f7923e3..2bd2dc9d9 100644 --- a/src/transport/plugin_transport_wlan.c +++ b/src/transport/plugin_transport_wlan.c @@ -101,9 +101,9 @@ * DEBUG switch */ #define DEBUG_wlan GNUNET_YES -#define DEBUG_wlan_retransmission GNUNET_NO -#define DEBUG_wlan_ip_udp_packets_on_air GNUNET_NO -#define DEBUG_wlan_msg_dump GNUNET_NO +#define DEBUG_wlan_retransmission GNUNET_EXTRA_LOGGING +#define DEBUG_wlan_ip_udp_packets_on_air GNUNET_EXTRA_LOGGING +#define DEBUG_wlan_msg_dump GNUNET_EXTRA_LOGGING #define IEEE80211_ADDR_LEN 6 /* size of 802.11 address */ diff --git a/src/transport/test_plugin_transport.c b/src/transport/test_plugin_transport.c index 794c8311d..56abe2cd3 100644 --- a/src/transport/test_plugin_transport.c +++ b/src/transport/test_plugin_transport.c @@ -37,7 +37,7 @@ #include "gnunet_transport_plugin.h" #include "transport.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING /** * How long until we give up on transmitting the message? diff --git a/src/transport/test_plugin_transport_http.c b/src/transport/test_plugin_transport_http.c index 778fe4be3..aab66c22f 100644 --- a/src/transport/test_plugin_transport_http.c +++ b/src/transport/test_plugin_transport_http.c @@ -42,8 +42,8 @@ #include "transport.h" #include -#define VERBOSE GNUNET_NO -#define DEBUG_CURL GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING +#define DEBUG_CURL GNUNET_EXTRA_LOGGING #define HTTP_BUFFER_SIZE 2048 #define PROTOCOL_PREFIX "http" diff --git a/src/transport/test_plugin_transport_https.c b/src/transport/test_plugin_transport_https.c index 962010c42..1027c2b0f 100644 --- a/src/transport/test_plugin_transport_https.c +++ b/src/transport/test_plugin_transport_https.c @@ -42,8 +42,8 @@ #include "transport.h" #include -#define VERBOSE GNUNET_NO -#define DEBUG_CURL GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING +#define DEBUG_CURL GNUNET_EXTRA_LOGGING #define HTTP_BUFFER_SIZE 2048 #define PLUGIN libgnunet_plugin_transport_template diff --git a/src/transport/test_plugin_transport_udp.c b/src/transport/test_plugin_transport_udp.c index 8fbd2ab9c..1b0ec91f6 100644 --- a/src/transport/test_plugin_transport_udp.c +++ b/src/transport/test_plugin_transport_udp.c @@ -38,7 +38,7 @@ #include "gnunet_transport_plugin.h" #include "transport.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING /** * How long until we give up on transmitting the message? diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c index 63bd7da02..8e4a40efc 100644 --- a/src/transport/test_quota_compliance.c +++ b/src/transport/test_quota_compliance.c @@ -35,13 +35,13 @@ #include "transport.h" #include "transport-testing.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING -#define VERBOSE_ARM GNUNET_NO +#define VERBOSE_ARM GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES -#define DEBUG_MEASUREMENT GNUNET_NO -#define DEBUG_CONNECTIONS GNUNET_NO +#define DEBUG_MEASUREMENT GNUNET_EXTRA_LOGGING +#define DEBUG_CONNECTIONS GNUNET_EXTRA_LOGGING #define MEASUREMENT_INTERVALL GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5) #define MEASUREMENT_MSG_SIZE 1024 diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c index eb64b0f39..033577a21 100644 --- a/src/transport/test_transport_api.c +++ b/src/transport/test_transport_api.c @@ -37,9 +37,9 @@ #include "transport.h" #include "transport-testing.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING -#define VERBOSE_ARM GNUNET_NO +#define VERBOSE_ARM GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/transport/test_transport_api_disconnect.c b/src/transport/test_transport_api_disconnect.c index 3cc30d91d..ad169df4c 100644 --- a/src/transport/test_transport_api_disconnect.c +++ b/src/transport/test_transport_api_disconnect.c @@ -37,9 +37,9 @@ #include "transport.h" #include "transport-testing.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING -#define VERBOSE_ARM GNUNET_NO +#define VERBOSE_ARM GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/transport/test_transport_api_limited_sockets.c b/src/transport/test_transport_api_limited_sockets.c index bc8b82538..66816671c 100644 --- a/src/transport/test_transport_api_limited_sockets.c +++ b/src/transport/test_transport_api_limited_sockets.c @@ -37,9 +37,9 @@ #include "transport.h" #include "transport-testing.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING -#define VERBOSE_ARM GNUNET_NO +#define VERBOSE_ARM GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c index d53ac0d22..a64a6fbe3 100644 --- a/src/transport/test_transport_api_reliability.c +++ b/src/transport/test_transport_api_reliability.c @@ -40,7 +40,7 @@ #define VERBOSE GNUNET_YES -#define VERBOSE_ARM GNUNET_NO +#define VERBOSE_ARM GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/transport/test_transport_api_timeout.c b/src/transport/test_transport_api_timeout.c index 0124889ce..84a8316bd 100644 --- a/src/transport/test_transport_api_timeout.c +++ b/src/transport/test_transport_api_timeout.c @@ -38,9 +38,9 @@ #include "transport.h" #include "transport-testing.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING -#define VERBOSE_ARM GNUNET_NO +#define VERBOSE_ARM GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/transport/test_transport_api_unreliability.c b/src/transport/test_transport_api_unreliability.c index 630011522..a8c8d14e9 100644 --- a/src/transport/test_transport_api_unreliability.c +++ b/src/transport/test_transport_api_unreliability.c @@ -39,9 +39,9 @@ #include "transport.h" #include "transport-testing.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING -#define VERBOSE_ARM GNUNET_NO +#define VERBOSE_ARM GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/transport/test_transport_api_unreliability_constant.c b/src/transport/test_transport_api_unreliability_constant.c index 4bbacca5e..d7c70df83 100644 --- a/src/transport/test_transport_api_unreliability_constant.c +++ b/src/transport/test_transport_api_unreliability_constant.c @@ -39,9 +39,9 @@ #include "transport.h" #include "transport-testing.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING -#define VERBOSE_ARM GNUNET_NO +#define VERBOSE_ARM GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/transport/test_transport_startonly.c b/src/transport/test_transport_startonly.c index 075c10527..89ada4c01 100644 --- a/src/transport/test_transport_startonly.c +++ b/src/transport/test_transport_startonly.c @@ -37,9 +37,9 @@ #include "transport.h" #include "transport-testing.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING -#define VERBOSE_ARM GNUNET_NO +#define VERBOSE_ARM GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/transport/test_transport_testing.c b/src/transport/test_transport_testing.c index 85c05df4b..db9f528d6 100644 --- a/src/transport/test_transport_testing.c +++ b/src/transport/test_transport_testing.c @@ -37,9 +37,9 @@ #include "transport.h" #include "transport-testing.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING -#define VERBOSE_ARM GNUNET_NO +#define VERBOSE_ARM GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES diff --git a/src/transport/transport.h b/src/transport/transport.h index 505d106e0..6ccc8abd2 100644 --- a/src/transport/transport.h +++ b/src/transport/transport.h @@ -30,13 +30,13 @@ #include "gnunet_time_lib.h" #include "gnunet_transport_service.h" -#define DEBUG_TRANSPORT GNUNET_NO +#define DEBUG_TRANSPORT GNUNET_EXTRA_LOGGING -#define DEBUG_TRANSPORT_TIMEOUT GNUNET_NO +#define DEBUG_TRANSPORT_TIMEOUT GNUNET_EXTRA_LOGGING -#define DEBUG_TRANSPORT_DISCONNECT GNUNET_NO +#define DEBUG_TRANSPORT_DISCONNECT GNUNET_EXTRA_LOGGING -#define DEBUG_TRANSPORT_API GNUNET_NO +#define DEBUG_TRANSPORT_API GNUNET_EXTRA_LOGGING /** * For how long do we allow unused bandwidth diff --git a/src/util/bandwidth.c b/src/util/bandwidth.c index 8d81e55a0..c0ac54054 100644 --- a/src/util/bandwidth.c +++ b/src/util/bandwidth.c @@ -27,7 +27,7 @@ #include "gnunet_bandwidth_lib.h" #include "gnunet_server_lib.h" -#define DEBUG_BANDWIDTH GNUNET_NO +#define DEBUG_BANDWIDTH GNUNET_EXTRA_LOGGING /** * Create a new bandwidth value. diff --git a/src/util/client.c b/src/util/client.c index e56856229..5193f751f 100644 --- a/src/util/client.c +++ b/src/util/client.c @@ -34,7 +34,7 @@ #include "gnunet_server_lib.h" #include "gnunet_scheduler_lib.h" -#define DEBUG_CLIENT GNUNET_NO +#define DEBUG_CLIENT GNUNET_EXTRA_LOGGING /** * How often do we re-try tranmsitting requests before giving up? diff --git a/src/util/connection.c b/src/util/connection.c index bb5df7f57..6b2cf75e0 100644 --- a/src/util/connection.c +++ b/src/util/connection.c @@ -39,7 +39,7 @@ #include "gnunet_scheduler_lib.h" #include "gnunet_server_lib.h" -#define DEBUG_CONNECTION GNUNET_NO +#define DEBUG_CONNECTION GNUNET_EXTRA_LOGGING /** * Possible functions to call after connect failed or succeeded. diff --git a/src/util/disk.c b/src/util/disk.c index 9059852d3..bb507bbff 100644 --- a/src/util/disk.c +++ b/src/util/disk.c @@ -34,9 +34,9 @@ #include "gnunet_crypto_lib.h" #include "disk.h" -#define DEBUG_NPIPE GNUNET_NO +#define DEBUG_NPIPE GNUNET_EXTRA_LOGGING -#define DEBUG_PIPE GNUNET_NO +#define DEBUG_PIPE GNUNET_EXTRA_LOGGING /** * Block size for IO for copying files. diff --git a/src/util/load.c b/src/util/load.c index 35ed443c3..39e861597 100644 --- a/src/util/load.c +++ b/src/util/load.c @@ -26,7 +26,7 @@ #include "platform.h" #include "gnunet_load_lib.h" -#define DEBUG_LOAD GNUNET_NO +#define DEBUG_LOAD GNUNET_EXTRA_LOGGING /** * Values we track for load calculations. diff --git a/src/util/network.c b/src/util/network.c index 27744bc1c..320304fe2 100644 --- a/src/util/network.c +++ b/src/util/network.c @@ -29,9 +29,9 @@ #include "disk.h" #include "gnunet_container_lib.h" -#define DEBUG_NETWORK GNUNET_NO +#define DEBUG_NETWORK GNUNET_EXTRA_LOGGING -#define DEBUG_W32_CYCLES GNUNET_NO +#define DEBUG_W32_CYCLES GNUNET_EXTRA_LOGGING #ifndef INVALID_SOCKET #define INVALID_SOCKET -1 diff --git a/src/util/resolver.h b/src/util/resolver.h index 5adf43633..57cb68650 100644 --- a/src/util/resolver.h +++ b/src/util/resolver.h @@ -27,7 +27,7 @@ #include "gnunet_common.h" -#define DEBUG_RESOLVER GNUNET_NO +#define DEBUG_RESOLVER GNUNET_EXTRA_LOGGING /** * Request for the resolver. Followed by either diff --git a/src/util/scheduler.c b/src/util/scheduler.c index e2f6700e4..dad924c32 100644 --- a/src/util/scheduler.c +++ b/src/util/scheduler.c @@ -48,7 +48,7 @@ /** * Check each file descriptor before adding */ -#define DEBUG_FDS GNUNET_NO +#define DEBUG_FDS GNUNET_EXTRA_LOGGING /** * Depth of the traces collected via EXECINFO. @@ -56,7 +56,7 @@ #define MAX_TRACE_DEPTH 50 #endif -#define DEBUG_TASKS GNUNET_NO +#define DEBUG_TASKS GNUNET_EXTRA_LOGGING /** * Should we figure out which tasks are delayed for a while diff --git a/src/util/server.c b/src/util/server.c index c8eb15f1c..63993ee37 100644 --- a/src/util/server.c +++ b/src/util/server.c @@ -33,7 +33,7 @@ #include "gnunet_disk_lib.h" #include "gnunet_protocols.h" -#define DEBUG_SERVER GNUNET_NO +#define DEBUG_SERVER GNUNET_EXTRA_LOGGING /** * List of arrays of message handlers. diff --git a/src/util/server_mst.c b/src/util/server_mst.c index ad3be8f63..adb0a0818 100644 --- a/src/util/server_mst.c +++ b/src/util/server_mst.c @@ -31,7 +31,7 @@ #include "gnunet_server_lib.h" #include "gnunet_time_lib.h" -#define DEBUG_SERVER_MST GNUNET_NO +#define DEBUG_SERVER_MST GNUNET_EXTRA_LOGGING #if HAVE_UNALIGNED_64_ACCESS #define ALIGN_FACTOR 4 diff --git a/src/util/server_nc.c b/src/util/server_nc.c index 7a26ab9bf..dc7a27c8b 100644 --- a/src/util/server_nc.c +++ b/src/util/server_nc.c @@ -34,7 +34,7 @@ #include "gnunet_time_lib.h" -#define DEBUG_SERVER_NC GNUNET_NO +#define DEBUG_SERVER_NC GNUNET_EXTRA_LOGGING /** * Entry in list of messages pending to be transmitted. diff --git a/src/util/service.c b/src/util/service.c index ad74d2786..15937e117 100644 --- a/src/util/service.c +++ b/src/util/service.c @@ -36,7 +36,7 @@ #include "gnunet_server_lib.h" #include "gnunet_service_lib.h" -#define DEBUG_SERVICE GNUNET_NO +#define DEBUG_SERVICE GNUNET_EXTRA_LOGGING /* ******************* access control ******************** */ diff --git a/src/util/test_client.c b/src/util/test_client.c index f9d961ab6..bb7d5008a 100644 --- a/src/util/test_client.c +++ b/src/util/test_client.c @@ -29,7 +29,7 @@ #include "gnunet_server_lib.h" #include "gnunet_time_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define PORT 14325 diff --git a/src/util/test_configuration.c b/src/util/test_configuration.c index 2737cb4f7..f02705f86 100644 --- a/src/util/test_configuration.c +++ b/src/util/test_configuration.c @@ -28,7 +28,7 @@ #include "gnunet_configuration_lib.h" #include "gnunet_disk_lib.h" -#define DEBUG GNUNET_NO +#define DEBUG GNUNET_EXTRA_LOGGING /* Test Configuration Diffs Options */ enum diff --git a/src/util/test_connection.c b/src/util/test_connection.c index cb69f4036..92c0cea2e 100644 --- a/src/util/test_connection.c +++ b/src/util/test_connection.c @@ -27,7 +27,7 @@ #include "gnunet_scheduler_lib.h" #include "gnunet_time_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define PORT 12435 diff --git a/src/util/test_connection_addressing.c b/src/util/test_connection_addressing.c index 2d08acc3c..018cf61fb 100644 --- a/src/util/test_connection_addressing.c +++ b/src/util/test_connection_addressing.c @@ -27,7 +27,7 @@ #include "gnunet_scheduler_lib.h" #include "gnunet_time_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define PORT 12435 diff --git a/src/util/test_connection_receive_cancel.c b/src/util/test_connection_receive_cancel.c index aa1672455..63829344d 100644 --- a/src/util/test_connection_receive_cancel.c +++ b/src/util/test_connection_receive_cancel.c @@ -27,7 +27,7 @@ #include "gnunet_scheduler_lib.h" #include "gnunet_time_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define PORT 12435 diff --git a/src/util/test_connection_timeout.c b/src/util/test_connection_timeout.c index 2338665cb..1700718b9 100644 --- a/src/util/test_connection_timeout.c +++ b/src/util/test_connection_timeout.c @@ -27,7 +27,7 @@ #include "gnunet_scheduler_lib.h" #include "gnunet_time_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define PORT 12435 diff --git a/src/util/test_connection_timeout_no_connect.c b/src/util/test_connection_timeout_no_connect.c index 2e8f9be2e..b598907ec 100644 --- a/src/util/test_connection_timeout_no_connect.c +++ b/src/util/test_connection_timeout_no_connect.c @@ -27,7 +27,7 @@ #include "gnunet_scheduler_lib.h" #include "gnunet_time_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define PORT 13425 diff --git a/src/util/test_connection_transmit_cancel.c b/src/util/test_connection_transmit_cancel.c index d81c32a6c..50308a2d0 100644 --- a/src/util/test_connection_transmit_cancel.c +++ b/src/util/test_connection_transmit_cancel.c @@ -27,7 +27,7 @@ #include "gnunet_scheduler_lib.h" #include "gnunet_time_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define PORT 12435 diff --git a/src/util/test_os_start_process.c b/src/util/test_os_start_process.c index 36dd42a23..df8520546 100644 --- a/src/util/test_os_start_process.c +++ b/src/util/test_os_start_process.c @@ -33,7 +33,7 @@ #include "gnunet_scheduler_lib.h" #include "disk.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING static char *test_phrase = "HELLO WORLD"; static int ok; diff --git a/src/util/test_peer.c b/src/util/test_peer.c index 1729114ff..3817d8243 100644 --- a/src/util/test_peer.c +++ b/src/util/test_peer.c @@ -29,7 +29,7 @@ #define NUMBER_OF_PEERS 10 -#define DEBUG GNUNET_NO +#define DEBUG GNUNET_EXTRA_LOGGING /** * A list of Peer ID's to play with diff --git a/src/util/test_plugin.c b/src/util/test_plugin.c index 9f1f0aad0..479edb3cb 100644 --- a/src/util/test_plugin.c +++ b/src/util/test_plugin.c @@ -24,7 +24,7 @@ #include "platform.h" #include "gnunet_plugin_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING static int check () diff --git a/src/util/test_resolver_api.c b/src/util/test_resolver_api.c index 704dc479b..4e248aa72 100644 --- a/src/util/test_resolver_api.c +++ b/src/util/test_resolver_api.c @@ -30,7 +30,7 @@ #include "gnunet_resolver_service.h" #include "resolver.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING /** * Using DNS root servers to check gnunet's resolver service diff --git a/src/util/test_scheduler.c b/src/util/test_scheduler.c index 3d8ae979c..788ba13fa 100644 --- a/src/util/test_scheduler.c +++ b/src/util/test_scheduler.c @@ -27,7 +27,7 @@ #include "gnunet_time_lib.h" #include "gnunet_disk_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING static void task3 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) diff --git a/src/util/test_scheduler_delay.c b/src/util/test_scheduler_delay.c index 8bcfa096e..ff6966a87 100644 --- a/src/util/test_scheduler_delay.c +++ b/src/util/test_scheduler_delay.c @@ -28,7 +28,7 @@ #include "gnunet_scheduler_lib.h" #include "gnunet_time_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING static struct GNUNET_TIME_Absolute target; diff --git a/src/util/test_server.c b/src/util/test_server.c index 59bf8a2f4..6c79e6064 100644 --- a/src/util/test_server.c +++ b/src/util/test_server.c @@ -28,7 +28,7 @@ #include "gnunet_server_lib.h" #include "gnunet_time_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define PORT 12435 diff --git a/src/util/test_server_disconnect.c b/src/util/test_server_disconnect.c index 8010695e8..69207f81a 100644 --- a/src/util/test_server_disconnect.c +++ b/src/util/test_server_disconnect.c @@ -28,7 +28,7 @@ #include "gnunet_server_lib.h" #include "gnunet_time_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define PORT 12435 diff --git a/src/util/test_server_with_client.c b/src/util/test_server_with_client.c index 06a4b71d6..5b6e51718 100644 --- a/src/util/test_server_with_client.c +++ b/src/util/test_server_with_client.c @@ -30,7 +30,7 @@ #include "gnunet_server_lib.h" #include "gnunet_time_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define PORT 22335 diff --git a/src/util/test_server_with_client_unix.c b/src/util/test_server_with_client_unix.c index 99af4e8c3..4f80f188c 100644 --- a/src/util/test_server_with_client_unix.c +++ b/src/util/test_server_with_client_unix.c @@ -30,7 +30,7 @@ #include "gnunet_server_lib.h" #include "gnunet_time_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define MY_TYPE 128 diff --git a/src/util/test_service.c b/src/util/test_service.c index edfe33771..1b78932f8 100644 --- a/src/util/test_service.c +++ b/src/util/test_service.c @@ -31,7 +31,7 @@ #include "gnunet_time_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define PORT 12435 diff --git a/src/util/test_strings.c b/src/util/test_strings.c index 97b0f4105..c6d604144 100644 --- a/src/util/test_strings.c +++ b/src/util/test_strings.c @@ -25,7 +25,7 @@ #include "gnunet_common.h" #include "gnunet_strings_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define WANT(a,b) if (0 != strcmp(a,b)) { fprintf(stderr, "Got `%s', wanted `%s'\n", b, a); GNUNET_free(b); GNUNET_break(0); return 1;} else { GNUNET_free (b); } #define WANTB(a,b,l) if (0 != memcmp(a,b,l)) { GNUNET_break(0); return 1;} else { } diff --git a/src/util/test_time.c b/src/util/test_time.c index 788884fcc..c5232ff2a 100644 --- a/src/util/test_time.c +++ b/src/util/test_time.c @@ -25,7 +25,7 @@ #include "gnunet_common.h" #include "gnunet_time_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING static int check () -- 2.25.1