3 files changed, 7 insertions, 28 deletions

diff --git a/TODO b/TODO
index 2de4519b6..bb7a846c6 100644
--- a/TODO
+++ b/TODO
@@ -15,35 +15,12 @@ Urgent items (before announcing ng.gnunet.org):
 * topology
   - needs testing
 * hostlist
-  - test fails (peers don't connect quickly, could be topology issue)
-
+  - test fails (gnunet-service-core crashes -- sometimes; with memory corruption!)
 * CORE:
   - soliciting traffic for clients that registered for it is not implemented
     (in the service, client API supports GNUNET_MESSAGE_TYPE_CORE_SOLICIT_TRAFFIC
      but never receives any such messages); how to avoid busy-waiting here
      is a good question (solicit => nothing, when to solicit again???)
-* TRANSPORT:
-  - crashes:
-(gdb) ba
-#0  0x00007ffff5d0d3d4 in disconnect_session (session=0x656700)
-    at plugin_transport_tcp.c:797
-#1  0x00007ffff5d0d74c in session_try_connect (cls=0x656700, peer=0x0, 
-    hello=0x0, trust=0) at plugin_transport_tcp.c:990
-#2  0x00007ffff7bdf26e in info_handler (cls=0x6306e0, msg=0x7fffffffda60)
-    at peerinfo_api.c:180
-#3  0x00007ffff79b0452 in receive_task (cls=0x69ec40, tc=0x7fffffffdb00)
-    at client.c:491
-#4  0x00007ffff79cccaa in run_ready (sched=0x7fffffffdb70) at scheduler.c:482
-#5  0x00007ffff79cd0ba in GNUNET_SCHEDULER_run (
-    task=0x7ffff79d1898 <service_task>, task_cls=0x7fffffffde10)
-    at scheduler.c:609
-#6  0x00007ffff79d27e1 in GNUNET_SERVICE_run (argc=3, argv=0x7fffffffe028, 
-    serviceName=0x405e6b "transport", opt=GNUNET_SERVICE_OPTION_NONE, 
-    task=0x4055c9 <run>, task_cls=0x0) at service.c:1345
-#7  0x0000000000405870 in main (argc=3, argv=0x7fffffffe028)
-    at gnunet-service-transport.c:2784
-
-
 * FS (basic anonymous FS only)
   - implement FS service (P2P operations)
     + how to send queries (soliciting is not there in core; do we
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
index 25c31358b..9b47c7681 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
@@ -13,7 +13,7 @@ PLUGINS = tcp
 [arm]
 PORT = 12966
 DEFAULTSERVICES = resolver transport core statistics topology
-GLOBAL_PREFIX = xterm -e gdb -x cmd --args 
+#GLOBAL_PREFIX = xterm -e gdb -x cmd --args 
 
 [statistics]
 PORT = 12967
@@ -27,6 +27,7 @@ PORT = 12969
 [core]
 PORT = 12970
 DEBUG = YES
+#PREFIX = xterm -e xterm -e valgrind --tool=memcheck
 
 [testing]
 WEAKRANDOM = YES
@@ -35,7 +36,7 @@ WEAKRANDOM = YES
 HTTPPORT = 12980
 SERVERS = http://localhost:12981/
 OPTIONS = -b -p
-BINARY = /home/grothoff/bin/gnunet-daemon-hostlist
+#BINARY = /home/grothoff/bin/gnunet-daemon-hostlist
 
 [topology]
 DEBUG = YES
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
index 8edaa7ca0..167d3acbd 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
@@ -13,7 +13,7 @@ PLUGINS = tcp
 [arm]
 PORT = 22966
 DEFAULTSERVICES = resolver transport core statistics topology
-GLOBAL_PREFIX = xterm -e gdb -x cmd --args 
+#GLOBAL_PREFIX = xterm -e gdb -x cmd --args 
 
 [statistics]
 PORT = 22967
@@ -27,6 +27,7 @@ PORT = 22969
 [core]
 PORT = 22970
 DEBUG = YES
+#PREFIX = xterm -e xterm -e valgrind --tool=memcheck
 
 [testing]
 WEAKRANDOM = YES
@@ -35,7 +36,7 @@ WEAKRANDOM = YES
 HTTPPORT = 12981
 SERVERS = http://localhost:12980/
 OPTIONS = -b -p
-BINARY = /home/grothoff/bin/gnunet-daemon-hostlist
+#BINARY = /home/grothoff/bin/gnunet-daemon-hostlist
 
 [topology]
 DEBUG = YES
\ No newline at end of file