diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-12-13 20:37:51 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-12-13 20:37:51 +0000 |
commit | d48352bb16b9cdf8b397d4b0a2154271f034edfe (patch) | |
tree | de7843ffd23cabb4b3f18a4a4898999011fdb5cc /src/core/gnunet-service-core_sessions.c | |
parent | 8723949c5796c40fe262b4843b4838dc0e67ae5c (diff) | |
download | gnunet-d48352bb16b9cdf8b397d4b0a2154271f034edfe.tar.gz gnunet-d48352bb16b9cdf8b397d4b0a2154271f034edfe.zip |
-style fixes
Diffstat (limited to 'src/core/gnunet-service-core_sessions.c')
-rw-r--r-- | src/core/gnunet-service-core_sessions.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/core/gnunet-service-core_sessions.c b/src/core/gnunet-service-core_sessions.c index 551c5f2c5..b57cd992f 100644 --- a/src/core/gnunet-service-core_sessions.c +++ b/src/core/gnunet-service-core_sessions.c | |||
@@ -59,9 +59,9 @@ struct SessionMessageEntry | |||
59 | struct GNUNET_TIME_Absolute deadline; | 59 | struct GNUNET_TIME_Absolute deadline; |
60 | 60 | ||
61 | /** | 61 | /** |
62 | * How long is the message? (number of bytes following the "struct | 62 | * How long is the message? (number of bytes following the `struct |
63 | * MessageEntry", but not including the size of "struct | 63 | * MessageEntry`, but not including the size of `struct |
64 | * MessageEntry" itself!) | 64 | * MessageEntry` itself!) |
65 | */ | 65 | */ |
66 | size_t size; | 66 | size_t size; |
67 | 67 | ||
@@ -535,15 +535,16 @@ discard_expired_requests (struct Session *session) | |||
535 | { | 535 | { |
536 | pos = nxt; | 536 | pos = nxt; |
537 | nxt = pos->next; | 537 | nxt = pos->next; |
538 | if ((pos->deadline.abs_value_us < now.abs_value_us) && | 538 | if ( (pos->deadline.abs_value_us < now.abs_value_us) && |
539 | (GNUNET_YES != pos->was_solicited)) | 539 | (GNUNET_YES != pos->was_solicited) ) |
540 | { | 540 | { |
541 | GNUNET_STATISTICS_update (GSC_stats, | 541 | GNUNET_STATISTICS_update (GSC_stats, |
542 | gettext_noop | 542 | gettext_noop |
543 | ("# messages discarded (expired prior to transmission)"), | 543 | ("# messages discarded (expired prior to transmission)"), |
544 | 1, GNUNET_NO); | 544 | 1, GNUNET_NO); |
545 | GNUNET_CONTAINER_DLL_remove (session->active_client_request_head, | 545 | GNUNET_CONTAINER_DLL_remove (session->active_client_request_head, |
546 | session->active_client_request_tail, pos); | 546 | session->active_client_request_tail, |
547 | pos); | ||
547 | GSC_CLIENTS_reject_request (pos); | 548 | GSC_CLIENTS_reject_request (pos); |
548 | } | 549 | } |
549 | } | 550 | } |
@@ -648,7 +649,8 @@ try_transmission (struct Session *session) | |||
648 | GNUNET_assert (pos->size < GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE); | 649 | GNUNET_assert (pos->size < GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE); |
649 | msize += pos->size; | 650 | msize += pos->size; |
650 | maxp = GNUNET_MAX (maxp, pos->priority); | 651 | maxp = GNUNET_MAX (maxp, pos->priority); |
651 | min_deadline = GNUNET_TIME_absolute_min (min_deadline, pos->deadline); | 652 | min_deadline = GNUNET_TIME_absolute_min (min_deadline, |
653 | pos->deadline); | ||
652 | pos = pos->next; | 654 | pos = pos->next; |
653 | } | 655 | } |
654 | if (maxp < GNUNET_CORE_PRIO_CRITICAL_CONTROL) | 656 | if (maxp < GNUNET_CORE_PRIO_CRITICAL_CONTROL) |