diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-02-08 19:59:05 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-02-08 19:59:05 +0000 |
commit | 02addaea83c38c80670fe94ab4b021eeb3105de7 (patch) | |
tree | 2ff5729d99bfebb4014da56a7517f6a31457547b /src/ats | |
parent | bc7447f2dcafb3cb5cc69477a64ca2a5f7c8d716 (diff) | |
download | gnunet-02addaea83c38c80670fe94ab4b021eeb3105de7.tar.gz gnunet-02addaea83c38c80670fe94ab4b021eeb3105de7.zip |
-simplify flow, redistribute bandwidth after adding address
Diffstat (limited to 'src/ats')
-rw-r--r-- | src/ats/plugin_ats_proportional.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/ats/plugin_ats_proportional.c b/src/ats/plugin_ats_proportional.c index 1b9b30654..be50c4393 100644 --- a/src/ats/plugin_ats_proportional.c +++ b/src/ats/plugin_ats_proportional.c | |||
@@ -1079,14 +1079,17 @@ GAS_proportional_get_preferred_address (void *solver, | |||
1079 | { | 1079 | { |
1080 | struct GAS_PROPORTIONAL_Handle *s = solver; | 1080 | struct GAS_PROPORTIONAL_Handle *s = solver; |
1081 | struct ATS_Address *best_address; | 1081 | struct ATS_Address *best_address; |
1082 | struct AddressWrapper *asi; | ||
1082 | 1083 | ||
1083 | best_address = update_active_address (s, peer); | 1084 | best_address = update_active_address (s, |
1085 | peer); | ||
1084 | if (NULL == best_address) | 1086 | if (NULL == best_address) |
1085 | return; | 1087 | return; |
1086 | if (s->bulk_lock > 0) | 1088 | if (s->bulk_lock > 0) |
1087 | return; | 1089 | return; |
1088 | s->env->bandwidth_changed_cb (s->env->cls, | 1090 | asi = best_address->solver_information; |
1089 | best_address); | 1091 | distribute_bandwidth_in_network (s, |
1092 | asi->network); | ||
1090 | } | 1093 | } |
1091 | 1094 | ||
1092 | 1095 | ||
@@ -1220,9 +1223,8 @@ GAS_proportional_address_add (void *solver, | |||
1220 | GNUNET_NO); | 1223 | GNUNET_NO); |
1221 | 1224 | ||
1222 | LOG (GNUNET_ERROR_TYPE_INFO, | 1225 | LOG (GNUNET_ERROR_TYPE_INFO, |
1223 | "Adding new address %p for peer `%s', now total %u and active %u addresses in network `%s'\n", | 1226 | "Added new address for `%s', now total %u and active %u addresses in network `%s'\n", |
1224 | address, | 1227 | GNUNET_i2s (&address->peer), |
1225 | GNUNET_i2s (&address->peer), | ||
1226 | net->total_addresses, | 1228 | net->total_addresses, |
1227 | net->active_addresses, | 1229 | net->active_addresses, |
1228 | net->desc); | 1230 | net->desc); |