diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/dht/gnunet-service-dht_neighbours.c | 6 | ||||
-rw-r--r-- | src/dht/gnunet-service-xdht_neighbours.c | 16 | ||||
-rw-r--r-- | src/hostlist/gnunet-daemon-hostlist_server.c | 2 | ||||
-rw-r--r-- | src/include/gnunet_core_service.h | 7 |
4 files changed, 22 insertions, 9 deletions
diff --git a/src/dht/gnunet-service-dht_neighbours.c b/src/dht/gnunet-service-dht_neighbours.c index cc1e97bfd..38a9c45ad 100644 --- a/src/dht/gnunet-service-dht_neighbours.c +++ b/src/dht/gnunet-service-dht_neighbours.c | |||
@@ -24,7 +24,6 @@ | |||
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | * @author Nathan Evans | 25 | * @author Nathan Evans |
26 | */ | 26 | */ |
27 | |||
28 | #include "platform.h" | 27 | #include "platform.h" |
29 | #include "gnunet_util_lib.h" | 28 | #include "gnunet_util_lib.h" |
30 | #include "gnunet_block_lib.h" | 29 | #include "gnunet_block_lib.h" |
@@ -789,6 +788,11 @@ core_transmit_notify (void *cls, size_t size, void *buf) | |||
789 | while ((NULL != (pending = peer->head)) && | 788 | while ((NULL != (pending = peer->head)) && |
790 | (0 == GNUNET_TIME_absolute_get_remaining (pending->timeout).rel_value_us)) | 789 | (0 == GNUNET_TIME_absolute_get_remaining (pending->timeout).rel_value_us)) |
791 | { | 790 | { |
791 | GNUNET_STATISTICS_update (GDS_stats, | ||
792 | gettext_noop | ||
793 | ("# Messages dropped (CORE timeout)"), | ||
794 | 1, | ||
795 | GNUNET_NO); | ||
792 | peer->pending_count--; | 796 | peer->pending_count--; |
793 | GNUNET_CONTAINER_DLL_remove (peer->head, peer->tail, pending); | 797 | GNUNET_CONTAINER_DLL_remove (peer->head, peer->tail, pending); |
794 | GNUNET_free (pending); | 798 | GNUNET_free (pending); |
diff --git a/src/dht/gnunet-service-xdht_neighbours.c b/src/dht/gnunet-service-xdht_neighbours.c index 50fed309b..3ad86e941 100644 --- a/src/dht/gnunet-service-xdht_neighbours.c +++ b/src/dht/gnunet-service-xdht_neighbours.c | |||
@@ -979,11 +979,18 @@ core_transmit_notify (void *cls, size_t size, void *buf) | |||
979 | size_t msize; | 979 | size_t msize; |
980 | 980 | ||
981 | peer->th = NULL; | 981 | peer->th = NULL; |
982 | while ((NULL != (pending = peer->head)) && | 982 | while ( (NULL != (pending = peer->head)) && |
983 | (0 == GNUNET_TIME_absolute_get_remaining (pending->timeout).rel_value_us)) | 983 | (0 == GNUNET_TIME_absolute_get_remaining (pending->timeout).rel_value_us) ) |
984 | { | 984 | { |
985 | GNUNET_STATISTICS_update (GDS_stats, | ||
986 | gettext_noop | ||
987 | ("# Messages dropped (CORE timeout)"), | ||
988 | 1, | ||
989 | GNUNET_NO); | ||
985 | peer->pending_count--; | 990 | peer->pending_count--; |
986 | GNUNET_CONTAINER_DLL_remove (peer->head, peer->tail, pending); | 991 | GNUNET_CONTAINER_DLL_remove (peer->head, |
992 | peer->tail, | ||
993 | pending); | ||
987 | GNUNET_free (pending); | 994 | GNUNET_free (pending); |
988 | } | 995 | } |
989 | if (NULL == pending) | 996 | if (NULL == pending) |
@@ -1009,7 +1016,8 @@ core_transmit_notify (void *cls, size_t size, void *buf) | |||
1009 | { | 1016 | { |
1010 | GNUNET_STATISTICS_update (GDS_stats, | 1017 | GNUNET_STATISTICS_update (GDS_stats, |
1011 | gettext_noop | 1018 | gettext_noop |
1012 | ("# Bytes transmitted to other peers"), msize, | 1019 | ("# Bytes transmitted to other peers"), |
1020 | msize, | ||
1013 | GNUNET_NO); | 1021 | GNUNET_NO); |
1014 | memcpy (&cbuf[off], pending->msg, msize); | 1022 | memcpy (&cbuf[off], pending->msg, msize); |
1015 | off += msize; | 1023 | off += msize; |
diff --git a/src/hostlist/gnunet-daemon-hostlist_server.c b/src/hostlist/gnunet-daemon-hostlist_server.c index 227c3bdcd..c46bd371c 100644 --- a/src/hostlist/gnunet-daemon-hostlist_server.c +++ b/src/hostlist/gnunet-daemon-hostlist_server.c | |||
@@ -510,6 +510,8 @@ disconnect_handler (void *cls, | |||
510 | const struct GNUNET_PeerIdentity *peer) | 510 | const struct GNUNET_PeerIdentity *peer) |
511 | { | 511 | { |
512 | /* nothing to do */ | 512 | /* nothing to do */ |
513 | /* FIXME: this is wrong, need to CANCEL active | ||
514 | NTR! */ | ||
513 | } | 515 | } |
514 | 516 | ||
515 | 517 | ||
diff --git a/src/include/gnunet_core_service.h b/src/include/gnunet_core_service.h index 7b039ed99..c06e3c1f6 100644 --- a/src/include/gnunet_core_service.h +++ b/src/include/gnunet_core_service.h | |||
@@ -26,7 +26,6 @@ | |||
26 | * @defgroup core encrypted direct communication between peers | 26 | * @defgroup core encrypted direct communication between peers |
27 | * @{ | 27 | * @{ |
28 | */ | 28 | */ |
29 | |||
30 | #ifndef GNUNET_CORE_SERVICE_H | 29 | #ifndef GNUNET_CORE_SERVICE_H |
31 | #define GNUNET_CORE_SERVICE_H | 30 | #define GNUNET_CORE_SERVICE_H |
32 | 31 | ||
@@ -245,7 +244,7 @@ struct GNUNET_CORE_TransmitHandle; | |||
245 | * established (and the client has been informed about this). You may | 244 | * established (and the client has been informed about this). You may |
246 | * have one request of this type pending for each connected peer at | 245 | * have one request of this type pending for each connected peer at |
247 | * any time. If a peer disconnects, the application MUST call | 246 | * any time. If a peer disconnects, the application MUST call |
248 | * #GNUNET_CORE_notify_transmit_ready_cancel on the respective | 247 | * #GNUNET_CORE_notify_transmit_ready_cancel() on the respective |
249 | * transmission request, if one such request is pending. | 248 | * transmission request, if one such request is pending. |
250 | * | 249 | * |
251 | * @param handle connection to core service | 250 | * @param handle connection to core service |
@@ -253,7 +252,7 @@ struct GNUNET_CORE_TransmitHandle; | |||
253 | * @param priority how important is the message? | 252 | * @param priority how important is the message? |
254 | * @param maxdelay how long can the message wait? Only effective if @a cork is #GNUNET_YES | 253 | * @param maxdelay how long can the message wait? Only effective if @a cork is #GNUNET_YES |
255 | * @param target who should receive the message, never NULL (can be this peer's identity for loopback) | 254 | * @param target who should receive the message, never NULL (can be this peer's identity for loopback) |
256 | * @param notify_size how many bytes of buffer space does notify want? | 255 | * @param notify_size how many bytes of buffer space does @a notify want? |
257 | * @param notify function to call when buffer space is available; | 256 | * @param notify function to call when buffer space is available; |
258 | * will be called with NULL on timeout; clients MUST cancel | 257 | * will be called with NULL on timeout; clients MUST cancel |
259 | * all pending transmission requests DURING the disconnect | 258 | * all pending transmission requests DURING the disconnect |
@@ -261,7 +260,7 @@ struct GNUNET_CORE_TransmitHandle; | |||
261 | * @param notify_cls closure for @a notify | 260 | * @param notify_cls closure for @a notify |
262 | * @return non-NULL if the notify callback was queued, | 261 | * @return non-NULL if the notify callback was queued, |
263 | * NULL if we can not even queue the request (request already pending); | 262 | * NULL if we can not even queue the request (request already pending); |
264 | * if NULL is returned, "notify" will NOT be called. | 263 | * if NULL is returned, @a notify will NOT be called. |
265 | */ | 264 | */ |
266 | struct GNUNET_CORE_TransmitHandle * | 265 | struct GNUNET_CORE_TransmitHandle * |
267 | GNUNET_CORE_notify_transmit_ready (struct GNUNET_CORE_Handle *handle, | 266 | GNUNET_CORE_notify_transmit_ready (struct GNUNET_CORE_Handle *handle, |