LRN: Use GNUNET_EXTRA_LOGGING to manage compile-time logging calls

(#1805).

diff --git a/src/arm/arm.h b/src/arm/arm.h
index af5e405d88a6f5a971366edec0dcccf1a9857db9..f20562c205d77e711f1011a4c5b7b31994180682 100644 (file)
--- 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 837f67d4d430aae72f02ade71f19d29a5d0ebef9..24dd4ad25c4657f964885d0c39a319dccf127d22 100644 (file)
--- 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 11c245ea1ecd86129c6c9116b8367ce9e594cba3..5fbbaa6b1acd4b170e353f67dfea650350537e7f 100644 (file)
--- 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 778a4b84c7312b595343e882efd203f8a0d7bf37..ec2f4545d8b9e18ce41ebbb12cf3c9fd5318f671 100644 (file)
--- 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 4f863ed19674acdc85952338a25bd53b82243d03..100e1569c4ccd91e869f56316745d5c6ad87d8df 100644 (file)
--- 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 0be15d2553bc020850c901307710cc27315ebb60..e148c93844749d2ecff31c6e38407e6261434cec 100644 (file)
--- a/src/ats-test/perf_transport_ats.c
+++ b/src/ats-test/perf_transport_ats.c
@@ -26,7 +26,7 @@
 #include "gauger.h"
 #include <glpk.h>
 
-#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 fbc148e1049ee901a5d23bb548e345406204790d..fe317696acc5a289a1432935a9a5f1ea77a0074e 100644 (file)
--- 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 633d71c2095cf42cb175cce5aa82d3c50afa2568..f7f3c95527029d952c2a91c8259858b84b94dee8 100644 (file)
--- 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 550f218a980d127314f8a916bb397be0ba5febd5..4af1bdc4c2a6eb40cf78aaee896799317aec4928 100644 (file)
--- 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 0d4d65e94544d2fa45ec7b4637830e41d9893768..42d4859948763a8c48fc3c9dc3befe7e1ec0bbcc 100644 (file)
--- 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 1c6351fcd6a9226ce6ef47688603023de4313ed8..556f13ce42efded34826a004278342b5e7c948c7 100644 (file)
--- 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 331eea4f68c1d820a49cb5f11de2b305ce22bde5..c58615b7288bf4d47d0486f2fd9872148a98d421 100644 (file)
--- 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 e203706852a9f7727526bb9c1d7a38d79d6b037a..22fae2c172b93a44b99f0793f40feb075d6884b7 100644 (file)
--- 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 28a56526b3256dfe1cb1ab47171d63c8bf16da70..5a0e90a92cd3ab9f99824110e1aeabfdf227c520 100644 (file)
--- 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 7ce3004eb5265ab4bde81fd708517b3509d58c9f..6ed675dc9a6624bfaf3f3b86fe555aeb3e78a968 100644 (file)
--- 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 76853a1f0819b4feff14113d1ef290ea395608ec..0c769b837bb524bf9312f9562194a6d3651893eb 100644 (file)
--- 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 f7a3422e0d2cb7b50a77c2df0d839ae5aa6a8115..d1d3edb96aa6a2483ddaf84b444e1c8ca5ef8378 100644 (file)
--- 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 b51d29b9c7404e7f8e23c59f6f252f13c11aeb90..ae73b96a57e8a8793b9991581839be2a84ae33ce 100644 (file)
--- 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 c41ec90953ad4900da2a8340f04c734817d48c0b..ed8dfb9e9f1d831bd1e25ccff24c7ab57e7cee62 100644 (file)
--- 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 7cf8b19cf520c3cd304085f5b13c26559b142681..b4e14f08189c349dc9bd85e4cebeaab6d8480236 100644 (file)
--- 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 acec5bcf0138859dc90cc2504c8bb5ef81d67ab9..03968975c397c0fb0df34aab48e67c1a44e2e247 100644 (file)
--- 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 37580bb826645fa9d3a5dbb981e1771681849804..17a4c8fd4500183a4eae1fa2ca7e1417b364672c 100644 (file)
--- 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 c74f1f6668946785428bebbdee139a6439cee994..4a9790b08809f8575f9b3412d7271148f961ca60 100644 (file)
--- 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 894e4f6428a634a35633060a92325171a8232e7d..1566840e8d977cf20d1f101e6eca707ed7b402e6 100644 (file)
--- 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 d3364463a9b963a3e8e5dc7e9ecb1d7663c0948d..6730e3701af9c3413d5d5056dbe215ae2320d866 100644 (file)
--- 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 ad6e6a76199182542ade88f5a3ae59b7e0e62885..7224581d7354a82c14468d6c795d6a10f522f73b 100644 (file)
--- 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 <gauger.h>
 
-#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 ca301f51e83f9545dcb7ca410ac2de24d41ce159..ff4b564bfe7bbebccca4842cb7888f53c985c5bb 100644 (file)
--- 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 90a140d462f5175187f6eabe4aea96af360cd2b3..c909892e1b58462cd231108157c80f37406a37e0 100644 (file)
--- 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 fd3e23b9251096cd06297f7f0de9aaff81417f67..6fc0a7217a95331a29f31003e09519a597748040 100644 (file)
--- a/src/datacache/perf_datacache.c
+++ b/src/datacache/perf_datacache.c
@@ -27,7 +27,7 @@
 #include "gnunet_datacache_lib.h"
 #include <gauger.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/plugin_datacache_mysql.c b/src/datacache/plugin_datacache_mysql.c
index b9954faf949f45bf017883d680fcfc3181b359f3..cf282dbdccbb357d1e38ef65c9593852d3b1e6fb 100644 (file)
--- a/src/datacache/plugin_datacache_mysql.c
+++ b/src/datacache/plugin_datacache_mysql.c
@@ -82,7 +82,7 @@
 #include "gnunet_datacache_plugin.h"
 #include <mysql/mysql.h>
 
-#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 0f7dd8904bc6c8f545c556aa7811e589b1be116c..e05fbf2d3591346eeb7b0e9987d949bd8ae25aa1 100644 (file)
--- a/src/datacache/plugin_datacache_postgres.c
+++ b/src/datacache/plugin_datacache_postgres.c
@@ -28,7 +28,7 @@
 #include "gnunet_datacache_plugin.h"
 #include <postgresql/libpq-fe.h>
 
-#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 2b36e5b60493643a91b3ed23ed1b3f8a6d9b92cf..d7b77ac5220eb0b8499afacca0eb6c0857e3af70 100644 (file)
--- a/src/datacache/plugin_datacache_sqlite.c
+++ b/src/datacache/plugin_datacache_sqlite.c
@@ -28,7 +28,7 @@
 #include "gnunet_datacache_plugin.h"
 #include <sqlite3.h>
 
-#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 abf0209d822b26e502825b2175da26fb8c10214d..6c70807c104c86994712a05b6223a26698390655 100644 (file)
--- 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 6a05e61fb761e25755f5122514489ea3724a57cf..d3681da8e805e2ba446dbff0e549a54e996599af 100644 (file)
--- 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 1dcf7bb4bae20b1d2f8c6302d7bed87063304634..fa8352d2467636752810d79872d7751cdadaa3c5 100644 (file)
--- 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 07df6a691b22128446c0b0daa71c7a448487740d..1ba215374c751cea9422d6a2556aff830f548904 100644 (file)
--- a/src/datastore/perf_datastore_api.c
+++ b/src/datastore/perf_datastore_api.c
@@ -38,7 +38,7 @@
 #include "gnunet_datastore_service.h"
 #include <gauger.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/perf_plugin_datastore.c b/src/datastore/perf_plugin_datastore.c
index ac3be4d5cfe1126d71cd9567070656060ff4be62..8f552c4ebebf8102a223e442401bdfe3f50e6f1a 100644 (file)
--- a/src/datastore/perf_plugin_datastore.c
+++ b/src/datastore/perf_plugin_datastore.c
@@ -29,7 +29,7 @@
 #include "gnunet_datastore_plugin.h"
 #include <gauger.h>
 
-#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 0448b72994c85a8753cdac64f54ed30faeb8e366..1048a370f0c1b0ba5dda34470e1437b0a60bf61e 100644 (file)
--- a/src/datastore/plugin_datastore_mysql.c
+++ b/src/datastore/plugin_datastore_mysql.c
@@ -121,7 +121,7 @@
 #include "gnunet_util_lib.h"
 #include <mysql/mysql.h>
 
-#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 3c37325daba4d06697a758da03800d2bf3838aa3..0b781485fb62b5f306067c457d22343cf831d9c8 100644 (file)
--- a/src/datastore/plugin_datastore_postgres.c
+++ b/src/datastore/plugin_datastore_postgres.c
@@ -28,7 +28,7 @@
 #include "gnunet_datastore_plugin.h"
 #include <postgresql/libpq-fe.h>
 
-#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 931202707121a5f1f1caecc1f092ceafc3b1ec22..318c22cf557b69f5c94b4abcc9510709e990c576 100644 (file)
--- 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 47b1945ad7dad5cda1e7d8050017c9fcdb60f61a..b1dd0e5defc0047d229d4e0727809d7641ebd525 100644 (file)
--- 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 72348e28cb762bafb593176700f4fcd35bd55955..cb04d31d18a2c0bb12aee5bf417d301950117931 100644 (file)
--- 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 373e8f453d2c7657dffe9432479bff2ce1d582e6..3504945aec29c79b75d15051792291ae620dfd25 100644 (file)
--- 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 2e89cf3ebcc85fc2fd6cc7ec55d5996b538d19f1..100a945235ec5f1494dedc3eef1d521563d19d5b 100644 (file)
--- 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 87e08d84028927cf60830196767d1e7513ef0e64..51f7d947c49811005a998bf54ba049f964753ec9 100644 (file)
--- 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 75a7b42b579ed3f379bfd41efb19bb1d5d2b501a..296a19bcacd282270bfa9359df7298c16b72fcfe 100644 (file)
--- 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 9f13f5136498671eed47a69e9e12d71df39e3c02..8947739c4f71e7453dafcc93401596142377bb53 100644 (file)
--- 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 86ce546cc73e71fa14899198325fcf61ebfd396e..2a79c9ffb5c950d6ba755903a6e7c07dd40b2fa6 100644 (file)
--- 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 5be36c4a1eb68354f6e0ec62bb22351f046dd387..f2d86e38eee4c36b71c114e048b78aa05c68bff6 100644 (file)
--- 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 197a0500630211f7c71840b9eb47e529a2e4e5ab..44009c2578720011af72852b01b689c62aaa7b07 100644 (file)
--- 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 1d4912f84c8d5eaec58286ff3fde13ed868a2ab6..5690cf6ccc34903f2ee7c614894c62b0bc2feafc 100644 (file)
--- 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 bd73e7e20ad98431841edaaf9e4ac9f6d309f407..feb8a2e574867c2dcbc01f0b86f588966f9c40f7 100644 (file)
--- 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 83035911c8b646bbc62edb94b360a11d882bb11e..0e8444bd45c8598b0eace635213220b502dd8e58 100644 (file)
--- 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 b04b28385431fed73ad259084296d4f17305da4d..14901cf68f231d7c5341532afe9103c8dffd2f1a 100644 (file)
--- 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 ba44619860809aec3f44b9e6b41cfb5d23b4db19..af889d804425452c2771741f2bece85947d1ac33 100644 (file)
--- 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 7475896a876fda3800bf3bf8f2b043f0f8e9d6b9..7b2d5071c48371fdbc7c4437faf2024988918624 100644 (file)
--- 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 b286d41ca9b1602ab433d545d79dfd475d8728c8..4f27abae45d0ce055a80ab613994a59f40e707a2 100644 (file)
--- 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 10cce3f1f8e6b8b215ba6923f0d327031a58bd58..93a787477be063d7019e6cc1e8d222bedf3eb644 100644 (file)
--- 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 60e80efbb16f685d20944bd4aea89d4531d70d2c..fc04446c9a7a472c8098a5f35d7d01bc2a6fd63a 100644 (file)
--- 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 a37a39a7855245b7c0328b9dc01fdac292ecbf26..8dab620517b65fdcff63e6c3106fee24dc55f63a 100644 (file)
--- 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 ef2eebc8db6d326427825e7b9231fe647386bc94..8ba90dd226aa1cce1e510983cf8574218177f4f6 100644 (file)
--- 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 acdba81f065176f36272ca8bb58cd954c9a12ac6..515446117a61619f93321a05565aa415b15d6c14 100644 (file)
--- 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 0bf05d0cef28466ad62b34ca17edaaf52a6ed418..bff884e328f93f5533765ac0f8a8cfc63999bdec 100644 (file)
--- 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 64ddee638fa419286ecb9100b3baaa35b228ce85..9f5a36b7ea987f9b2ae656bc0b88d4b2daf98795 100644 (file)
--- 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 9aee89e85dde1176d79f0520280e60d8e5d48fc8..6e9581d173e71cc3992536b4e5ad7fadebe8ee16 100644 (file)
--- 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 10f4c0ce404c792e14cc654484d9072da7c3c076..19ef6e76a01005ad26f9e9d5ce5ae0379456d4cd 100644 (file)
--- a/src/fs/test_fs_download.c
+++ b/src/fs/test_fs_download.c
@@ -30,7 +30,7 @@
 #include "gnunet_fs_service.h"
 #include <gauger.h>
 
-#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 1811b325ddc0a3b7be1ec661ebb8e6611921b7ef..3f932f78316ea0d84ae4902d5b9288c669058239 100644 (file)
--- 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 <gauger.h>
 
-#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 c26a609780a256dff8eafd3e2fe887de5d37f218..9bc37235edf9aa0add3a793532fec86f77007eb4 100644 (file)
--- 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 d350dcae80a273daa0f7c94081fbf62a6bc9d2ec..cede523ec3aa33f57b413b1f1cab602cc30a4566 100644 (file)
--- 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 db5a8448aca4c2fc4ed7aaf5f71bb7557ac90868..a459c565fcf7cf531c36e0bbf2bc4c7a5308f552 100644 (file)
--- 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 b86506f8d7befca00bfe08ed3ba64b2bedf606d2..870f51a4a1e8d588cd4fe953a993015773876de7 100644 (file)
--- 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 ae2f778067abb6cc2e92fad88d6a98714c158fe1..b1221eb82315c2ee1589a56fc920f7221e3f684a 100644 (file)
--- 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 1ad2fb5ac2228193a7806e5b1bb933c9efd74913..5f6ead36be0708e34230d75f792b27a087bab7fc 100644 (file)
--- 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 3db0a7c62d1bebbfd275479bd501904cbf0cd778..81ec3dd7f2713b3d929412d4e83cd34a24b102a2 100644 (file)
--- 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 eab0aa650f96e020a39db7143daf7ef3678354a9..145ef0ca93be77770eac6ce9f01fd1b76d8d524a 100644 (file)
--- 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 d8e592b6fd15e4cf60e76bec2fe684674484cda8..9d9825e2fb7b61521a219993f7743712add43bc1 100644 (file)
--- 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 335b1bee349178fa4bb5b58005ad478668853198..74ba9659ab4df03da8050aba7bb73128d138c482 100644 (file)
--- 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 53522c6fecf21cc23ea1a483e0a741ce1d5681e9..6da936342e1dd755f3a37a4e3ebc4cf3783f7adb 100644 (file)
--- 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 c65ad2fc19fc5a0e2d8e64edd5d5655a281dbe91..23678fbf983774d7a6c62f1a618cfc60fead0ac2 100644 (file)
--- 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 589abb3fbbc3aaae53ddbbd73e866f17ee950e24..8f0bc1c878b6d473f4a761117549714d01191bf7 100644 (file)
--- 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 99913fbcfb30b5cff0bef677e35069009905525f..9b21cd651b62d8134b166a0ba6fc8d93d3bdf600 100644 (file)
--- 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 69623ac7c867e6d4d00378ac0816837961783f4c..0529aacfa71c2e77ad8a2b94cbb885d9c6c89be6 100644 (file)
--- 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 3d6735cc40f888bfd3c23845f349840645b27ffc..5d8aa21ef405dd65d69d63fc18028688ad00dafd 100644 (file)
--- 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 17b7ec181795fdbe0dbdf8c5c57522b8b8a59b33..434dd3ce527b360193e2671fab3bcce53fc1ec64 100644 (file)
--- 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 c9bf967916bf5b0521aa7fded22d93a0f82de083..b6cdfcf66a6a816765d8c4e516bbe2571a2e9d75 100644 (file)
--- 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 96124730728f150de1ef2d1e6445d95395b2dd53..8c9824e0ca9f7c3081b55c64ecea9c1b01e3b014 100644 (file)
--- 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 85c691172884edaa4c962962e74faa3fc376738c..3343b7a497eeaebebdae605fec80a9fe82713b07 100644 (file)
--- 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 bfe0b4b0ea9fc90d47f95e3f834604ba5ba0fd38..633824c411a3094cd27cabf8da62ccdb1748685a 100644 (file)
--- 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 b6d0a17360350cf77cac60ed5b05282a76090eb7..09410e14d13949c9eb84d196bec1bb802aceccb4 100644 (file)
--- 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 2538e42fbe800057678a3f5490d827df3e5c1f04..b68a93af039f8cc2497b4cb0ac26361c37f596fb 100644 (file)
--- 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 7280d85f90402eda4ee859d38da2cf11fafc7dae..ae5c1b6dd9521728f2dd6ae6ece6ad32be34f291 100644 (file)
--- 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 dbb5263d4f6856273c9b48ff82f5b31a8638e088..a32fe0908a39005eba6fb3db7a8b37f5f0eaa693 100644 (file)
--- 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 784fc6cc7455165b34b66b97ee806c46551e9811..19631af089ff8a86d17a3a851c05d3f015ba3915 100644 (file)
--- 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 2c6da3b57416286ec707075592fee9131e2db410..d4027ffcb80862f15ddc17ff0603fc63f4f15aa4 100644 (file)
--- 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 b3fb64221c9c11ee0d467c5ebef017eec62c5083..0786bb04bcb50dc6f9bbd52759a6bb67af94058f 100644 (file)
--- 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 9342480c2534eb9f4b0e5da8463489190458d250..a18a13fbddf249da07893c8b5cde57ed080a67e6 100644 (file)
--- 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 38cafafa3ede508a10125608f098d84e9eb67e45..536834573c9492c087932db04dd4e652f61e9b92 100644 (file)
--- 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 1db00415f9dca9c1abdaa3e454d51f2f0cb80b12..4b4dbe7b9c98cb085f5f7fbc3f6fe9fe28016ef0 100644 (file)
--- 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 87860097a4951667717a6a1b97aad42c83f9021c..992dde782eab44ea4b7bee772ac9eed3a8934dca 100644 (file)
--- 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 14dd45d82fb573eac1bdd0a416e36a70a9fc000a..a65dff1478dc295d5d130d27a028128a2958b663 100644 (file)
--- 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 39a71a79e6bd22442c7d0765c615ee5e484d2829..efaf2d2ee93ef3b1f94276e6fde3fe4bd7e02e30 100644 (file)
--- 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 eb739b752fc73b8a568169d6ccc42b144fc28b31..f468c4ed8fd4ca5c77e31b86833063c22256246a 100644 (file)
--- 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 cea4958363a675439e38f0391373c8d192846091..14e7e1704af5e30e3a8fadeb773e69e5b45eb902 100644 (file)
--- 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 b987851160b3938c0100435e200df287fee92f54..9302d0700e12b1556cddf1d008365e73622cef8b 100644 (file)
--- 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 a31449a7113ac17a89e4ff92358e9ac1cb323a52..5ace31f82d81c319d1047634479b60f5a72d5382 100644 (file)
--- 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 f5df45b19154432f715530acc62ed7907b5dc7aa..0ed01cb513759d21d2d70628ce5d151969adb282 100644 (file)
--- 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 061a0ca75e03ef353a8ed88fafbc18823480107c..8b8d32973ed49e9a66cc5f32b0f1ca6f59cf9daa 100644 (file)
--- 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 27ad0a24c9f815f36f4bcc9f635e927ca61b68c3..152b5cdcc6f1128ad05f7fc682bfce6b25138a41 100644 (file)
--- 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 d60e3a8fb33ef42627d03bf8dd119fcc6f4938df..046cb2ca52c94449e48dc578677c6a8f14daa79b 100644 (file)
--- 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 335457dcbd2015b23cfb6619bc29c25972417cdd..2e1dceb68a1528cb41bfeb92c0a393259270d289 100644 (file)
--- 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 0813bd4315d2372f63ee4707a42076c0420416c9..f4d789ca9b958eb28374d584efadc1cae19294c0 100644 (file)
--- 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 49990788a97cfd30d6fbcc37f4fa24d4d40721f6..9d8f1633d33416b5b69671873a7a6b25ac0762ed 100644 (file)
--- 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 aac63cb355dc29092ff84170fba3f71a12b754a1..3542f8521a3c0e22ee7495603b17004334266026 100644 (file)
--- 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 11584553a339b1f659472a6a7770c81358428f73..9b057d1b0f8b8ae58d089348c21a0576a7424965 100644 (file)
--- 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 2600456025ae27a0994f546cf2d0b78857b27c07..fa11a9b6d3d93c9036f470682462bdcf16b87d72 100644 (file)
--- 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 af253f9645e21241cb741f341444489b3da9cdde..20e4bda5097843c0c6e643afdfb63757f797ba0d 100644 (file)
--- 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 3ad8014c581bc0abe9748e23117c5f35fcf48838..7110f9c888392fe3b92f6e8c80dd920899b53710 100644 (file)
--- 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 752dd6f3dc9657bd0aa945b70b6d422dc52481e7..a63c7d3e5894a3ff61dcc03d237e2eb4561b0f75 100644 (file)
--- 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 59c42e1f64229af8686ce92a56f78959dd65f996..b927214bdd4b9494dde7466406da23c77ce92666 100644 (file)
--- 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 81f7923e35ea5262135bd16cbaebe24cda87c8c2..2bd2dc9d924de621e72387f82ccb19986597cae0 100644 (file)
--- 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 794c8311d8821ea96710472f7efccfd9c289093c..56abe2cd364ee086e071c0a2fca3f6da3dd9a955 100644 (file)
--- 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 778fe4be30858f826a07333303f7beb925b87ae0..aab66c22f7db91b5884a4dc1b649952b5c11414e 100644 (file)
--- a/src/transport/test_plugin_transport_http.c
+++ b/src/transport/test_plugin_transport_http.c
@@ -42,8 +42,8 @@
 #include "transport.h"
 #include <curl/curl.h>
 
-#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 962010c422d5552e7f55bd50a3ed26290b83814a..1027c2b0fc7b5782113ed5cf526a019ca946201b 100644 (file)
--- a/src/transport/test_plugin_transport_https.c
+++ b/src/transport/test_plugin_transport_https.c
@@ -42,8 +42,8 @@
 #include "transport.h"
 #include <curl/curl.h>
 
-#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 8fbd2ab9cd47a475bee828d8825ec9f80fda679c..1b0ec91f62872a4ff8965876b47a9d1df8e0f7b6 100644 (file)
--- 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 63bd7da028951b40f1c9e0c8e21e90269f3c6298..8e4a40efce90272fc710211cef56c8036f7cb391 100644 (file)
--- 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 eb64b0f398130a8846a6b17d644ba607843ef6c2..033577a2193122155eb2d85a650edf64cd71b55e 100644 (file)
--- 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 3cc30d91d7c3ae9fc226ebb1faafe6fe2737abbb..ad169df4ce0e82800dc1fad68390befdd4e99723 100644 (file)
--- 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 bc8b8253841179407bc95ff50ae4d9701ac80147..66816671c7ceed9e90b2bbacc52454f7caa77987 100644 (file)
--- 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 d53ac0d221e2eb90816e64d2e3a9303ac6b86afb..a64a6fbe3c40b7b6c4052771e251ee7792df59dc 100644 (file)
--- 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 0124889ce4f00a397914f248e550abfb422060ed..84a8316bd62cabb2b6ae5f481aac357652f079ea 100644 (file)
--- 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 630011522b843946ff7b0cb161df2563f6abf928..a8c8d14e9e401feba8a8b800633969dd157dbf5a 100644 (file)
--- 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 4bbacca5e49a423c7cafeefe94bea7755bceec4e..d7c70df83c8dc726ff7833bd068b399c29a68b19 100644 (file)
--- 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 075c1052730e33f370bc14f6e99ffeb78f94a28a..89ada4c01181c72ccf71da1edf4c7a74ced684f3 100644 (file)
--- 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 85c05df4bfa0309ada335c85afdf3b0c59bfe552..db9f528d68f31d8351521e922160c8e2a4c6d83a 100644 (file)
--- 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 505d106e017c099736dca3e8294e296613227e08..6ccc8abd299617edd1a891ee8909edd8d4d63f98 100644 (file)
--- 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 8d81e55a089d191a21a2752461bab2b407c1d730..c0ac54054434c821c48a2999ded7478f4a9568a1 100644 (file)
--- 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 e568562296274a61722d4c572c50032dd643a4f6..5193f751fc75b493b28a715d266b2449b7d09b80 100644 (file)
--- 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 bb5df7f5733b4b70765d6c5fb90942f16e61907c..6b2cf75e0ae5382cfd9158a072b929a33095840a 100644 (file)
--- 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 9059852d34e2d00d5692a5f547d5927017a67fc9..bb507bbffc2fb6e213711feb0e23ba2de61296c8 100644 (file)
--- 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 35ed443c33b44385e85a6aa9242d336d67c7687f..39e8615979740e92c0eddbbf26b3248e2612abd7 100644 (file)
--- 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 27744bc1c5bd37b0e1a7c71c4dbf8a5dc99dc34f..320304fe2de19a7976ee9696ee403f7f4f83ec4e 100644 (file)
--- 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 5adf43633199f5252eb8a1f173926743330b05c3..57cb68650786f5cb656d7733c1802624cecd98ad 100644 (file)
--- 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 e2f6700e4b20918917e9963828510bb038c9f4ec..dad924c329b6ece9b5047a116eb5aa9a27db202c 100644 (file)
--- 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 c8eb15f1ca0931e274b3ef9aad1cbe73e6665641..63993ee37d4b75ac0c60c0e9e15f3643d3661b59 100644 (file)
--- 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 ad3be8f63f2625ed889aa16069bacb2924cd51fc..adb0a0818eb4a3df3c16fc307ff58fa17e5803f9 100644 (file)
--- 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 7a26ab9bf7f374d0f7b5bbbf8dad4a25fc1b80f7..dc7a27c8b88a6e73b40094a7ff9619bdbd6a4b43 100644 (file)
--- 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 ad74d2786dcf0495369585b57a67ee4dc4fab3ae..15937e117a84a43f726192a60564f6b105ee07d7 100644 (file)
--- 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 f9d961ab6229098a0ccd6bf8e4a105969f533ce3..bb7d5008ac4e0696e224943b6b7d9a665a1e44d1 100644 (file)
--- 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 2737cb4f7eda1d5f0ed9040b6f7b1a60333a5d05..f02705f86ad8a2b0f4cedcbbe084dd36224531b4 100644 (file)
--- 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 cb69f40366ab1e51c038078075b54dcd9b1e56a8..92c0cea2ea8b4f66a4771eec6270deb72baa6fef 100644 (file)
--- 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 2d08acc3cd1421b25af7a914e8d207260ef17473..018cf61fb5421fd354acf10118df506caca41d0e 100644 (file)
--- 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 aa16724558ea03b0162e336d489e1a4617b4c004..63829344d05bb06704e9aaf02be9a0493fe9f354 100644 (file)
--- 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 2338665cb4e8ec91695af1b43f08d0fb2f904adb..1700718b9ed34ccf723378f1599efe832a1a5cb5 100644 (file)
--- 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 2e8f9be2eb415c3f12798d49c024000244b1a011..b598907ec85d88ced5502334e47af88f50b6138f 100644 (file)
--- 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 d81c32a6ca9d6eb37e05957e60c614081ef62eb9..50308a2d08e45138931243631cc58ebe36171383 100644 (file)
--- 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 36dd42a23a351ab0b955a41d555ea18338f8bec8..df852054601274848034e65aaed5c17d064a4e84 100644 (file)
--- 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 1729114ff5b4e959e021c726ac5f7ff7730a1cc3..3817d82437d6da788f18f88e3120d42a980bbc3e 100644 (file)
--- 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 9f1f0aad00f43b3f0a53900e83aca9857167dbb1..479edb3cb221eb5d680159f3619079c7df8da7c4 100644 (file)
--- 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 704dc479b8399375b3c6db95f5fe32f5919f00cc..4e248aa725edeb6dbc29b30c2ba5aa702a1b4d80 100644 (file)
--- 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 3d8ae979c9e85ba660d4774e40655d96ef3cf943..788ba13fa6a79dbffcd8137bb2feccc7493fe427 100644 (file)
--- 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 8bcfa096e9b76135f551f9fbad8a345138a8fc10..ff6966a87a68b625039b0b2f0f049f2493b8ebf4 100644 (file)
--- 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 59bf8a2f471e8456ded7efeb14ed0458ffb06fd4..6c79e6064c20960977c9bc737dc1b885263e12a4 100644 (file)
--- 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 8010695e8449f394c930350625bd068a9a0aa897..69207f81a702ae696cfd6ea9d152af9fe8a372a8 100644 (file)
--- 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 06a4b71d655c2f6df07bbbae03582cc8de37cfa2..5b6e517183a280829c71460a7e19b59d930da51c 100644 (file)
--- 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 99af4e8c3a6215f8e2c38bdb733be6eb135da93a..4f80f188cc17f5fa59945c365abc9e9ced21da9e 100644 (file)
--- 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 edfe3377111d58e244a344c2c6cf1c21a74924fd..1b78932f85634cdb284e3074d7ea6f12a44e1ae4 100644 (file)
--- 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 97b0f410505892c58f2c79a2c58140a5d362ab27..c6d6041447a98392967c172dc6a84aeb54015909 100644 (file)
--- 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 788884fcc4eee33ab09654d3e42e0a9f8a4543e5..c5232ff2a030f68e35118fe03c8c9573c5492a4f 100644 (file)
--- 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 ()