diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2013-04-01 19:03:03 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2013-04-01 19:03:03 +0000 |
commit | 7cba739408a3959da9096dc50cabf51fe0accd41 (patch) | |
tree | d75b3aa2b2805182ce5417e2f16c067daa3c647e /src | |
parent | eae47ba86a28df58f9449bf9d0917592ed1eed34 (diff) | |
download | gnunet-7cba739408a3959da9096dc50cabf51fe0accd41.tar.gz gnunet-7cba739408a3959da9096dc50cabf51fe0accd41.zip |
- revert 26711 and fix 2851 with dirty hack
Diffstat (limited to 'src')
-rw-r--r-- | src/arm/arm_api.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c index 8c4192f79..754398fc5 100644 --- a/src/arm/arm_api.c +++ b/src/arm/arm_api.c | |||
@@ -349,6 +349,7 @@ trigger_next_request (struct GNUNET_ARM_Handle *h, int ignore_currently_down) | |||
349 | { | 349 | { |
350 | uint16_t msize; | 350 | uint16_t msize; |
351 | 351 | ||
352 | msize = sizeof (struct GNUNET_MessageHeader); | ||
352 | if ((GNUNET_YES == h->currently_down) && (ignore_currently_down == GNUNET_NO)) | 353 | if ((GNUNET_YES == h->currently_down) && (ignore_currently_down == GNUNET_NO)) |
353 | { | 354 | { |
354 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 355 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
@@ -360,15 +361,16 @@ trigger_next_request (struct GNUNET_ARM_Handle *h, int ignore_currently_down) | |||
360 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Request pending, not processing queue\n"); | 361 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Request pending, not processing queue\n"); |
361 | return; | 362 | return; |
362 | } | 363 | } |
363 | if (NULL == h->control_pending_head) | 364 | if (NULL != h->control_pending_head) |
365 | msize = | ||
366 | ntohs (((struct GNUNET_MessageHeader *) &h-> | ||
367 | control_pending_head[1])->size); | ||
368 | else if (GNUNET_NO == ignore_currently_down) | ||
364 | { | 369 | { |
365 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 370 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
366 | "Request queue empty, not processing queue\n"); | 371 | "Request queue empty, not processing queue\n"); |
367 | return; /* no pending message */ | 372 | return; /* no pending message */ |
368 | } | 373 | } |
369 | msize = | ||
370 | ntohs (((struct GNUNET_MessageHeader *) &h-> | ||
371 | control_pending_head[1])->size); | ||
372 | h->cth = | 374 | h->cth = |
373 | GNUNET_CLIENT_notify_transmit_ready (h->client, msize, | 375 | GNUNET_CLIENT_notify_transmit_ready (h->client, msize, |
374 | GNUNET_TIME_UNIT_FOREVER_REL, | 376 | GNUNET_TIME_UNIT_FOREVER_REL, |