diff options
Diffstat (limited to 'src/fs/gnunet-service-fs_cp.c')
-rw-r--r-- | src/fs/gnunet-service-fs_cp.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/fs/gnunet-service-fs_cp.c b/src/fs/gnunet-service-fs_cp.c index 1e93a475e..96d906c5b 100644 --- a/src/fs/gnunet-service-fs_cp.c +++ b/src/fs/gnunet-service-fs_cp.c | |||
@@ -383,7 +383,8 @@ GSF_get_peer_performance_data_ (struct GSF_ConnectedPeer *cp) | |||
383 | * @param buf where to copy the message | 383 | * @param buf where to copy the message |
384 | * @return number of bytes copied to buf | 384 | * @return number of bytes copied to buf |
385 | */ | 385 | */ |
386 | static size_t peer_transmit_ready_cb (void *cls, size_t size, void *buf); | 386 | static size_t |
387 | peer_transmit_ready_cb (void *cls, size_t size, void *buf); | ||
387 | 388 | ||
388 | 389 | ||
389 | 390 | ||
@@ -400,12 +401,11 @@ static size_t peer_transmit_ready_cb (void *cls, size_t size, void *buf); | |||
400 | * long should the client wait until re-trying? | 401 | * long should the client wait until re-trying? |
401 | * @param preference current traffic preference for the given peer | 402 | * @param preference current traffic preference for the given peer |
402 | */ | 403 | */ |
403 | static void core_reserve_callback (void *cls, | 404 | static void |
404 | const struct GNUNET_PeerIdentity *peer, | 405 | core_reserve_callback (void *cls, const struct GNUNET_PeerIdentity *peer, |
405 | struct GNUNET_BANDWIDTH_Value32NBO | 406 | struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out, |
406 | bandwidth_out, int32_t amount, | 407 | int32_t amount, struct GNUNET_TIME_Relative res_delay, |
407 | struct GNUNET_TIME_Relative res_delay, | 408 | uint64_t preference); |
408 | uint64_t preference); | ||
409 | 409 | ||
410 | 410 | ||
411 | /** | 411 | /** |
@@ -491,9 +491,8 @@ peer_transmit_ready_cb (void *cls, size_t size, void *buf) | |||
491 | GNUNET_assert (0 < cp->ppd.pending_replies--); | 491 | GNUNET_assert (0 < cp->ppd.pending_replies--); |
492 | } | 492 | } |
493 | GNUNET_LOAD_update (cp->ppd.transmission_delay, | 493 | GNUNET_LOAD_update (cp->ppd.transmission_delay, |
494 | GNUNET_TIME_absolute_get_duration (pth-> | 494 | GNUNET_TIME_absolute_get_duration |
495 | transmission_request_start_time). | 495 | (pth->transmission_request_start_time).rel_value); |
496 | rel_value); | ||
497 | ret = pth->gmc (pth->gmc_cls, size, buf); | 496 | ret = pth->gmc (pth->gmc_cls, size, buf); |
498 | GNUNET_assert (NULL == pth->cth); | 497 | GNUNET_assert (NULL == pth->cth); |
499 | for (pos = cp->pth_head; pos != NULL; pos = pos->next) | 498 | for (pos = cp->pth_head; pos != NULL; pos = pos->next) |
@@ -1732,9 +1731,9 @@ GSF_block_peer_migration_ (struct GSF_ConnectedPeer *cp, | |||
1732 | #if DEBUG_FS && 0 | 1731 | #if DEBUG_FS && 0 |
1733 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1732 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1734 | "Migration already blocked for another %llu ms\n", | 1733 | "Migration already blocked for another %llu ms\n", |
1735 | (unsigned long long) GNUNET_TIME_absolute_get_remaining (cp-> | 1734 | (unsigned long long) |
1736 | last_migration_block). | 1735 | GNUNET_TIME_absolute_get_remaining |
1737 | rel_value); | 1736 | (cp->last_migration_block).rel_value); |
1738 | #endif | 1737 | #endif |
1739 | return; /* already blocked */ | 1738 | return; /* already blocked */ |
1740 | } | 1739 | } |