From 26c01bc5b1e150d81e7137804295e6d6c6cc9da9 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 11 May 2010 19:18:43 +0000
Subject: [PATCH] clarify

---
 src/core/core_api.c                 | 16 ++++++++++------
 src/core/test_core_api_data.conf    |  4 ++++
 src/core/test_core_api_start_only.c |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/core/core_api.c b/src/core/core_api.c
index f8c7c0aa6..3fcb5fb37 100644
--- a/src/core/core_api.c
+++ b/src/core/core_api.c
@@ -547,12 +547,16 @@ init_reply_handler (void *cls, const struct GNUNET_MessageHeader *msg)
       (ntohs (msg->size) != sizeof (struct InitReplyMessage)) ||
       (ntohs (msg->type) != GNUNET_MESSAGE_TYPE_CORE_INIT_REPLY))
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _
-                  ("Error connecting to core service (failed to receive `%s' message, got message of type %u and size %u).\n"),
-                  "INIT_REPLY",
-		  (msg == NULL) ? -1 : ntohs (msg->type),
-		  (msg == NULL) ? -1 : ntohs (msg->size));
+      if (msg != NULL)
+	GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+		    _
+		    ("Error connecting to core service (failed to receive `%s' message, got message of type %u and size %u).\n"),
+		    "INIT_REPLY",
+		    ntohs (msg->type),
+		    ntohs (msg->size));
+      else
+	GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+		    _("Failed to connect to core service.\n"));
       GNUNET_break (msg == NULL);
       transmit_start (h, 0, NULL);
       return;
diff --git a/src/core/test_core_api_data.conf b/src/core/test_core_api_data.conf
index 47e6ec76f..3845c7a09 100644
--- a/src/core/test_core_api_data.conf
+++ b/src/core/test_core_api_data.conf
@@ -3,3 +3,7 @@ SERVICEHOME = /tmp/test-gnunet-core/
 
 [testing]
 WEAKRANDOM = YES
+
+[arm]
+DEBUG = YES
+OPTIONS = -L DEBUG
diff --git a/src/core/test_core_api_start_only.c b/src/core/test_core_api_start_only.c
index 86eff056c..f33597836 100644
--- a/src/core/test_core_api_start_only.c
+++ b/src/core/test_core_api_start_only.c
@@ -31,7 +31,7 @@
 #include "gnunet_program_lib.h"
 #include "gnunet_scheduler_lib.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_YES
 
 #define START_ARM GNUNET_YES
 
-- 
2.25.1