5 files changed, 15 insertions, 12 deletions

diff --git a/src/core/core.h b/src/core/core.h
index 840c7e143..9f520bf40 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -26,7 +26,7 @@
 #include "gnunet_crypto_lib.h"
 #include "gnunet_time_lib.h"
 
-#define DEBUG_CORE GNUNET_NO
+#define DEBUG_CORE GNUNET_YES
 
 /**
  * Definition of bits in the InitMessage's options field that specify
diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c
index 2fbb4ca05..44df8a867 100644
--- a/src/core/gnunet-service-core.c
+++ b/src/core/gnunet-service-core.c
@@ -1606,6 +1606,8 @@ send_connect_continuation (void *cls, size_t size, void *buf)
                   "Asked to send message to disconnected peer `%4s' and connection failed.  Discarding message.\n",
                   GNUNET_i2s (&sm->peer));
       GNUNET_free (sm);
+      /* FIXME: do we need to do something here to let the
+         client know about the failure!? */
       return 0;
     }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -1659,8 +1661,9 @@ handle_client_send (void *cls,
   if (n == NULL)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Not yet connected to `%4s', will try to establish connection\n",
-                  GNUNET_i2s (&sm->peer));
+                  "Not yet connected to `%4s', will try to establish connection within %llu ms\n",
+                  GNUNET_i2s (&sm->peer),
+                  sm->deadline.value);
       msize += sizeof (struct SendMessage);
       /* ask transport to connect to the peer */
       /* FIXME: this code does not handle the
diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c
index e1b3dcd0d..1151f3ebb 100644
--- a/src/core/test_core_api.c
+++ b/src/core/test_core_api.c
@@ -34,7 +34,7 @@
 #include "gnunet_scheduler_lib.h"
 #include "gnunet_transport_service.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_YES
 
 #define START_ARM GNUNET_YES
 
diff --git a/src/core/test_core_api_peer1.conf b/src/core/test_core_api_peer1.conf
index fb060e3e6..3c7020688 100644
--- a/src/core/test_core_api_peer1.conf
+++ b/src/core/test_core_api_peer1.conf
@@ -9,9 +9,9 @@ PORT = 12464
 [transport]
 PORT = 12465
 PLUGINS = tcp
-#PREFIX = xterm -T transport1 -e
+PREFIX = xterm -T transport1 -e
 #PREFIX = xterm -T transport1 -e valgrind --tool=memcheck
-#DEBUG = YES
+DEBUG = YES
 
 [arm]
 PORT = 12466
@@ -33,8 +33,8 @@ PORT = 12469
 PORT = 12470
 #PREFIX = xterm -T core1 -e valgrind --tool=memcheck
 #PREFIX = xterm -T core1 -e gdb -x cmd --args
-#PREFIX = xterm -T core1 -e 
-#DEBUG = YES
+PREFIX = xterm -T core1 -e 
+DEBUG = YES
 
 [testing]
 WEAKRANDOM = YES
diff --git a/src/core/test_core_api_peer2.conf b/src/core/test_core_api_peer2.conf
index e3862da0f..2e994d27a 100644
--- a/src/core/test_core_api_peer2.conf
+++ b/src/core/test_core_api_peer2.conf
@@ -9,9 +9,9 @@ PORT = 22464
 [transport]
 PORT = 22465
 PLUGINS = tcp
-#PREFIX = xterm -T transport2 -e
+PREFIX = xterm -T transport2 -e
 #PREFIX = xterm -T transport2 -e valgrind --tool=memcheck
-#DEBUG = YES
+DEBUG = YES
 
 [arm]
 PORT = 22466
@@ -31,9 +31,9 @@ PORT = 22469
 
 [core]
 PORT = 22470
-#PREFIX = xterm -T core2 -e
+PREFIX = xterm -T core2 -e
 #PREFIX = xterm -T core2 -e valgrind --tool=memcheck
-#DEBUG = YES
+DEBUG = YES
 
 [testing]
 WEAKRANDOM = YES