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

[gnunet]

Author: grothoff
Date: 2016-06-27 11:51:31 +0200 (Mon, 27 Jun 2016)
New Revision: 37384

Modified:
   gnunet/src/core/core_api.c
   gnunet/src/core/test_core_api_data.conf
Log:
-fix queueing issue

Modified: gnunet/src/core/core_api.c
===================================================================
--- gnunet/src/core/core_api.c  2016-06-27 08:17:55 UTC (rev 37383)
+++ gnunet/src/core/core_api.c  2016-06-27 09:51:31 UTC (rev 37384)
@@ -332,6 +332,9 @@
 {
   struct GNUNET_CORE_Handle *h = cls;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "MQ ERROR: %d\n",
+              error);
   reconnect_later (h);
 }
 
@@ -707,12 +710,13 @@
   sm->peer = pr->peer;
   sm->cork = htonl ((uint32_t) th->cork);
   sm->reserved = htonl (0);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Calling get_message with buffer of %u bytes\n",
+              (unsigned int) th->msize);
   ret = th->get_message (th->get_message_cls,
                          th->msize,
                          &sm[1]);
   sm->header.size = htons (ret + sizeof (struct SendMessage));
-  th->msize = ret;
-  // GNUNET_assert (ret == th->msize); /* NOTE: API change! */
   delay = GNUNET_TIME_absolute_get_duration (th->request_time);
   overdue = GNUNET_TIME_absolute_get_duration (th->deadline);
   if (overdue.rel_value_us > GNUNET_CONSTANTS_LATENCY_WARN.rel_value_us)
@@ -887,6 +891,11 @@
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Connecting to CORE service\n");
   reconnect (h);
+  if (NULL == h->mq)
+  {
+    GNUNET_CORE_disconnect (h);
+    return NULL;
+  }
   return h;
 }
 

Modified: gnunet/src/core/test_core_api_data.conf
===================================================================
--- gnunet/src/core/test_core_api_data.conf     2016-06-27 08:17:55 UTC (rev 
37383)
+++ gnunet/src/core/test_core_api_data.conf     2016-06-27 09:51:31 UTC (rev 
37384)
@@ -8,4 +8,3 @@
 [core]
 PORT = 2092
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-core.sock
-