[GNUnet-SVN] r26712 - gnunet/src/arm

[gnunet]

Author: harsha
Date: 2013-04-01 21:03:03 +0200 (Mon, 01 Apr 2013)
New Revision: 26712

Modified:
   gnunet/src/arm/arm_api.c
Log:
- revert 26711 and fix 2851 with dirty hack

Modified: gnunet/src/arm/arm_api.c
===================================================================
--- gnunet/src/arm/arm_api.c    2013-04-01 18:27:35 UTC (rev 26711)
+++ gnunet/src/arm/arm_api.c    2013-04-01 19:03:03 UTC (rev 26712)
@@ -349,6 +349,7 @@
 {
   uint16_t msize;
 
+  msize = sizeof (struct GNUNET_MessageHeader);
   if ((GNUNET_YES == h->currently_down) && (ignore_currently_down == 
GNUNET_NO))
   {
     LOG (GNUNET_ERROR_TYPE_DEBUG,
@@ -360,15 +361,16 @@
     LOG (GNUNET_ERROR_TYPE_DEBUG, "Request pending, not processing queue\n");
     return;
   }
-  if (NULL == h->control_pending_head)
+  if (NULL != h->control_pending_head)
+    msize =
+        ntohs (((struct GNUNET_MessageHeader *) &h->
+                control_pending_head[1])->size);
+  else if (GNUNET_NO == ignore_currently_down)
   {
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "Request queue empty, not processing queue\n");
     return;                     /* no pending message */
   }
-  msize =
-      ntohs (((struct GNUNET_MessageHeader *) &h->
-              control_pending_head[1])->size);
   h->cth =
       GNUNET_CLIENT_notify_transmit_ready (h->client, msize,
                                            GNUNET_TIME_UNIT_FOREVER_REL,