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 | |
parent | 8723949c5796c40fe262b4843b4838dc0e67ae5c (diff) | |
download | gnunet-d48352bb16b9cdf8b397d4b0a2154271f034edfe.tar.gz gnunet-d48352bb16b9cdf8b397d4b0a2154271f034edfe.zip |
-style fixes
Diffstat (limited to 'src')
-rw-r--r-- | src/core/gnunet-service-core.h | 8 | ||||
-rw-r--r-- | src/core/gnunet-service-core_clients.c | 43 | ||||
-rw-r--r-- | src/core/gnunet-service-core_clients.h | 6 | ||||
-rw-r--r-- | src/core/gnunet-service-core_kx.c | 18 | ||||
-rw-r--r-- | src/core/gnunet-service-core_neighbours.c | 45 | ||||
-rw-r--r-- | src/core/gnunet-service-core_neighbours.h | 6 | ||||
-rw-r--r-- | src/core/gnunet-service-core_sessions.c | 16 |
7 files changed, 85 insertions, 57 deletions
diff --git a/src/core/gnunet-service-core.h b/src/core/gnunet-service-core.h index 8d3e8ee2a..2d483a60d 100644 --- a/src/core/gnunet-service-core.h +++ b/src/core/gnunet-service-core.h | |||
@@ -57,14 +57,14 @@ struct GSC_ClientActiveRequest | |||
57 | struct GSC_ClientActiveRequest *prev; | 57 | struct GSC_ClientActiveRequest *prev; |
58 | 58 | ||
59 | /** | 59 | /** |
60 | * Which peer is the message going to be for? | 60 | * Handle to the client. |
61 | */ | 61 | */ |
62 | struct GNUNET_PeerIdentity target; | 62 | struct GSC_Client *client_handle; |
63 | 63 | ||
64 | /** | 64 | /** |
65 | * Handle to the client. | 65 | * Which peer is the message going to be for? |
66 | */ | 66 | */ |
67 | struct GSC_Client *client_handle; | 67 | struct GNUNET_PeerIdentity target; |
68 | 68 | ||
69 | /** | 69 | /** |
70 | * By what time would the client want to see this message out? | 70 | * By what time would the client want to see this message out? |
diff --git a/src/core/gnunet-service-core_clients.c b/src/core/gnunet-service-core_clients.c index c099987a9..58179dd35 100644 --- a/src/core/gnunet-service-core_clients.c +++ b/src/core/gnunet-service-core_clients.c | |||
@@ -255,10 +255,10 @@ send_to_all_clients (const struct GNUNET_PeerIdentity *partner, | |||
255 | 255 | ||
256 | 256 | ||
257 | /** | 257 | /** |
258 | * Handle CORE_INIT request. | 258 | * Handle #GNUNET_MESSAGE_TYPE_CORE_INIT request. |
259 | * | 259 | * |
260 | * @param cls unused | 260 | * @param cls unused |
261 | * @param client new client that sent INIT | 261 | * @param client new client that sent #GNUNET_MESSAGE_TYPE_CORE_INIT |
262 | * @param message the `struct InitMessage` (presumably) | 262 | * @param message the `struct InitMessage` (presumably) |
263 | */ | 263 | */ |
264 | static void | 264 | static void |
@@ -325,10 +325,10 @@ handle_client_init (void *cls, | |||
325 | 325 | ||
326 | 326 | ||
327 | /** | 327 | /** |
328 | * Handle CORE_SEND_REQUEST message. | 328 | * Handle #GNUNET_MESSAGE_TYPE_CORE_SEND_REQUEST message. |
329 | * | 329 | * |
330 | * @param cls unused | 330 | * @param cls unused |
331 | * @param client new client that sent CORE_SEND_REQUEST | 331 | * @param client new client that sent a #GNUNET_MESSAGE_TYPE_CORE_SEND_REQUEST |
332 | * @param message the `struct SendMessageRequest` (presumably) | 332 | * @param message the `struct SendMessageRequest` (presumably) |
333 | */ | 333 | */ |
334 | static void | 334 | static void |
@@ -343,23 +343,26 @@ handle_client_send_request (void *cls, | |||
343 | 343 | ||
344 | req = (const struct SendMessageRequest *) message; | 344 | req = (const struct SendMessageRequest *) message; |
345 | c = find_client (client); | 345 | c = find_client (client); |
346 | if (c == NULL) | 346 | if (NULL == c) |
347 | { | 347 | { |
348 | /* client did not send INIT first! */ | 348 | /* client did not send INIT first! */ |
349 | GNUNET_break (0); | 349 | GNUNET_break (0); |
350 | GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); | 350 | GNUNET_SERVER_receive_done (client, |
351 | GNUNET_SYSERR); | ||
351 | return; | 352 | return; |
352 | } | 353 | } |
353 | if (c->requests == NULL) | 354 | if (NULL == c->requests) |
354 | c->requests = GNUNET_CONTAINER_multipeermap_create (16, GNUNET_NO); | 355 | c->requests = GNUNET_CONTAINER_multipeermap_create (16, |
356 | GNUNET_NO); | ||
355 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 357 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
356 | "Client asked for transmission to `%s'\n", | 358 | "Client asked for transmission to `%s'\n", |
357 | GNUNET_i2s (&req->peer)); | 359 | GNUNET_i2s (&req->peer)); |
358 | is_loopback = | 360 | is_loopback = |
359 | (0 == | 361 | (0 == |
360 | memcmp (&req->peer, &GSC_my_identity, | 362 | memcmp (&req->peer, |
363 | &GSC_my_identity, | ||
361 | sizeof (struct GNUNET_PeerIdentity))); | 364 | sizeof (struct GNUNET_PeerIdentity))); |
362 | if ((!is_loopback) && | 365 | if ((! is_loopback) && |
363 | (GNUNET_YES != | 366 | (GNUNET_YES != |
364 | GNUNET_CONTAINER_multipeermap_contains (c->connectmap, | 367 | GNUNET_CONTAINER_multipeermap_contains (c->connectmap, |
365 | &req->peer))) | 368 | &req->peer))) |
@@ -371,11 +374,13 @@ handle_client_send_request (void *cls, | |||
371 | gettext_noop | 374 | gettext_noop |
372 | ("# send requests dropped (disconnected)"), 1, | 375 | ("# send requests dropped (disconnected)"), 1, |
373 | GNUNET_NO); | 376 | GNUNET_NO); |
374 | GNUNET_SERVER_receive_done (client, GNUNET_OK); | 377 | GNUNET_SERVER_receive_done (client, |
378 | GNUNET_OK); | ||
375 | return; | 379 | return; |
376 | } | 380 | } |
377 | 381 | ||
378 | car = GNUNET_CONTAINER_multipeermap_get (c->requests, &req->peer); | 382 | car = GNUNET_CONTAINER_multipeermap_get (c->requests, |
383 | &req->peer); | ||
379 | if (NULL == car) | 384 | if (NULL == car) |
380 | { | 385 | { |
381 | /* create new entry */ | 386 | /* create new entry */ |
@@ -389,6 +394,8 @@ handle_client_send_request (void *cls, | |||
389 | } | 394 | } |
390 | else | 395 | else |
391 | { | 396 | { |
397 | /* dequeue and recycle memory from pending request, there can only | ||
398 | be at most one per client and peer */ | ||
392 | GSC_SESSIONS_dequeue_request (car); | 399 | GSC_SESSIONS_dequeue_request (car); |
393 | } | 400 | } |
394 | car->target = req->peer; | 401 | car->target = req->peer; |
@@ -817,7 +824,8 @@ GSC_CLIENTS_deliver_message (const struct GNUNET_PeerIdentity *sender, | |||
817 | return; /* no client cares about this message notification */ | 824 | return; /* no client cares about this message notification */ |
818 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 825 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
819 | "Core service passes message from `%4s' of type %u to client.\n", | 826 | "Core service passes message from `%4s' of type %u to client.\n", |
820 | GNUNET_i2s (sender), (unsigned int) ntohs (msg->type)); | 827 | GNUNET_i2s (sender), |
828 | (unsigned int) ntohs (msg->type)); | ||
821 | GSC_SESSIONS_add_to_typemap (sender, ntohs (msg->type)); | 829 | GSC_SESSIONS_add_to_typemap (sender, ntohs (msg->type)); |
822 | ntm = (struct NotifyTrafficMessage *) buf; | 830 | ntm = (struct NotifyTrafficMessage *) buf; |
823 | ntm->header.size = htons (size); | 831 | ntm->header.size = htons (size); |
@@ -826,8 +834,13 @@ GSC_CLIENTS_deliver_message (const struct GNUNET_PeerIdentity *sender, | |||
826 | else | 834 | else |
827 | ntm->header.type = htons (GNUNET_MESSAGE_TYPE_CORE_NOTIFY_OUTBOUND); | 835 | ntm->header.type = htons (GNUNET_MESSAGE_TYPE_CORE_NOTIFY_OUTBOUND); |
828 | ntm->peer = *sender; | 836 | ntm->peer = *sender; |
829 | memcpy (&ntm[1], msg, msize); | 837 | memcpy (&ntm[1], |
830 | send_to_all_clients (sender, &ntm->header, GNUNET_YES, options, | 838 | msg, |
839 | msize); | ||
840 | send_to_all_clients (sender, | ||
841 | &ntm->header, | ||
842 | GNUNET_YES, | ||
843 | options, | ||
831 | ntohs (msg->type)); | 844 | ntohs (msg->type)); |
832 | } | 845 | } |
833 | 846 | ||
diff --git a/src/core/gnunet-service-core_clients.h b/src/core/gnunet-service-core_clients.h index 8fd83128a..ae995cdd2 100644 --- a/src/core/gnunet-service-core_clients.h +++ b/src/core/gnunet-service-core_clients.h | |||
@@ -57,8 +57,7 @@ GSC_CLIENTS_send_to_client (struct GNUNET_SERVER_Client *client, | |||
57 | */ | 57 | */ |
58 | void | 58 | void |
59 | GSC_CLIENTS_notify_client_about_neighbour (struct GSC_Client *client, | 59 | GSC_CLIENTS_notify_client_about_neighbour (struct GSC_Client *client, |
60 | const struct GNUNET_PeerIdentity | 60 | const struct GNUNET_PeerIdentity *neighbour, |
61 | *neighbour, | ||
62 | const struct GSC_TypeMap *tmap_old, | 61 | const struct GSC_TypeMap *tmap_old, |
63 | const struct GSC_TypeMap *tmap_new); | 62 | const struct GSC_TypeMap *tmap_new); |
64 | 63 | ||
@@ -73,8 +72,7 @@ GSC_CLIENTS_notify_client_about_neighbour (struct GSC_Client *client, | |||
73 | * @param tmap_new updated type map for the neighbour, NULL for disconnect | 72 | * @param tmap_new updated type map for the neighbour, NULL for disconnect |
74 | */ | 73 | */ |
75 | void | 74 | void |
76 | GSC_CLIENTS_notify_clients_about_neighbour (const struct GNUNET_PeerIdentity | 75 | GSC_CLIENTS_notify_clients_about_neighbour (const struct GNUNET_PeerIdentity *neighbour, |
77 | *neighbour, | ||
78 | const struct GSC_TypeMap *tmap_old, | 76 | const struct GSC_TypeMap *tmap_old, |
79 | const struct GSC_TypeMap *tmap_new); | 77 | const struct GSC_TypeMap *tmap_new); |
80 | 78 | ||
diff --git a/src/core/gnunet-service-core_kx.c b/src/core/gnunet-service-core_kx.c index 31cd14f85..a4e964312 100644 --- a/src/core/gnunet-service-core_kx.c +++ b/src/core/gnunet-service-core_kx.c | |||
@@ -773,7 +773,8 @@ GSC_KX_stop (struct GSC_KeyExchangeInfo *kx) | |||
773 | static void | 773 | static void |
774 | send_ping (struct GSC_KeyExchangeInfo *kx) | 774 | send_ping (struct GSC_KeyExchangeInfo *kx) |
775 | { | 775 | { |
776 | GSC_NEIGHBOURS_transmit (&kx->peer, &kx->ping.header, | 776 | GSC_NEIGHBOURS_transmit (&kx->peer, |
777 | &kx->ping.header, | ||
777 | MIN_PING_FREQUENCY); | 778 | MIN_PING_FREQUENCY); |
778 | } | 779 | } |
779 | 780 | ||
@@ -1048,7 +1049,8 @@ GSC_KX_handle_ping (struct GSC_KeyExchangeInfo *kx, | |||
1048 | (void *) &tp)); | 1049 | (void *) &tp)); |
1049 | GNUNET_STATISTICS_update (GSC_stats, gettext_noop ("# PONG messages created"), | 1050 | GNUNET_STATISTICS_update (GSC_stats, gettext_noop ("# PONG messages created"), |
1050 | 1, GNUNET_NO); | 1051 | 1, GNUNET_NO); |
1051 | GSC_NEIGHBOURS_transmit (&kx->peer, &tp.header, | 1052 | GSC_NEIGHBOURS_transmit (&kx->peer, |
1053 | &tp.header, | ||
1052 | GNUNET_TIME_UNIT_FOREVER_REL /* FIXME: timeout */ ); | 1054 | GNUNET_TIME_UNIT_FOREVER_REL /* FIXME: timeout */ ); |
1053 | } | 1055 | } |
1054 | 1056 | ||
@@ -1086,7 +1088,8 @@ send_keep_alive (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1086 | gettext_noop ("# keepalive messages sent"), 1, | 1088 | gettext_noop ("# keepalive messages sent"), 1, |
1087 | GNUNET_NO); | 1089 | GNUNET_NO); |
1088 | setup_fresh_ping (kx); | 1090 | setup_fresh_ping (kx); |
1089 | GSC_NEIGHBOURS_transmit (&kx->peer, &kx->ping.header, | 1091 | GSC_NEIGHBOURS_transmit (&kx->peer, |
1092 | &kx->ping.header, | ||
1090 | kx->set_key_retry_frequency); | 1093 | kx->set_key_retry_frequency); |
1091 | retry = | 1094 | retry = |
1092 | GNUNET_TIME_relative_max (GNUNET_TIME_relative_divide (left, 2), | 1095 | GNUNET_TIME_relative_max (GNUNET_TIME_relative_divide (left, 2), |
@@ -1277,7 +1280,8 @@ send_key (struct GSC_KeyExchangeInfo *kx) | |||
1277 | GNUNET_i2s (&kx->peer), | 1280 | GNUNET_i2s (&kx->peer), |
1278 | kx->status); | 1281 | kx->status); |
1279 | current_ekm.sender_status = htonl ((int32_t) (kx->status)); | 1282 | current_ekm.sender_status = htonl ((int32_t) (kx->status)); |
1280 | GSC_NEIGHBOURS_transmit (&kx->peer, ¤t_ekm.header, | 1283 | GSC_NEIGHBOURS_transmit (&kx->peer, |
1284 | ¤t_ekm.header, | ||
1281 | kx->set_key_retry_frequency); | 1285 | kx->set_key_retry_frequency); |
1282 | kx->retry_set_key_task = | 1286 | kx->retry_set_key_task = |
1283 | GNUNET_SCHEDULER_add_delayed (kx->set_key_retry_frequency, | 1287 | GNUNET_SCHEDULER_add_delayed (kx->set_key_retry_frequency, |
@@ -1294,7 +1298,8 @@ send_key (struct GSC_KeyExchangeInfo *kx) | |||
1294 | */ | 1298 | */ |
1295 | void | 1299 | void |
1296 | GSC_KX_encrypt_and_transmit (struct GSC_KeyExchangeInfo *kx, | 1300 | GSC_KX_encrypt_and_transmit (struct GSC_KeyExchangeInfo *kx, |
1297 | const void *payload, size_t payload_size) | 1301 | const void *payload, |
1302 | size_t payload_size) | ||
1298 | { | 1303 | { |
1299 | size_t used = payload_size + sizeof (struct EncryptedMessage); | 1304 | size_t used = payload_size + sizeof (struct EncryptedMessage); |
1300 | char pbuf[used]; /* plaintext */ | 1305 | char pbuf[used]; /* plaintext */ |
@@ -1327,7 +1332,8 @@ GSC_KX_encrypt_and_transmit (struct GSC_KeyExchangeInfo *kx, | |||
1327 | ph->iv_seed); | 1332 | ph->iv_seed); |
1328 | GNUNET_CRYPTO_hmac (&auth_key, &em->sequence_number, | 1333 | GNUNET_CRYPTO_hmac (&auth_key, &em->sequence_number, |
1329 | used - ENCRYPTED_HEADER_SIZE, &em->hmac); | 1334 | used - ENCRYPTED_HEADER_SIZE, &em->hmac); |
1330 | GSC_NEIGHBOURS_transmit (&kx->peer, &em->header, | 1335 | GSC_NEIGHBOURS_transmit (&kx->peer, |
1336 | &em->header, | ||
1331 | GNUNET_TIME_UNIT_FOREVER_REL); | 1337 | GNUNET_TIME_UNIT_FOREVER_REL); |
1332 | } | 1338 | } |
1333 | 1339 | ||
diff --git a/src/core/gnunet-service-core_neighbours.c b/src/core/gnunet-service-core_neighbours.c index eca5393a2..20055081b 100644 --- a/src/core/gnunet-service-core_neighbours.c +++ b/src/core/gnunet-service-core_neighbours.c | |||
@@ -266,10 +266,10 @@ process_queue (struct Neighbour *n) | |||
266 | { | 266 | { |
267 | struct NeighbourMessageEntry *m; | 267 | struct NeighbourMessageEntry *m; |
268 | 268 | ||
269 | if (n->th != NULL) | 269 | if (NULL != n->th) |
270 | return; /* request already pending */ | 270 | return; /* request already pending */ |
271 | m = n->message_head; | 271 | m = n->message_head; |
272 | if (m == NULL) | 272 | if (NULL == m) |
273 | { | 273 | { |
274 | /* notify sessions that the queue is empty and more messages | 274 | /* notify sessions that the queue is empty and more messages |
275 | * could thus be queued now */ | 275 | * could thus be queued now */ |
@@ -278,25 +278,30 @@ process_queue (struct Neighbour *n) | |||
278 | } | 278 | } |
279 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 279 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
280 | "Asking transport for transmission of %u bytes to `%4s' in next %s\n", | 280 | "Asking transport for transmission of %u bytes to `%4s' in next %s\n", |
281 | (unsigned int) m->size, GNUNET_i2s (&n->peer), | 281 | (unsigned int) m->size, |
282 | GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_remaining (m->deadline), GNUNET_NO)); | 282 | GNUNET_i2s (&n->peer), |
283 | n->th = | 283 | GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_remaining (m->deadline), |
284 | GNUNET_TRANSPORT_notify_transmit_ready (transport, &n->peer, m->size, | 284 | GNUNET_NO)); |
285 | GNUNET_TIME_absolute_get_remaining | 285 | n->th |
286 | (m->deadline), &transmit_ready, | 286 | = GNUNET_TRANSPORT_notify_transmit_ready (transport, |
287 | &n->peer, | ||
288 | m->size, | ||
289 | GNUNET_TIME_absolute_get_remaining (m->deadline), | ||
290 | &transmit_ready, | ||
287 | n); | 291 | n); |
288 | if (n->th != NULL) | 292 | if (NULL != n->th) |
289 | return; | 293 | return; |
290 | /* message request too large or duplicate request */ | 294 | /* message request too large or duplicate request */ |
291 | GNUNET_break (0); | 295 | GNUNET_break (0); |
292 | /* discard encrypted message */ | 296 | /* discard encrypted message */ |
293 | GNUNET_CONTAINER_DLL_remove (n->message_head, n->message_tail, m); | 297 | GNUNET_CONTAINER_DLL_remove (n->message_head, |
298 | n->message_tail, | ||
299 | m); | ||
294 | GNUNET_free (m); | 300 | GNUNET_free (m); |
295 | process_queue (n); | 301 | process_queue (n); |
296 | } | 302 | } |
297 | 303 | ||
298 | 304 | ||
299 | |||
300 | /** | 305 | /** |
301 | * Function called by transport to notify us that | 306 | * Function called by transport to notify us that |
302 | * a peer connected to us (on the network level). | 307 | * a peer connected to us (on the network level). |
@@ -310,7 +315,9 @@ handle_transport_notify_connect (void *cls, | |||
310 | { | 315 | { |
311 | struct Neighbour *n; | 316 | struct Neighbour *n; |
312 | 317 | ||
313 | if (0 == memcmp (peer, &GSC_my_identity, sizeof (struct GNUNET_PeerIdentity))) | 318 | if (0 == memcmp (peer, |
319 | &GSC_my_identity, | ||
320 | sizeof (struct GNUNET_PeerIdentity))) | ||
314 | { | 321 | { |
315 | GNUNET_break (0); | 322 | GNUNET_break (0); |
316 | return; | 323 | return; |
@@ -356,7 +363,7 @@ handle_transport_notify_disconnect (void *cls, | |||
356 | "Peer `%4s' disconnected from us; received notification from transport.\n", | 363 | "Peer `%4s' disconnected from us; received notification from transport.\n", |
357 | GNUNET_i2s (peer)); | 364 | GNUNET_i2s (peer)); |
358 | n = find_neighbour (peer); | 365 | n = find_neighbour (peer); |
359 | if (n == NULL) | 366 | if (NULL == n) |
360 | { | 367 | { |
361 | GNUNET_break (0); | 368 | GNUNET_break (0); |
362 | return; | 369 | return; |
@@ -373,7 +380,8 @@ handle_transport_notify_disconnect (void *cls, | |||
373 | * @param message the message | 380 | * @param message the message |
374 | */ | 381 | */ |
375 | static void | 382 | static void |
376 | handle_transport_receive (void *cls, const struct GNUNET_PeerIdentity *peer, | 383 | handle_transport_receive (void *cls, |
384 | const struct GNUNET_PeerIdentity *peer, | ||
377 | const struct GNUNET_MessageHeader *message) | 385 | const struct GNUNET_MessageHeader *message) |
378 | { | 386 | { |
379 | struct Neighbour *n; | 387 | struct Neighbour *n; |
@@ -414,9 +422,9 @@ handle_transport_receive (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
414 | break; | 422 | break; |
415 | default: | 423 | default: |
416 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 424 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
417 | _ | 425 | _("Unsupported message of type %u (%u bytes) received from peer `%s'\n"), |
418 | ("Unsupported message of type %u (%u bytes) received from peer `%s'\n"), | 426 | (unsigned int) type, |
419 | (unsigned int) type, (unsigned int) ntohs (message->size), | 427 | (unsigned int) ntohs (message->size), |
420 | GNUNET_i2s (peer)); | 428 | GNUNET_i2s (peer)); |
421 | return; | 429 | return; |
422 | } | 430 | } |
@@ -561,7 +569,8 @@ GSC_NEIGHBOURS_done () | |||
561 | } | 569 | } |
562 | if (NULL != neighbours) | 570 | if (NULL != neighbours) |
563 | { | 571 | { |
564 | GNUNET_CONTAINER_multipeermap_iterate (neighbours, &free_neighbour_helper, | 572 | GNUNET_CONTAINER_multipeermap_iterate (neighbours, |
573 | &free_neighbour_helper, | ||
565 | NULL); | 574 | NULL); |
566 | GNUNET_CONTAINER_multipeermap_destroy (neighbours); | 575 | GNUNET_CONTAINER_multipeermap_destroy (neighbours); |
567 | neighbours = NULL; | 576 | neighbours = NULL; |
diff --git a/src/core/gnunet-service-core_neighbours.h b/src/core/gnunet-service-core_neighbours.h index 8dcd20634..39585b5ee 100644 --- a/src/core/gnunet-service-core_neighbours.h +++ b/src/core/gnunet-service-core_neighbours.h | |||
@@ -31,10 +31,10 @@ | |||
31 | /** | 31 | /** |
32 | * Transmit the given message to the given target. Note that a | 32 | * Transmit the given message to the given target. Note that a |
33 | * non-control messages should only be transmitted after a | 33 | * non-control messages should only be transmitted after a |
34 | * 'GSC_SESSION_solicit' call was made (that call is always invoked | 34 | * #GSC_SESSION_solicit() call was made (that call is always invoked |
35 | * when the message queue is empty). Outbound quotas and memory | 35 | * when the message queue is empty). Outbound quotas and memory |
36 | * bounds will then be enfoced (as GSC_SESSION_solicit is only called | 36 | * bounds will then be enfoced (as #GSC_SESSION_solicit() is only called |
37 | * if sufficient banwdith is available). | 37 | * if sufficient bandwidth is available). |
38 | * | 38 | * |
39 | * @param target peer that should receive the message (must be connected) | 39 | * @param target peer that should receive the message (must be connected) |
40 | * @param msg message to transmit | 40 | * @param msg message to transmit |
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) |