From 24c7345ea01a015a00a711e91eb893c5c1018abc Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 18 Mar 2010 11:43:23 +0000 Subject: move --- src/core/core.h | 2 +- src/datastore/plugin_datastore_sqlite.c | 2 +- src/fs/fs_test_lib_data.conf | 2 +- src/fs/gnunet-service-fs_indexing.c | 2 +- src/fs/test_fs_download_data.conf | 2 +- src/hostlist/hostlist-client.c | 2 +- src/hostlist/hostlist-server.c | 2 +- src/peerinfo/peerinfo.h | 2 +- src/testing/test_testing_data_topology_clique.conf | 2 +- src/topology/gnunet-daemon-topology.c | 2 +- src/topology/test_gnunet_service_topology_data.conf | 6 +++--- src/transport/Makefile.am | 2 +- src/transport/plugin_transport_udp.c | 3 +-- src/transport/plugin_transport_udp_nat.c | 2 +- src/transport/test_plugin_transport.c | 2 +- src/transport/test_transport_api_udp_peer2.conf | 1 + src/transport/transport.h | 6 +++--- 17 files changed, 21 insertions(+), 21 deletions(-) (limited to 'src') diff --git a/src/core/core.h b/src/core/core.h index 45d138140..ea2925797 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -29,7 +29,7 @@ /** * General core debugging. */ -#define DEBUG_CORE GNUNET_YES +#define DEBUG_CORE GNUNET_NO /** * Debugging interaction core-clients. diff --git a/src/datastore/plugin_datastore_sqlite.c b/src/datastore/plugin_datastore_sqlite.c index aa90859d6..1d38f8326 100644 --- a/src/datastore/plugin_datastore_sqlite.c +++ b/src/datastore/plugin_datastore_sqlite.c @@ -29,7 +29,7 @@ #include "plugin_datastore.h" #include -#define DEBUG_SQLITE GNUNET_YES +#define DEBUG_SQLITE GNUNET_NO /** * After how many payload-changing operations diff --git a/src/fs/fs_test_lib_data.conf b/src/fs/fs_test_lib_data.conf index 20004ab16..fb1bdc533 100644 --- a/src/fs/fs_test_lib_data.conf +++ b/src/fs/fs_test_lib_data.conf @@ -42,7 +42,7 @@ PORT = 43470 HOSTNAME = localhost #TOTAL_QUOTA_IN = 3932160 #TOTAL_QUOTA_OUT = 3932160 -DEBUG = YES +#DEBUG = YES #PREFIX = valgrind --tool=memcheck --leak-check=yes #BINARY = /home/grothoff/bin/gnunet-service-core diff --git a/src/fs/gnunet-service-fs_indexing.c b/src/fs/gnunet-service-fs_indexing.c index 37ef08ba5..ca9a226a2 100644 --- a/src/fs/gnunet-service-fs_indexing.c +++ b/src/fs/gnunet-service-fs_indexing.c @@ -38,7 +38,7 @@ #include "gnunet-service-fs_indexing.h" #include "fs.h" -#define DEBUG_FS GNUNET_YES +#define DEBUG_FS GNUNET_NO /** * In-memory information about indexed files (also available diff --git a/src/fs/test_fs_download_data.conf b/src/fs/test_fs_download_data.conf index e4aa966d5..366a30844 100644 --- a/src/fs/test_fs_download_data.conf +++ b/src/fs/test_fs_download_data.conf @@ -19,7 +19,7 @@ HOSTNAME = localhost DEFAULTSERVICES = resolver datastore transport core fs [datastore] -DEBUG = YES +# DEBUG = YES [statistics] PORT = 42467 diff --git a/src/hostlist/hostlist-client.c b/src/hostlist/hostlist-client.c index 90d67ee75..1c0deb511 100644 --- a/src/hostlist/hostlist-client.c +++ b/src/hostlist/hostlist-client.c @@ -32,7 +32,7 @@ #include "gnunet_transport_service.h" #include -#define DEBUG_HOSTLIST_CLIENT GNUNET_YES +#define DEBUG_HOSTLIST_CLIENT GNUNET_NO /** * Number of connections that we must have to NOT download diff --git a/src/hostlist/hostlist-server.c b/src/hostlist/hostlist-server.c index 5c5571ff6..bd4203475 100644 --- a/src/hostlist/hostlist-server.c +++ b/src/hostlist/hostlist-server.c @@ -30,7 +30,7 @@ #include "gnunet_hello_lib.h" #include "gnunet_peerinfo_service.h" -#define DEBUG_HOSTLIST_SERVER GNUNET_YES +#define DEBUG_HOSTLIST_SERVER GNUNET_NO /** * How often should we recalculate our response to hostlist requests? diff --git a/src/peerinfo/peerinfo.h b/src/peerinfo/peerinfo.h index 4cb52fa7c..607aad4db 100644 --- a/src/peerinfo/peerinfo.h +++ b/src/peerinfo/peerinfo.h @@ -27,7 +27,7 @@ #include "gnunet_time_lib.h" #include "gnunet_peerinfo_service.h" -#define DEBUG_PEERINFO GNUNET_YES +#define DEBUG_PEERINFO GNUNET_NO /** * Add the given peer to the list. This message diff --git a/src/testing/test_testing_data_topology_clique.conf b/src/testing/test_testing_data_topology_clique.conf index 1a0dd9d7d..78e4a94e1 100644 --- a/src/testing/test_testing_data_topology_clique.conf +++ b/src/testing/test_testing_data_topology_clique.conf @@ -31,7 +31,7 @@ PORT = 2569 PORT = 2570 #PREFIX = xterm -e xterm -T CORE -e gdb --args #PREFIX = valgrind --tool=memcheck --log-file=logs%p -DEBUG = YES +#DEBUG = YES [testing] NUM_PEERS = 4 diff --git a/src/topology/gnunet-daemon-topology.c b/src/topology/gnunet-daemon-topology.c index 789efcd6e..b466dfbbe 100644 --- a/src/topology/gnunet-daemon-topology.c +++ b/src/topology/gnunet-daemon-topology.c @@ -34,7 +34,7 @@ #include "gnunet_util_lib.h" -#define DEBUG_TOPOLOGY GNUNET_YES +#define DEBUG_TOPOLOGY GNUNET_NO /** * For how long do we blacklist a peer after a failed connection diff --git a/src/topology/test_gnunet_service_topology_data.conf b/src/topology/test_gnunet_service_topology_data.conf index d429e6c2c..d920e9e88 100644 --- a/src/topology/test_gnunet_service_topology_data.conf +++ b/src/topology/test_gnunet_service_topology_data.conf @@ -8,7 +8,7 @@ PORT = 2664 [transport] PORT = 2665 PLUGINS = tcp -DEBUG = YES +# DEBUG = YES #PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args #PREFIX = valgrind --tool=memcheck --log-file=logs%p @@ -27,10 +27,10 @@ PORT = 2669 [core] PORT = 2670 -DEBUG = YES +# DEBUG = YES [topology] -DEBUG = YES +# DEBUG = YES #PREFIX = valgrind --tool=memcheck [testing] diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 0094c6d0e..7d9974c6b 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -123,7 +123,7 @@ test_transport_api_udp_SOURCES = \ test_transport_api_udp_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/util/libgnunetutil.la - + test_transport_api_udp_nat_SOURCES = \ test_transport_api.c test_transport_api_udp_nat_LDADD = \ diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c index 5bf555c90..094b207f4 100644 --- a/src/transport/plugin_transport_udp.c +++ b/src/transport/plugin_transport_udp.c @@ -690,14 +690,13 @@ udp_plugin_address_pretty_printer (void *cls, void * libgnunet_plugin_transport_udp_init (void *cls) { - unsigned long long mtu; - struct GNUNET_TRANSPORT_PluginEnvironment *env = cls; struct GNUNET_TRANSPORT_PluginFunctions *api; struct Plugin *plugin; struct GNUNET_SERVICE_Context *service; unsigned long long aport; unsigned long long bport; + unsigned long long mtu; service = GNUNET_SERVICE_start ("transport-udp", env->sched, env->cfg); if (service == NULL) diff --git a/src/transport/plugin_transport_udp_nat.c b/src/transport/plugin_transport_udp_nat.c index cbda5c6bc..3733130e2 100644 --- a/src/transport/plugin_transport_udp_nat.c +++ b/src/transport/plugin_transport_udp_nat.c @@ -54,7 +54,7 @@ #include "plugin_transport.h" #include "transport.h" -#define DEBUG_UDP_NAT GNUNET_YES +#define DEBUG_UDP_NAT GNUNET_NO /* * Transport cost to peer, always 1 for UDP (direct connection) diff --git a/src/transport/test_plugin_transport.c b/src/transport/test_plugin_transport.c index f9539430e..2248f007e 100644 --- a/src/transport/test_plugin_transport.c +++ b/src/transport/test_plugin_transport.c @@ -37,7 +37,7 @@ #include "plugin_transport.h" #include "transport.h" -#define VERBOSE GNUNET_YES +#define VERBOSE GNUNET_NO /** * How long until we give up on transmitting the message? diff --git a/src/transport/test_transport_api_udp_peer2.conf b/src/transport/test_transport_api_udp_peer2.conf index 14ae37f6b..e65633e1a 100644 --- a/src/transport/test_transport_api_udp_peer2.conf +++ b/src/transport/test_transport_api_udp_peer2.conf @@ -72,6 +72,7 @@ CONFIG = $DEFAULTCONFIG HOME = $SERVICEHOME HOSTNAME = localhost PORT = 22365 +# PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer2.log [peerinfo] TRUST = $SERVICEHOME/data/credit/ diff --git a/src/transport/transport.h b/src/transport/transport.h index d66b87b35..acaa20a52 100644 --- a/src/transport/transport.h +++ b/src/transport/transport.h @@ -30,9 +30,9 @@ #include "gnunet_time_lib.h" #include "gnunet_transport_service.h" -#define DEBUG_TRANSPORT GNUNET_YES -#define DEBUG_TRANSPORT_TIMEOUT GNUNET_YES -#define DEBUG_TRANSPORT_DISCONNECT GNUNET_YES +#define DEBUG_TRANSPORT GNUNET_NO +#define DEBUG_TRANSPORT_TIMEOUT GNUNET_NO +#define DEBUG_TRANSPORT_DISCONNECT GNUNET_NO /** * For how long do we allow unused bandwidth -- cgit v1.2.3