diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-03-27 10:32:30 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-03-27 10:32:30 +0000 |
commit | 817bbb71e3e583ec85d6d63ca3e0cbb90ccd7462 (patch) | |
tree | 7e9e8717e9f57b74fca3a0e93f0d4b94234a1dd3 /src/core/gnunet-service-core.c | |
parent | 3814b7980a4ed1117be9659a3d10fa49cb4c16e9 (diff) | |
download | gnunet-817bbb71e3e583ec85d6d63ca3e0cbb90ccd7462.tar.gz gnunet-817bbb71e3e583ec85d6d63ca3e0cbb90ccd7462.zip |
communicate res delay in capi
Diffstat (limited to 'src/core/gnunet-service-core.c')
-rw-r--r-- | src/core/gnunet-service-core.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c index 3068fd408..223430805 100644 --- a/src/core/gnunet-service-core.c +++ b/src/core/gnunet-service-core.c | |||
@@ -1571,6 +1571,7 @@ handle_client_request_info (void *cls, | |||
1571 | int32_t want_reserv; | 1571 | int32_t want_reserv; |
1572 | int32_t got_reserv; | 1572 | int32_t got_reserv; |
1573 | unsigned long long old_preference; | 1573 | unsigned long long old_preference; |
1574 | struct GNUNET_TIME_Relative rdelay; | ||
1574 | 1575 | ||
1575 | #if DEBUG_CORE_CLIENT | 1576 | #if DEBUG_CORE_CLIENT |
1576 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1577 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
@@ -1621,8 +1622,9 @@ handle_client_request_info (void *cls, | |||
1621 | } | 1622 | } |
1622 | else if (want_reserv > 0) | 1623 | else if (want_reserv > 0) |
1623 | { | 1624 | { |
1624 | if (GNUNET_BANDWIDTH_tracker_get_delay (&n->available_recv_window, | 1625 | rdelay = GNUNET_BANDWIDTH_tracker_get_delay (&n->available_recv_window, |
1625 | want_reserv).rel_value == 0) | 1626 | want_reserv); |
1627 | if (rdelay.rel_value == 0) | ||
1626 | got_reserv = want_reserv; | 1628 | got_reserv = want_reserv; |
1627 | else | 1629 | else |
1628 | got_reserv = 0; /* all or nothing */ | 1630 | got_reserv = 0; /* all or nothing */ |
@@ -1647,6 +1649,7 @@ handle_client_request_info (void *cls, | |||
1647 | (int) got_reserv); | 1649 | (int) got_reserv); |
1648 | #endif | 1650 | #endif |
1649 | cim.reserved_amount = htonl (got_reserv); | 1651 | cim.reserved_amount = htonl (got_reserv); |
1652 | cim.reserve_delay = GNUNET_TIME_relative_hton (rdelay); | ||
1650 | cim.rim_id = rcm->rim_id; | 1653 | cim.rim_id = rcm->rim_id; |
1651 | cim.bw_out = n->bw_out; | 1654 | cim.bw_out = n->bw_out; |
1652 | cim.preference = n->current_preference; | 1655 | cim.preference = n->current_preference; |