diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-10-10 08:38:39 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-10-10 08:38:39 +0000 |
commit | ea3717b6ea09ac10b68f1b21de5ddc2d8da5e440 (patch) | |
tree | 722c7943c6820d66e5b12709e2c0c4f68e48f3d6 /src/core/gnunet-service-core_sessions.c | |
parent | 61214906db3935fffcaa0170d1dd4d909c9c5c09 (diff) | |
download | gnunet-ea3717b6ea09ac10b68f1b21de5ddc2d8da5e440.tar.gz gnunet-ea3717b6ea09ac10b68f1b21de5ddc2d8da5e440.zip |
remove limit_outbound, DCE
Diffstat (limited to 'src/core/gnunet-service-core_sessions.c')
-rw-r--r-- | src/core/gnunet-service-core_sessions.c | 36 |
1 files changed, 7 insertions, 29 deletions
diff --git a/src/core/gnunet-service-core_sessions.c b/src/core/gnunet-service-core_sessions.c index 93f9b6950..6ab97d7d0 100644 --- a/src/core/gnunet-service-core_sessions.c +++ b/src/core/gnunet-service-core_sessions.c | |||
@@ -122,27 +122,25 @@ struct Session | |||
122 | GNUNET_SCHEDULER_TaskIdentifier cork_task; | 122 | GNUNET_SCHEDULER_TaskIdentifier cork_task; |
123 | 123 | ||
124 | /** | 124 | /** |
125 | * Tracking bandwidth for sending to this peer. | ||
126 | * // FIXME: unused! should it be used? | ||
127 | */ | ||
128 | struct GNUNET_BANDWIDTH_Tracker available_send_window; | ||
129 | |||
130 | /** | ||
131 | * Tracking bandwidth for receiving from this peer. | 125 | * Tracking bandwidth for receiving from this peer. |
132 | * // FIXME: need to set it! | 126 | * // FIXME: need to set it! |
133 | */ | 127 | */ |
134 | struct GNUNET_BANDWIDTH_Tracker available_recv_window; | 128 | struct GNUNET_BANDWIDTH_Tracker available_recv_window; |
135 | 129 | ||
136 | /** | 130 | /** |
137 | * Available bandwidth out for this peer (current target). | 131 | * Available bandwidth out for this peer (current target). This |
138 | * // FIXME: check usage! | 132 | * value should be the 'MIN' of 'bw_out_internal_limit' and |
133 | * 'bw_out_external_limit'. | ||
139 | */ | 134 | */ |
140 | struct GNUNET_BANDWIDTH_Value32NBO bw_out; | 135 | struct GNUNET_BANDWIDTH_Value32NBO bw_out; |
141 | 136 | ||
142 | /** | 137 | /** |
143 | * Internal bandwidth limit set for this peer (initially typically | 138 | * Internal bandwidth limit set for this peer (initially typically |
144 | * set to "-1"). Actual "bw_out" is MIN of | 139 | * set to "MAX_INT"). Actual "bw_out" is MIN of |
145 | * "bpm_out_internal_limit" and "bw_out_external_limit". | 140 | * "bpm_out_internal_limit" and "bw_out_external_limit". |
141 | * | ||
142 | * | ||
143 | * | ||
146 | * // FIXME: check usage | 144 | * // FIXME: check usage |
147 | */ | 145 | */ |
148 | struct GNUNET_BANDWIDTH_Value32NBO bw_out_internal_limit; | 146 | struct GNUNET_BANDWIDTH_Value32NBO bw_out_internal_limit; |
@@ -773,26 +771,6 @@ GSC_SESSIONS_handle_client_request_info (void *cls, struct GNUNET_SERVER_Client | |||
773 | } | 771 | } |
774 | 772 | ||
775 | want_reserv = ntohl (rcm->reserve_inbound); | 773 | want_reserv = ntohl (rcm->reserve_inbound); |
776 | if (session->bw_out_internal_limit.value__ != rcm->limit_outbound.value__) | ||
777 | { | ||
778 | session->bw_out_internal_limit = rcm->limit_outbound; | ||
779 | if (session->bw_out.value__ != | ||
780 | GNUNET_BANDWIDTH_value_min (session->bw_out_internal_limit, | ||
781 | session->bw_out_external_limit).value__) | ||
782 | { | ||
783 | session->bw_out = | ||
784 | GNUNET_BANDWIDTH_value_min (session->bw_out_internal_limit, | ||
785 | session->bw_out_external_limit); | ||
786 | GNUNET_BANDWIDTH_tracker_update_quota (&session->available_recv_window, | ||
787 | session->bw_out); | ||
788 | #if 0 | ||
789 | // FIXME: who does this? | ||
790 | GNUNET_TRANSPORT_set_quota (transport, &session->peer, | ||
791 | session->bw_in, | ||
792 | session->bw_out); | ||
793 | #endif | ||
794 | } | ||
795 | } | ||
796 | if (want_reserv < 0) | 774 | if (want_reserv < 0) |
797 | { | 775 | { |
798 | got_reserv = want_reserv; | 776 | got_reserv = want_reserv; |