[GNUnet-SVN] r11332 - gnunet/src/core

[gnunet]

Author: grothoff
Date: 2010-05-11 21:18:43 +0200 (Tue, 11 May 2010)
New Revision: 11332

Modified:
   gnunet/src/core/core_api.c
   gnunet/src/core/test_core_api_data.conf
   gnunet/src/core/test_core_api_start_only.c
Log:
clarify

Modified: gnunet/src/core/core_api.c
===================================================================
--- gnunet/src/core/core_api.c  2010-05-11 19:16:47 UTC (rev 11331)
+++ gnunet/src/core/core_api.c  2010-05-11 19:18:43 UTC (rev 11332)
@@ -547,12 +547,16 @@
       (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;

Modified: gnunet/src/core/test_core_api_data.conf
===================================================================
--- gnunet/src/core/test_core_api_data.conf     2010-05-11 19:16:47 UTC (rev 
11331)
+++ gnunet/src/core/test_core_api_data.conf     2010-05-11 19:18:43 UTC (rev 
11332)
@@ -3,3 +3,7 @@
 
 [testing]
 WEAKRANDOM = YES
+
+[arm]
+DEBUG = YES
+OPTIONS = -L DEBUG

Modified: gnunet/src/core/test_core_api_start_only.c
===================================================================
--- gnunet/src/core/test_core_api_start_only.c  2010-05-11 19:16:47 UTC (rev 
11331)
+++ gnunet/src/core/test_core_api_start_only.c  2010-05-11 19:18:43 UTC (rev 
11332)
@@ -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