gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r17173 - in gnunet/src: arm ats ats-test block chat core da


From: gnunet
Subject: [GNUnet-SVN] r17173 - in gnunet/src: arm ats ats-test block chat core datacache datastore dht dv fragmentation fs hello hostlist nat nse peerinfo statistics template testing topology transport util
Date: Tue, 4 Oct 2011 15:24:22 +0200

Author: grothoff
Date: 2011-10-04 15:24:22 +0200 (Tue, 04 Oct 2011)
New Revision: 17173

Modified:
   gnunet/src/arm/arm.h
   gnunet/src/arm/gnunet-service-arm_interceptor.c
   gnunet/src/arm/test_arm_api.c
   gnunet/src/arm/test_exponential_backoff.c
   gnunet/src/arm/test_gnunet_service_manager.c
   gnunet/src/ats-test/perf_transport_ats.c
   gnunet/src/ats-test/test_transport_ats_multiple_peers.c
   gnunet/src/ats/ats_api.c
   gnunet/src/ats/gnunet-service-transport_ats.h
   gnunet/src/ats/test_ats_api.c
   gnunet/src/ats/test_ats_api_update_address.c
   gnunet/src/block/plugin_block_dht.c
   gnunet/src/block/plugin_block_dns.c
   gnunet/src/block/plugin_block_fs.c
   gnunet/src/block/plugin_block_template.c
   gnunet/src/block/plugin_block_test.c
   gnunet/src/block/test_block.c
   gnunet/src/chat/chat.c
   gnunet/src/chat/gnunet-service-chat.c
   gnunet/src/chat/test_chat.c
   gnunet/src/chat/test_chat_private.c
   gnunet/src/core/core.h
   gnunet/src/core/gnunet-service-core.c
   gnunet/src/core/test_core_api.c
   gnunet/src/core/test_core_api_preferences.c
   gnunet/src/core/test_core_api_reliability.c
   gnunet/src/core/test_core_api_start_only.c
   gnunet/src/core/test_core_quota_compliance.c
   gnunet/src/datacache/perf_datacache.c
   gnunet/src/datacache/plugin_datacache_mysql.c
   gnunet/src/datacache/plugin_datacache_postgres.c
   gnunet/src/datacache/plugin_datacache_sqlite.c
   gnunet/src/datacache/test_datacache.c
   gnunet/src/datacache/test_datacache_quota.c
   gnunet/src/datastore/datastore.h
   gnunet/src/datastore/perf_datastore_api.c
   gnunet/src/datastore/perf_plugin_datastore.c
   gnunet/src/datastore/plugin_datastore_mysql.c
   gnunet/src/datastore/plugin_datastore_postgres.c
   gnunet/src/datastore/plugin_datastore_sqlite.c
   gnunet/src/datastore/test_datastore_api.c
   gnunet/src/datastore/test_datastore_api_management.c
   gnunet/src/datastore/test_plugin_datastore.c
   gnunet/src/dht/dht_api.c
   gnunet/src/dht/test_dht_api.c
   gnunet/src/dht/test_dht_multipeer.c
   gnunet/src/dht/test_dht_twopeer.c
   gnunet/src/dht/test_dht_twopeer_get_put.c
   gnunet/src/dht/test_dht_twopeer_path_tracking.c
   gnunet/src/dht/test_dht_twopeer_put_get.c
   gnunet/src/dv/dv.h
   gnunet/src/dv/plugin_transport_dv.c
   gnunet/src/dv/test_transport_api_dv.c
   gnunet/src/fragmentation/test_fragmentation.c
   gnunet/src/fs/fs_download.c
   gnunet/src/fs/fs_namespace.c
   gnunet/src/fs/fs_publish.c
   gnunet/src/fs/fs_search.c
   gnunet/src/fs/fs_tree.c
   gnunet/src/fs/fs_unindex.c
   gnunet/src/fs/gnunet-service-fs.h
   gnunet/src/fs/gnunet-service-fs_push.c
   gnunet/src/fs/perf_gnunet_service_fs_p2p.c
   gnunet/src/fs/perf_gnunet_service_fs_p2p_trust.c
   gnunet/src/fs/test_fs.c
   gnunet/src/fs/test_fs_download.c
   gnunet/src/fs/test_fs_download_indexed.c
   gnunet/src/fs/test_fs_download_persistence.c
   gnunet/src/fs/test_fs_download_recursive.c
   gnunet/src/fs/test_fs_file_information.c
   gnunet/src/fs/test_fs_list_indexed.c
   gnunet/src/fs/test_fs_namespace.c
   gnunet/src/fs/test_fs_namespace_list_updateable.c
   gnunet/src/fs/test_fs_publish.c
   gnunet/src/fs/test_fs_publish_persistence.c
   gnunet/src/fs/test_fs_search.c
   gnunet/src/fs/test_fs_search_persistence.c
   gnunet/src/fs/test_fs_search_ranking.c
   gnunet/src/fs/test_fs_start_stop.c
   gnunet/src/fs/test_fs_test_lib.c
   gnunet/src/fs/test_fs_unindex.c
   gnunet/src/fs/test_fs_unindex_persistence.c
   gnunet/src/fs/test_gnunet_service_fs_migration.c
   gnunet/src/fs/test_gnunet_service_fs_p2p.c
   gnunet/src/hello/test_hello.c
   gnunet/src/hostlist/gnunet-daemon-hostlist.h
   gnunet/src/hostlist/hostlist-client.c
   gnunet/src/hostlist/hostlist-server.c
   gnunet/src/hostlist/test_gnunet_daemon_hostlist.c
   gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c
   gnunet/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
   gnunet/src/nat/nat.h
   gnunet/src/nat/test_nat.c
   gnunet/src/nat/test_nat_mini.c
   gnunet/src/nat/test_nat_test.c
   gnunet/src/nse/gnunet-nse-profiler.c
   gnunet/src/nse/nse.h
   gnunet/src/nse/test_nse_multipeer.c
   gnunet/src/peerinfo/peerinfo.h
   gnunet/src/statistics/statistics.h
   gnunet/src/statistics/test_statistics_api.c
   gnunet/src/statistics/test_statistics_api_loop.c
   gnunet/src/statistics/test_statistics_api_watch.c
   gnunet/src/template/test_template_api.c
   gnunet/src/testing/test_testing_connect.c
   gnunet/src/testing/test_testing_group.c
   gnunet/src/testing/test_testing_peergroup.c
   gnunet/src/testing/test_testing_topology.c
   gnunet/src/testing/test_testing_topology_blacklist.c
   gnunet/src/testing/testing.c
   gnunet/src/testing/testing_group.c
   gnunet/src/topology/test_gnunet_daemon_topology.c
   gnunet/src/transport/gnunet-transport-connect-running-peers.c
   gnunet/src/transport/plugin_transport_http.h
   gnunet/src/transport/plugin_transport_smtp.c
   gnunet/src/transport/plugin_transport_tcp.c
   gnunet/src/transport/plugin_transport_template.c
   gnunet/src/transport/plugin_transport_udp.c
   gnunet/src/transport/plugin_transport_unix.c
   gnunet/src/transport/plugin_transport_wlan.c
   gnunet/src/transport/test_plugin_transport.c
   gnunet/src/transport/test_plugin_transport_http.c
   gnunet/src/transport/test_plugin_transport_https.c
   gnunet/src/transport/test_plugin_transport_udp.c
   gnunet/src/transport/test_quota_compliance.c
   gnunet/src/transport/test_transport_api.c
   gnunet/src/transport/test_transport_api_disconnect.c
   gnunet/src/transport/test_transport_api_limited_sockets.c
   gnunet/src/transport/test_transport_api_reliability.c
   gnunet/src/transport/test_transport_api_timeout.c
   gnunet/src/transport/test_transport_api_unreliability.c
   gnunet/src/transport/test_transport_api_unreliability_constant.c
   gnunet/src/transport/test_transport_startonly.c
   gnunet/src/transport/test_transport_testing.c
   gnunet/src/transport/transport.h
   gnunet/src/util/bandwidth.c
   gnunet/src/util/client.c
   gnunet/src/util/connection.c
   gnunet/src/util/disk.c
   gnunet/src/util/load.c
   gnunet/src/util/network.c
   gnunet/src/util/resolver.h
   gnunet/src/util/scheduler.c
   gnunet/src/util/server.c
   gnunet/src/util/server_mst.c
   gnunet/src/util/server_nc.c
   gnunet/src/util/service.c
   gnunet/src/util/test_client.c
   gnunet/src/util/test_configuration.c
   gnunet/src/util/test_connection.c
   gnunet/src/util/test_connection_addressing.c
   gnunet/src/util/test_connection_receive_cancel.c
   gnunet/src/util/test_connection_timeout.c
   gnunet/src/util/test_connection_timeout_no_connect.c
   gnunet/src/util/test_connection_transmit_cancel.c
   gnunet/src/util/test_os_start_process.c
   gnunet/src/util/test_peer.c
   gnunet/src/util/test_plugin.c
   gnunet/src/util/test_resolver_api.c
   gnunet/src/util/test_scheduler.c
   gnunet/src/util/test_scheduler_delay.c
   gnunet/src/util/test_server.c
   gnunet/src/util/test_server_disconnect.c
   gnunet/src/util/test_server_with_client.c
   gnunet/src/util/test_server_with_client_unix.c
   gnunet/src/util/test_service.c
   gnunet/src/util/test_strings.c
   gnunet/src/util/test_time.c
Log:
LRN: Use GNUNET_EXTRA_LOGGING to manage compile-time logging calls
(#1805).



Modified: gnunet/src/arm/arm.h
===================================================================
--- gnunet/src/arm/arm.h        2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/arm/arm.h        2011-10-04 13:24:22 UTC (rev 17173)
@@ -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

Modified: gnunet/src/arm/gnunet-service-arm_interceptor.c
===================================================================
--- gnunet/src/arm/gnunet-service-arm_interceptor.c     2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/arm/gnunet-service-arm_interceptor.c     2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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)
 

Modified: gnunet/src/arm/test_arm_api.c
===================================================================
--- gnunet/src/arm/test_arm_api.c       2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/arm/test_arm_api.c       2011-10-04 13:24:22 UTC (rev 17173)
@@ -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
 

Modified: gnunet/src/arm/test_exponential_backoff.c
===================================================================
--- gnunet/src/arm/test_exponential_backoff.c   2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/arm/test_exponential_backoff.c   2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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)

Modified: gnunet/src/arm/test_gnunet_service_manager.c
===================================================================
--- gnunet/src/arm/test_gnunet_service_manager.c        2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/arm/test_gnunet_service_manager.c        2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -39,7 +39,7 @@
 
 #define START_ARM GNUNET_YES
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_EXTRA_LOGGING
 
 static int ret = 1;
 

Modified: gnunet/src/ats/ats_api.c
===================================================================
--- gnunet/src/ats/ats_api.c    2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/ats/ats_api.c    2011-10-04 13:24:22 UTC (rev 17173)
@@ -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;

Modified: gnunet/src/ats/gnunet-service-transport_ats.h
===================================================================
--- gnunet/src/ats/gnunet-service-transport_ats.h       2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/ats/gnunet-service-transport_ats.h       2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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*/

Modified: gnunet/src/ats/test_ats_api.c
===================================================================
--- gnunet/src/ats/test_ats_api.c       2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/ats/test_ats_api.c       2011-10-04 13:24:22 UTC (rev 17173)
@@ -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
 

Modified: gnunet/src/ats/test_ats_api_update_address.c
===================================================================
--- gnunet/src/ats/test_ats_api_update_address.c        2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/ats/test_ats_api_update_address.c        2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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
 

Modified: gnunet/src/ats-test/perf_transport_ats.c
===================================================================
--- gnunet/src/ats-test/perf_transport_ats.c    2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/ats-test/perf_transport_ats.c    2011-10-04 13:24:22 UTC (rev 
17173)
@@ -26,7 +26,7 @@
 #include "gauger.h"
 #include <glpk.h>
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_EXTRA_LOGGING
 
 #define EXECS 5
 

Modified: gnunet/src/ats-test/test_transport_ats_multiple_peers.c
===================================================================
--- gnunet/src/ats-test/test_transport_ats_multiple_peers.c     2011-10-04 
13:21:01 UTC (rev 17172)
+++ gnunet/src/ats-test/test_transport_ats_multiple_peers.c     2011-10-04 
13:24:22 UTC (rev 17173)
@@ -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

Modified: gnunet/src/block/plugin_block_dht.c
===================================================================
--- gnunet/src/block/plugin_block_dht.c 2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/block/plugin_block_dht.c 2011-10-04 13:24:22 UTC (rev 17173)
@@ -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
 
 
 /**

Modified: gnunet/src/block/plugin_block_dns.c
===================================================================
--- gnunet/src/block/plugin_block_dns.c 2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/block/plugin_block_dns.c 2011-10-04 13:24:22 UTC (rev 17173)
@@ -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

Modified: gnunet/src/block/plugin_block_fs.c
===================================================================
--- gnunet/src/block/plugin_block_fs.c  2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/block/plugin_block_fs.c  2011-10-04 13:24:22 UTC (rev 17173)
@@ -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.

Modified: gnunet/src/block/plugin_block_template.c
===================================================================
--- gnunet/src/block/plugin_block_template.c    2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/block/plugin_block_template.c    2011-10-04 13:24:22 UTC (rev 
17173)
@@ -27,7 +27,7 @@
 #include "platform.h"
 #include "gnunet_block_plugin.h"
 
-#define DEBUG_TEMPLATE GNUNET_NO
+#define DEBUG_TEMPLATE GNUNET_EXTRA_LOGGING
 
 
 /**

Modified: gnunet/src/block/plugin_block_test.c
===================================================================
--- gnunet/src/block/plugin_block_test.c        2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/block/plugin_block_test.c        2011-10-04 13:24:22 UTC (rev 
17173)
@@ -28,7 +28,7 @@
 #include "platform.h"
 #include "gnunet_block_plugin.h"
 
-#define DEBUG_TEST GNUNET_NO
+#define DEBUG_TEST GNUNET_EXTRA_LOGGING
 
 
 /**

Modified: gnunet/src/block/test_block.c
===================================================================
--- gnunet/src/block/test_block.c       2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/block/test_block.c       2011-10-04 13:24:22 UTC (rev 17173)
@@ -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)

Modified: gnunet/src/chat/chat.c
===================================================================
--- gnunet/src/chat/chat.c      2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/chat/chat.c      2011-10-04 13:24:22 UTC (rev 17173)
@@ -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_"
 
 

Modified: gnunet/src/chat/gnunet-service-chat.c
===================================================================
--- gnunet/src/chat/gnunet-service-chat.c       2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/chat/gnunet-service-chat.c       2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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

Modified: gnunet/src/chat/test_chat.c
===================================================================
--- gnunet/src/chat/test_chat.c 2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/chat/test_chat.c 2011-10-04 13:24:22 UTC (rev 17173)
@@ -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
 

Modified: gnunet/src/chat/test_chat_private.c
===================================================================
--- gnunet/src/chat/test_chat_private.c 2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/chat/test_chat_private.c 2011-10-04 13:24:22 UTC (rev 17173)
@@ -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
 

Modified: gnunet/src/core/core.h
===================================================================
--- gnunet/src/core/core.h      2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/core/core.h      2011-10-04 13:24:22 UTC (rev 17173)
@@ -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

Modified: gnunet/src/core/gnunet-service-core.c
===================================================================
--- gnunet/src/core/gnunet-service-core.c       2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/core/gnunet-service-core.c       2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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

Modified: gnunet/src/core/test_core_api.c
===================================================================
--- gnunet/src/core/test_core_api.c     2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/core/test_core_api.c     2011-10-04 13:24:22 UTC (rev 17173)
@@ -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
 

Modified: gnunet/src/core/test_core_api_preferences.c
===================================================================
--- gnunet/src/core/test_core_api_preferences.c 2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/core/test_core_api_preferences.c 2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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
 

Modified: gnunet/src/core/test_core_api_reliability.c
===================================================================
--- gnunet/src/core/test_core_api_reliability.c 2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/core/test_core_api_reliability.c 2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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
 

Modified: gnunet/src/core/test_core_api_start_only.c
===================================================================
--- gnunet/src/core/test_core_api_start_only.c  2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/core/test_core_api_start_only.c  2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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
 

Modified: gnunet/src/core/test_core_quota_compliance.c
===================================================================
--- gnunet/src/core/test_core_quota_compliance.c        2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/core/test_core_quota_compliance.c        2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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

Modified: gnunet/src/datacache/perf_datacache.c
===================================================================
--- gnunet/src/datacache/perf_datacache.c       2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/datacache/perf_datacache.c       2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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)
 

Modified: gnunet/src/datacache/plugin_datacache_mysql.c
===================================================================
--- gnunet/src/datacache/plugin_datacache_mysql.c       2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/datacache/plugin_datacache_mysql.c       2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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).

Modified: gnunet/src/datacache/plugin_datacache_postgres.c
===================================================================
--- gnunet/src/datacache/plugin_datacache_postgres.c    2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/datacache/plugin_datacache_postgres.c    2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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

Modified: gnunet/src/datacache/plugin_datacache_sqlite.c
===================================================================
--- gnunet/src/datacache/plugin_datacache_sqlite.c      2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/datacache/plugin_datacache_sqlite.c      2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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

Modified: gnunet/src/datacache/test_datacache.c
===================================================================
--- gnunet/src/datacache/test_datacache.c       2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/datacache/test_datacache.c       2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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)
 

Modified: gnunet/src/datacache/test_datacache_quota.c
===================================================================
--- gnunet/src/datacache/test_datacache_quota.c 2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/datacache/test_datacache_quota.c 2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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)
 

Modified: gnunet/src/datastore/datastore.h
===================================================================
--- gnunet/src/datastore/datastore.h    2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/datastore/datastore.h    2011-10-04 13:24:22 UTC (rev 17173)
@@ -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"
 

Modified: gnunet/src/datastore/perf_datastore_api.c
===================================================================
--- gnunet/src/datastore/perf_datastore_api.c   2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/datastore/perf_datastore_api.c   2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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?

Modified: gnunet/src/datastore/perf_plugin_datastore.c
===================================================================
--- gnunet/src/datastore/perf_plugin_datastore.c        2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/datastore/perf_plugin_datastore.c        2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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

Modified: gnunet/src/datastore/plugin_datastore_mysql.c
===================================================================
--- gnunet/src/datastore/plugin_datastore_mysql.c       2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/datastore/plugin_datastore_mysql.c       2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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
 

Modified: gnunet/src/datastore/plugin_datastore_postgres.c
===================================================================
--- gnunet/src/datastore/plugin_datastore_postgres.c    2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/datastore/plugin_datastore_postgres.c    2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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?

Modified: gnunet/src/datastore/plugin_datastore_sqlite.c
===================================================================
--- gnunet/src/datastore/plugin_datastore_sqlite.c      2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/datastore/plugin_datastore_sqlite.c      2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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

Modified: gnunet/src/datastore/test_datastore_api.c
===================================================================
--- gnunet/src/datastore/test_datastore_api.c   2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/datastore/test_datastore_api.c   2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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
 

Modified: gnunet/src/datastore/test_datastore_api_management.c
===================================================================
--- gnunet/src/datastore/test_datastore_api_management.c        2011-10-04 
13:21:01 UTC (rev 17172)
+++ gnunet/src/datastore/test_datastore_api_management.c        2011-10-04 
13:24:22 UTC (rev 17173)
@@ -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?

Modified: gnunet/src/datastore/test_plugin_datastore.c
===================================================================
--- gnunet/src/datastore/test_plugin_datastore.c        2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/datastore/test_plugin_datastore.c        2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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.

Modified: gnunet/src/dht/dht_api.c
===================================================================
--- gnunet/src/dht/dht_api.c    2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/dht/dht_api.c    2011-10-04 13:24:22 UTC (rev 17173)
@@ -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.

Modified: gnunet/src/dht/test_dht_api.c
===================================================================
--- gnunet/src/dht/test_dht_api.c       2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/dht/test_dht_api.c       2011-10-04 13:24:22 UTC (rev 17173)
@@ -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
 

Modified: gnunet/src/dht/test_dht_multipeer.c
===================================================================
--- gnunet/src/dht/test_dht_multipeer.c 2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/dht/test_dht_multipeer.c 2011-10-04 13:24:22 UTC (rev 17173)
@@ -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)

Modified: gnunet/src/dht/test_dht_twopeer.c
===================================================================
--- gnunet/src/dht/test_dht_twopeer.c   2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/dht/test_dht_twopeer.c   2011-10-04 13:24:22 UTC (rev 17173)
@@ -28,7 +28,7 @@
 #include "gnunet_dht_service.h"
 
 /* DEFINES */
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_EXTRA_LOGGING
 
 #define MAX_GET_ATTEMPTS 10
 

Modified: gnunet/src/dht/test_dht_twopeer_get_put.c
===================================================================
--- gnunet/src/dht/test_dht_twopeer_get_put.c   2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/dht/test_dht_twopeer_get_put.c   2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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)

Modified: gnunet/src/dht/test_dht_twopeer_path_tracking.c
===================================================================
--- gnunet/src/dht/test_dht_twopeer_path_tracking.c     2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/dht/test_dht_twopeer_path_tracking.c     2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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)

Modified: gnunet/src/dht/test_dht_twopeer_put_get.c
===================================================================
--- gnunet/src/dht/test_dht_twopeer_put_get.c   2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/dht/test_dht_twopeer_put_get.c   2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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)

Modified: gnunet/src/dv/dv.h
===================================================================
--- gnunet/src/dv/dv.h  2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/dv/dv.h  2011-10-04 13:24:22 UTC (rev 17173)
@@ -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 *

Modified: gnunet/src/dv/plugin_transport_dv.c
===================================================================
--- gnunet/src/dv/plugin_transport_dv.c 2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/dv/plugin_transport_dv.c 2011-10-04 13:24:22 UTC (rev 17173)
@@ -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.

Modified: gnunet/src/dv/test_transport_api_dv.c
===================================================================
--- gnunet/src/dv/test_transport_api_dv.c       2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/dv/test_transport_api_dv.c       2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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
 

Modified: gnunet/src/fragmentation/test_fragmentation.c
===================================================================
--- gnunet/src/fragmentation/test_fragmentation.c       2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/fragmentation/test_fragmentation.c       2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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
 

Modified: gnunet/src/fs/fs_download.c
===================================================================
--- gnunet/src/fs/fs_download.c 2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/fs/fs_download.c 2011-10-04 13:24:22 UTC (rev 17173)
@@ -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

Modified: gnunet/src/fs/fs_namespace.c
===================================================================
--- gnunet/src/fs/fs_namespace.c        2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/fs/fs_namespace.c        2011-10-04 13:24:22 UTC (rev 17173)
@@ -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

Modified: gnunet/src/fs/fs_publish.c
===================================================================
--- gnunet/src/fs/fs_publish.c  2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/fs/fs_publish.c  2011-10-04 13:24:22 UTC (rev 17173)
@@ -34,7 +34,7 @@
 #include "fs.h"
 #include "fs_tree.h"
 
-#define DEBUG_PUBLISH GNUNET_NO
+#define DEBUG_PUBLISH GNUNET_EXTRA_LOGGING
 
 
 /**

Modified: gnunet/src/fs/fs_search.c
===================================================================
--- gnunet/src/fs/fs_search.c   2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/fs/fs_search.c   2011-10-04 13:24:22 UTC (rev 17173)
@@ -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

Modified: gnunet/src/fs/fs_tree.c
===================================================================
--- gnunet/src/fs/fs_tree.c     2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/fs/fs_tree.c     2011-10-04 13:24:22 UTC (rev 17173)
@@ -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

Modified: gnunet/src/fs/fs_unindex.c
===================================================================
--- gnunet/src/fs/fs_unindex.c  2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/fs/fs_unindex.c  2011-10-04 13:24:22 UTC (rev 17173)
@@ -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

Modified: gnunet/src/fs/gnunet-service-fs.h
===================================================================
--- gnunet/src/fs/gnunet-service-fs.h   2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/fs/gnunet-service-fs.h   2011-10-04 13:24:22 UTC (rev 17173)
@@ -35,7 +35,7 @@
 
 #define DEBUG_FS GNUNET_YES
 
-#define DEBUG_FS_CLIENT GNUNET_NO
+#define DEBUG_FS_CLIENT GNUNET_EXTRA_LOGGING
 
 
 /**

Modified: gnunet/src/fs/gnunet-service-fs_push.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_push.c      2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/fs/gnunet-service-fs_push.c      2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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?

Modified: gnunet/src/fs/perf_gnunet_service_fs_p2p.c
===================================================================
--- gnunet/src/fs/perf_gnunet_service_fs_p2p.c  2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/fs/perf_gnunet_service_fs_p2p.c  2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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.

Modified: gnunet/src/fs/perf_gnunet_service_fs_p2p_trust.c
===================================================================
--- gnunet/src/fs/perf_gnunet_service_fs_p2p_trust.c    2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/fs/perf_gnunet_service_fs_p2p_trust.c    2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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.

Modified: gnunet/src/fs/test_fs.c
===================================================================
--- gnunet/src/fs/test_fs.c     2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/fs/test_fs.c     2011-10-04 13:24:22 UTC (rev 17173)
@@ -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; }
 

Modified: gnunet/src/fs/test_fs_download.c
===================================================================
--- gnunet/src/fs/test_fs_download.c    2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/fs/test_fs_download.c    2011-10-04 13:24:22 UTC (rev 17173)
@@ -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
 

Modified: gnunet/src/fs/test_fs_download_indexed.c
===================================================================
--- gnunet/src/fs/test_fs_download_indexed.c    2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/fs/test_fs_download_indexed.c    2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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
 

Modified: gnunet/src/fs/test_fs_download_persistence.c
===================================================================
--- gnunet/src/fs/test_fs_download_persistence.c        2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/fs/test_fs_download_persistence.c        2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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
 

Modified: gnunet/src/fs/test_fs_download_recursive.c
===================================================================
--- gnunet/src/fs/test_fs_download_recursive.c  2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/fs/test_fs_download_recursive.c  2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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; }
 

Modified: gnunet/src/fs/test_fs_file_information.c
===================================================================
--- gnunet/src/fs/test_fs_file_information.c    2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/fs/test_fs_file_information.c    2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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.

Modified: gnunet/src/fs/test_fs_list_indexed.c
===================================================================
--- gnunet/src/fs/test_fs_list_indexed.c        2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/fs/test_fs_list_indexed.c        2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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
 

Modified: gnunet/src/fs/test_fs_namespace.c
===================================================================
--- gnunet/src/fs/test_fs_namespace.c   2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/fs/test_fs_namespace.c   2011-10-04 13:24:22 UTC (rev 17173)
@@ -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
 

Modified: gnunet/src/fs/test_fs_namespace_list_updateable.c
===================================================================
--- gnunet/src/fs/test_fs_namespace_list_updateable.c   2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/fs/test_fs_namespace_list_updateable.c   2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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
 

Modified: gnunet/src/fs/test_fs_publish.c
===================================================================
--- gnunet/src/fs/test_fs_publish.c     2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/fs/test_fs_publish.c     2011-10-04 13:24:22 UTC (rev 17173)
@@ -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
 

Modified: gnunet/src/fs/test_fs_publish_persistence.c
===================================================================
--- gnunet/src/fs/test_fs_publish_persistence.c 2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/fs/test_fs_publish_persistence.c 2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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
 

Modified: gnunet/src/fs/test_fs_search.c
===================================================================
--- gnunet/src/fs/test_fs_search.c      2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/fs/test_fs_search.c      2011-10-04 13:24:22 UTC (rev 17173)
@@ -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
 

Modified: gnunet/src/fs/test_fs_search_persistence.c
===================================================================
--- gnunet/src/fs/test_fs_search_persistence.c  2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/fs/test_fs_search_persistence.c  2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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
 

Modified: gnunet/src/fs/test_fs_search_ranking.c
===================================================================
--- gnunet/src/fs/test_fs_search_ranking.c      2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/fs/test_fs_search_ranking.c      2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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; }
 

Modified: gnunet/src/fs/test_fs_start_stop.c
===================================================================
--- gnunet/src/fs/test_fs_start_stop.c  2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/fs/test_fs_start_stop.c  2011-10-04 13:24:22 UTC (rev 17173)
@@ -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
 

Modified: gnunet/src/fs/test_fs_test_lib.c
===================================================================
--- gnunet/src/fs/test_fs_test_lib.c    2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/fs/test_fs_test_lib.c    2011-10-04 13:24:22 UTC (rev 17173)
@@ -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.

Modified: gnunet/src/fs/test_fs_unindex.c
===================================================================
--- gnunet/src/fs/test_fs_unindex.c     2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/fs/test_fs_unindex.c     2011-10-04 13:24:22 UTC (rev 17173)
@@ -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
 

Modified: gnunet/src/fs/test_fs_unindex_persistence.c
===================================================================
--- gnunet/src/fs/test_fs_unindex_persistence.c 2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/fs/test_fs_unindex_persistence.c 2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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
 

Modified: gnunet/src/fs/test_gnunet_service_fs_migration.c
===================================================================
--- gnunet/src/fs/test_gnunet_service_fs_migration.c    2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/fs/test_gnunet_service_fs_migration.c    2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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.

Modified: gnunet/src/fs/test_gnunet_service_fs_p2p.c
===================================================================
--- gnunet/src/fs/test_gnunet_service_fs_p2p.c  2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/fs/test_gnunet_service_fs_p2p.c  2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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.

Modified: gnunet/src/hello/test_hello.c
===================================================================
--- gnunet/src/hello/test_hello.c       2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/hello/test_hello.c       2011-10-04 13:24:22 UTC (rev 17173)
@@ -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

Modified: gnunet/src/hostlist/gnunet-daemon-hostlist.h
===================================================================
--- gnunet/src/hostlist/gnunet-daemon-hostlist.h        2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/hostlist/gnunet-daemon-hostlist.h        2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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

Modified: gnunet/src/hostlist/hostlist-client.c
===================================================================
--- gnunet/src/hostlist/hostlist-client.c       2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/hostlist/hostlist-client.c       2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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
 
 
 /**

Modified: gnunet/src/hostlist/hostlist-server.c
===================================================================
--- gnunet/src/hostlist/hostlist-server.c       2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/hostlist/hostlist-server.c       2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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.

Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist.c
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist.c   2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist.c   2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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
 

Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c  2011-10-04 
13:21:01 UTC (rev 17172)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c  2011-10-04 
13:24:22 UTC (rev 17173)
@@ -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
 

Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c 2011-10-04 
13:21:01 UTC (rev 17172)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c 2011-10-04 
13:24:22 UTC (rev 17173)
@@ -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
 

Modified: gnunet/src/nat/nat.h
===================================================================
--- gnunet/src/nat/nat.h        2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/nat/nat.h        2011-10-04 13:24:22 UTC (rev 17173)
@@ -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.

Modified: gnunet/src/nat/test_nat.c
===================================================================
--- gnunet/src/nat/test_nat.c   2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/nat/test_nat.c   2011-10-04 13:24:22 UTC (rev 17173)
@@ -41,7 +41,7 @@
 #include "gnunet_nat_lib.h"
 
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_EXTRA_LOGGING
 
 
 /**

Modified: gnunet/src/nat/test_nat_mini.c
===================================================================
--- gnunet/src/nat/test_nat_mini.c      2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/nat/test_nat_mini.c      2011-10-04 13:24:22 UTC (rev 17173)
@@ -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)

Modified: gnunet/src/nat/test_nat_test.c
===================================================================
--- gnunet/src/nat/test_nat_test.c      2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/nat/test_nat_test.c      2011-10-04 13:24:22 UTC (rev 17173)
@@ -31,7 +31,7 @@
 #include "gnunet_nat_lib.h"
 
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_EXTRA_LOGGING
 
 
 /**

Modified: gnunet/src/nse/gnunet-nse-profiler.c
===================================================================
--- gnunet/src/nse/gnunet-nse-profiler.c        2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/nse/gnunet-nse-profiler.c        2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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
 {

Modified: gnunet/src/nse/nse.h
===================================================================
--- gnunet/src/nse/nse.h        2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/nse/nse.h        2011-10-04 13:24:22 UTC (rev 17173)
@@ -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

Modified: gnunet/src/nse/test_nse_multipeer.c
===================================================================
--- gnunet/src/nse/test_nse_multipeer.c 2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/nse/test_nse_multipeer.c 2011-10-04 13:24:22 UTC (rev 17173)
@@ -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
 

Modified: gnunet/src/peerinfo/peerinfo.h
===================================================================
--- gnunet/src/peerinfo/peerinfo.h      2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/peerinfo/peerinfo.h      2011-10-04 13:24:22 UTC (rev 17173)
@@ -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,

Modified: gnunet/src/statistics/statistics.h
===================================================================
--- gnunet/src/statistics/statistics.h  2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/statistics/statistics.h  2011-10-04 13:24:22 UTC (rev 17173)
@@ -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

Modified: gnunet/src/statistics/test_statistics_api.c
===================================================================
--- gnunet/src/statistics/test_statistics_api.c 2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/statistics/test_statistics_api.c 2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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
 

Modified: gnunet/src/statistics/test_statistics_api_loop.c
===================================================================
--- gnunet/src/statistics/test_statistics_api_loop.c    2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/statistics/test_statistics_api_loop.c    2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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
 

Modified: gnunet/src/statistics/test_statistics_api_watch.c
===================================================================
--- gnunet/src/statistics/test_statistics_api_watch.c   2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/statistics/test_statistics_api_watch.c   2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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
 

Modified: gnunet/src/template/test_template_api.c
===================================================================
--- gnunet/src/template/test_template_api.c     2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/template/test_template_api.c     2011-10-04 13:24:22 UTC (rev 
17173)
@@ -24,7 +24,7 @@
 #include "platform.h"
 #include "gnunet_common.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_EXTRA_LOGGING
 
 static int
 check ()

Modified: gnunet/src/testing/test_testing_connect.c
===================================================================
--- gnunet/src/testing/test_testing_connect.c   2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/testing/test_testing_connect.c   2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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?

Modified: gnunet/src/testing/test_testing_group.c
===================================================================
--- gnunet/src/testing/test_testing_group.c     2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/testing/test_testing_group.c     2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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
 

Modified: gnunet/src/testing/test_testing_peergroup.c
===================================================================
--- gnunet/src/testing/test_testing_peergroup.c 2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/testing/test_testing_peergroup.c 2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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
 

Modified: gnunet/src/testing/test_testing_topology.c
===================================================================
--- gnunet/src/testing/test_testing_topology.c  2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/testing/test_testing_topology.c  2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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
 

Modified: gnunet/src/testing/test_testing_topology_blacklist.c
===================================================================
--- gnunet/src/testing/test_testing_topology_blacklist.c        2011-10-04 
13:21:01 UTC (rev 17172)
+++ gnunet/src/testing/test_testing_topology_blacklist.c        2011-10-04 
13:24:22 UTC (rev 17173)
@@ -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?

Modified: gnunet/src/testing/testing.c
===================================================================
--- gnunet/src/testing/testing.c        2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/testing/testing.c        2011-10-04 13:24:22 UTC (rev 17173)
@@ -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.

Modified: gnunet/src/testing/testing_group.c
===================================================================
--- gnunet/src/testing/testing_group.c  2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/testing/testing_group.c  2011-10-04 13:24:22 UTC (rev 17173)
@@ -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
 

Modified: gnunet/src/topology/test_gnunet_daemon_topology.c
===================================================================
--- gnunet/src/topology/test_gnunet_daemon_topology.c   2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/topology/test_gnunet_daemon_topology.c   2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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
 

Modified: gnunet/src/transport/gnunet-transport-connect-running-peers.c
===================================================================
--- gnunet/src/transport/gnunet-transport-connect-running-peers.c       
2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/transport/gnunet-transport-connect-running-peers.c       
2011-10-04 13:24:22 UTC (rev 17173)
@@ -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
 

Modified: gnunet/src/transport/plugin_transport_http.h
===================================================================
--- gnunet/src/transport/plugin_transport_http.h        2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/transport/plugin_transport_http.h        2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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

Modified: gnunet/src/transport/plugin_transport_smtp.c
===================================================================
--- gnunet/src/transport/plugin_transport_smtp.c        2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/transport/plugin_transport_smtp.c        2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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
 

Modified: gnunet/src/transport/plugin_transport_tcp.c
===================================================================
--- gnunet/src/transport/plugin_transport_tcp.c 2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/transport/plugin_transport_tcp.c 2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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.

Modified: gnunet/src/transport/plugin_transport_template.c
===================================================================
--- gnunet/src/transport/plugin_transport_template.c    2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/transport/plugin_transport_template.c    2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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

Modified: gnunet/src/transport/plugin_transport_udp.c
===================================================================
--- gnunet/src/transport/plugin_transport_udp.c 2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/transport/plugin_transport_udp.c 2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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

Modified: gnunet/src/transport/plugin_transport_unix.c
===================================================================
--- gnunet/src/transport/plugin_transport_unix.c        2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/transport/plugin_transport_unix.c        2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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

Modified: gnunet/src/transport/plugin_transport_wlan.c
===================================================================
--- gnunet/src/transport/plugin_transport_wlan.c        2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/transport/plugin_transport_wlan.c        2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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 */

Modified: gnunet/src/transport/test_plugin_transport.c
===================================================================
--- gnunet/src/transport/test_plugin_transport.c        2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/transport/test_plugin_transport.c        2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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?

Modified: gnunet/src/transport/test_plugin_transport_http.c
===================================================================
--- gnunet/src/transport/test_plugin_transport_http.c   2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/transport/test_plugin_transport_http.c   2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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"

Modified: gnunet/src/transport/test_plugin_transport_https.c
===================================================================
--- gnunet/src/transport/test_plugin_transport_https.c  2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/transport/test_plugin_transport_https.c  2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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

Modified: gnunet/src/transport/test_plugin_transport_udp.c
===================================================================
--- gnunet/src/transport/test_plugin_transport_udp.c    2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/transport/test_plugin_transport_udp.c    2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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?

Modified: gnunet/src/transport/test_quota_compliance.c
===================================================================
--- gnunet/src/transport/test_quota_compliance.c        2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/transport/test_quota_compliance.c        2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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

Modified: gnunet/src/transport/test_transport_api.c
===================================================================
--- gnunet/src/transport/test_transport_api.c   2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/transport/test_transport_api.c   2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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
 

Modified: gnunet/src/transport/test_transport_api_disconnect.c
===================================================================
--- gnunet/src/transport/test_transport_api_disconnect.c        2011-10-04 
13:21:01 UTC (rev 17172)
+++ gnunet/src/transport/test_transport_api_disconnect.c        2011-10-04 
13:24:22 UTC (rev 17173)
@@ -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
 

Modified: gnunet/src/transport/test_transport_api_limited_sockets.c
===================================================================
--- gnunet/src/transport/test_transport_api_limited_sockets.c   2011-10-04 
13:21:01 UTC (rev 17172)
+++ gnunet/src/transport/test_transport_api_limited_sockets.c   2011-10-04 
13:24:22 UTC (rev 17173)
@@ -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
 

Modified: gnunet/src/transport/test_transport_api_reliability.c
===================================================================
--- gnunet/src/transport/test_transport_api_reliability.c       2011-10-04 
13:21:01 UTC (rev 17172)
+++ gnunet/src/transport/test_transport_api_reliability.c       2011-10-04 
13:24:22 UTC (rev 17173)
@@ -40,7 +40,7 @@
 
 #define VERBOSE GNUNET_YES
 
-#define VERBOSE_ARM GNUNET_NO
+#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
 
 #define START_ARM GNUNET_YES
 

Modified: gnunet/src/transport/test_transport_api_timeout.c
===================================================================
--- gnunet/src/transport/test_transport_api_timeout.c   2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/transport/test_transport_api_timeout.c   2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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
 

Modified: gnunet/src/transport/test_transport_api_unreliability.c
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability.c     2011-10-04 
13:21:01 UTC (rev 17172)
+++ gnunet/src/transport/test_transport_api_unreliability.c     2011-10-04 
13:24:22 UTC (rev 17173)
@@ -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
 

Modified: gnunet/src/transport/test_transport_api_unreliability_constant.c
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_constant.c    
2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/transport/test_transport_api_unreliability_constant.c    
2011-10-04 13:24:22 UTC (rev 17173)
@@ -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
 

Modified: gnunet/src/transport/test_transport_startonly.c
===================================================================
--- gnunet/src/transport/test_transport_startonly.c     2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/transport/test_transport_startonly.c     2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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
 

Modified: gnunet/src/transport/test_transport_testing.c
===================================================================
--- gnunet/src/transport/test_transport_testing.c       2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/transport/test_transport_testing.c       2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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
 

Modified: gnunet/src/transport/transport.h
===================================================================
--- gnunet/src/transport/transport.h    2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/transport/transport.h    2011-10-04 13:24:22 UTC (rev 17173)
@@ -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

Modified: gnunet/src/util/bandwidth.c
===================================================================
--- gnunet/src/util/bandwidth.c 2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/util/bandwidth.c 2011-10-04 13:24:22 UTC (rev 17173)
@@ -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.

Modified: gnunet/src/util/client.c
===================================================================
--- gnunet/src/util/client.c    2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/util/client.c    2011-10-04 13:24:22 UTC (rev 17173)
@@ -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?

Modified: gnunet/src/util/connection.c
===================================================================
--- gnunet/src/util/connection.c        2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/util/connection.c        2011-10-04 13:24:22 UTC (rev 17173)
@@ -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.

Modified: gnunet/src/util/disk.c
===================================================================
--- gnunet/src/util/disk.c      2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/util/disk.c      2011-10-04 13:24:22 UTC (rev 17173)
@@ -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.

Modified: gnunet/src/util/load.c
===================================================================
--- gnunet/src/util/load.c      2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/util/load.c      2011-10-04 13:24:22 UTC (rev 17173)
@@ -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.

Modified: gnunet/src/util/network.c
===================================================================
--- gnunet/src/util/network.c   2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/util/network.c   2011-10-04 13:24:22 UTC (rev 17173)
@@ -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

Modified: gnunet/src/util/resolver.h
===================================================================
--- gnunet/src/util/resolver.h  2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/util/resolver.h  2011-10-04 13:24:22 UTC (rev 17173)
@@ -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

Modified: gnunet/src/util/scheduler.c
===================================================================
--- gnunet/src/util/scheduler.c 2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/util/scheduler.c 2011-10-04 13:24:22 UTC (rev 17173)
@@ -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

Modified: gnunet/src/util/server.c
===================================================================
--- gnunet/src/util/server.c    2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/util/server.c    2011-10-04 13:24:22 UTC (rev 17173)
@@ -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.

Modified: gnunet/src/util/server_mst.c
===================================================================
--- gnunet/src/util/server_mst.c        2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/util/server_mst.c        2011-10-04 13:24:22 UTC (rev 17173)
@@ -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

Modified: gnunet/src/util/server_nc.c
===================================================================
--- gnunet/src/util/server_nc.c 2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/util/server_nc.c 2011-10-04 13:24:22 UTC (rev 17173)
@@ -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.

Modified: gnunet/src/util/service.c
===================================================================
--- gnunet/src/util/service.c   2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/util/service.c   2011-10-04 13:24:22 UTC (rev 17173)
@@ -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 ******************** */
 

Modified: gnunet/src/util/test_client.c
===================================================================
--- gnunet/src/util/test_client.c       2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/util/test_client.c       2011-10-04 13:24:22 UTC (rev 17173)
@@ -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
 

Modified: gnunet/src/util/test_configuration.c
===================================================================
--- gnunet/src/util/test_configuration.c        2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/util/test_configuration.c        2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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

Modified: gnunet/src/util/test_connection.c
===================================================================
--- gnunet/src/util/test_connection.c   2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/util/test_connection.c   2011-10-04 13:24:22 UTC (rev 17173)
@@ -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
 

Modified: gnunet/src/util/test_connection_addressing.c
===================================================================
--- gnunet/src/util/test_connection_addressing.c        2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/util/test_connection_addressing.c        2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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
 

Modified: gnunet/src/util/test_connection_receive_cancel.c
===================================================================
--- gnunet/src/util/test_connection_receive_cancel.c    2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/util/test_connection_receive_cancel.c    2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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
 

Modified: gnunet/src/util/test_connection_timeout.c
===================================================================
--- gnunet/src/util/test_connection_timeout.c   2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/util/test_connection_timeout.c   2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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
 

Modified: gnunet/src/util/test_connection_timeout_no_connect.c
===================================================================
--- gnunet/src/util/test_connection_timeout_no_connect.c        2011-10-04 
13:21:01 UTC (rev 17172)
+++ gnunet/src/util/test_connection_timeout_no_connect.c        2011-10-04 
13:24:22 UTC (rev 17173)
@@ -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
 

Modified: gnunet/src/util/test_connection_transmit_cancel.c
===================================================================
--- gnunet/src/util/test_connection_transmit_cancel.c   2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/util/test_connection_transmit_cancel.c   2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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
 

Modified: gnunet/src/util/test_os_start_process.c
===================================================================
--- gnunet/src/util/test_os_start_process.c     2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/util/test_os_start_process.c     2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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;

Modified: gnunet/src/util/test_peer.c
===================================================================
--- gnunet/src/util/test_peer.c 2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/util/test_peer.c 2011-10-04 13:24:22 UTC (rev 17173)
@@ -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

Modified: gnunet/src/util/test_plugin.c
===================================================================
--- gnunet/src/util/test_plugin.c       2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/util/test_plugin.c       2011-10-04 13:24:22 UTC (rev 17173)
@@ -24,7 +24,7 @@
 #include "platform.h"
 #include "gnunet_plugin_lib.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_EXTRA_LOGGING
 
 static int
 check ()

Modified: gnunet/src/util/test_resolver_api.c
===================================================================
--- gnunet/src/util/test_resolver_api.c 2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/util/test_resolver_api.c 2011-10-04 13:24:22 UTC (rev 17173)
@@ -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

Modified: gnunet/src/util/test_scheduler.c
===================================================================
--- gnunet/src/util/test_scheduler.c    2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/util/test_scheduler.c    2011-10-04 13:24:22 UTC (rev 17173)
@@ -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)

Modified: gnunet/src/util/test_scheduler_delay.c
===================================================================
--- gnunet/src/util/test_scheduler_delay.c      2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/util/test_scheduler_delay.c      2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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;
 

Modified: gnunet/src/util/test_server.c
===================================================================
--- gnunet/src/util/test_server.c       2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/util/test_server.c       2011-10-04 13:24:22 UTC (rev 17173)
@@ -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
 

Modified: gnunet/src/util/test_server_disconnect.c
===================================================================
--- gnunet/src/util/test_server_disconnect.c    2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/util/test_server_disconnect.c    2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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
 

Modified: gnunet/src/util/test_server_with_client.c
===================================================================
--- gnunet/src/util/test_server_with_client.c   2011-10-04 13:21:01 UTC (rev 
17172)
+++ gnunet/src/util/test_server_with_client.c   2011-10-04 13:24:22 UTC (rev 
17173)
@@ -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
 

Modified: gnunet/src/util/test_server_with_client_unix.c
===================================================================
--- gnunet/src/util/test_server_with_client_unix.c      2011-10-04 13:21:01 UTC 
(rev 17172)
+++ gnunet/src/util/test_server_with_client_unix.c      2011-10-04 13:24:22 UTC 
(rev 17173)
@@ -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
 

Modified: gnunet/src/util/test_service.c
===================================================================
--- gnunet/src/util/test_service.c      2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/util/test_service.c      2011-10-04 13:24:22 UTC (rev 17173)
@@ -31,7 +31,7 @@
 #include "gnunet_time_lib.h"
 
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_EXTRA_LOGGING
 
 #define PORT 12435
 

Modified: gnunet/src/util/test_strings.c
===================================================================
--- gnunet/src/util/test_strings.c      2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/util/test_strings.c      2011-10-04 13:24:22 UTC (rev 17173)
@@ -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 { }

Modified: gnunet/src/util/test_time.c
===================================================================
--- gnunet/src/util/test_time.c 2011-10-04 13:21:01 UTC (rev 17172)
+++ gnunet/src/util/test_time.c 2011-10-04 13:24:22 UTC (rev 17173)
@@ -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 ()




reply via email to

[Prev in Thread] Current Thread [Next in Thread]