diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-03-23 16:48:18 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-03-23 16:48:18 +0000 |
commit | d789a10c4b16a551d08372fa6c64e2b5d62d57f2 (patch) | |
tree | a0d3814251d1a3bc699af01ca7fae1297652fb0b /src/core/gnunet-service-core_sessions.c | |
parent | b00740436bb127c90c035b9683f024c02f57f1af (diff) | |
download | gnunet-d789a10c4b16a551d08372fa6c64e2b5d62d57f2.tar.gz gnunet-d789a10c4b16a551d08372fa6c64e2b5d62d57f2.zip |
-fix misc core issues
Diffstat (limited to 'src/core/gnunet-service-core_sessions.c')
-rw-r--r-- | src/core/gnunet-service-core_sessions.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/core/gnunet-service-core_sessions.c b/src/core/gnunet-service-core_sessions.c index e4702a03a..2e035bbb2 100644 --- a/src/core/gnunet-service-core_sessions.c +++ b/src/core/gnunet-service-core_sessions.c | |||
@@ -498,7 +498,8 @@ GSC_SESSIONS_queue_request (struct GSC_ClientActiveRequest *car) | |||
498 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 498 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
499 | "Received client transmission request. queueing\n"); | 499 | "Received client transmission request. queueing\n"); |
500 | GNUNET_CONTAINER_DLL_insert (session->active_client_request_head, | 500 | GNUNET_CONTAINER_DLL_insert (session->active_client_request_head, |
501 | session->active_client_request_tail, car); | 501 | session->active_client_request_tail, |
502 | car); | ||
502 | try_transmission (session); | 503 | try_transmission (session); |
503 | } | 504 | } |
504 | 505 | ||
@@ -646,9 +647,13 @@ try_transmission (struct Session *session) | |||
646 | min_deadline = GNUNET_TIME_UNIT_FOREVER_ABS; | 647 | min_deadline = GNUNET_TIME_UNIT_FOREVER_ABS; |
647 | /* if the peer has excess bandwidth, background traffic is allowed, | 648 | /* if the peer has excess bandwidth, background traffic is allowed, |
648 | otherwise not */ | 649 | otherwise not */ |
649 | if (MAX_ENCRYPTED_MESSAGE_QUEUE_SIZE >= | 650 | if (MAX_ENCRYPTED_MESSAGE_QUEUE_SIZE <= |
650 | GSC_NEIGHBOURS_check_excess_bandwidth (&session->peer)) | 651 | GSC_NEIGHBOURS_get_queue_size (&session->peer)) |
652 | { | ||
653 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
654 | "Transmission queue already very long, waiting...\n"); | ||
651 | return; /* queue already too long */ | 655 | return; /* queue already too long */ |
656 | } | ||
652 | excess = GSC_NEIGHBOURS_check_excess_bandwidth (&session->peer); | 657 | excess = GSC_NEIGHBOURS_check_excess_bandwidth (&session->peer); |
653 | if (GNUNET_YES == excess) | 658 | if (GNUNET_YES == excess) |
654 | maxp = GNUNET_CORE_PRIO_BACKGROUND; | 659 | maxp = GNUNET_CORE_PRIO_BACKGROUND; |