X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fats%2Fgnunet-service-ats_normalization.c;h=e70be018e03057f22d2e807f4195224d1dc1d1c3;hb=e871f8368c8a1f0867f68f656875e4c37c26f298;hp=017e14327ecf380ef3b248180749cc875e47c3b2;hpb=b290ee86db69a066fa6dc1348adead95fca25ad8;p=oweals%2Fgnunet.git diff --git a/src/ats/gnunet-service-ats_normalization.c b/src/ats/gnunet-service-ats_normalization.c index 017e14327..e70be018e 100644 --- a/src/ats/gnunet-service-ats_normalization.c +++ b/src/ats/gnunet-service-ats_normalization.c @@ -1,21 +1,19 @@ /* This file is part of GNUnet. - Copyright (C) 2011-2015 Christian Grothoff (and other contributing authors) + Copyright (C) 2011-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + Affero General Public License for more details. - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** @@ -86,7 +84,7 @@ update_avg (uint64_t current_val, } } if (0 == count) - ni->avg = curent_val; /* must be UINT64_MAX */ + ni->avg = current_val; /* must be UINT64_MAX */ else ni->avg = sum / count; } @@ -232,7 +230,6 @@ GAS_normalization_update_property (struct ATS_Address *address) { const struct GNUNET_ATS_Properties *prop = &address->properties; struct PropertyRange range; - int range_changed; LOG (GNUNET_ERROR_TYPE_DEBUG, "Updating properties for peer `%s'\n", @@ -257,25 +254,23 @@ GAS_normalization_update_property (struct ATS_Address *address) { /* limits changed, (re)normalize all addresses */ property_range = range; - range_changed = GNUNET_YES; - } - if (GNUNET_YES == range_changed) GNUNET_CONTAINER_multipeermap_iterate (GSA_addresses, &normalize_address, NULL); - else - normalize_address (NULL, - &address->peer, - address); - /* after all peers have been updated, notify about changes */ - if (GNUNET_YES == range_changed) GNUNET_CONTAINER_multipeermap_iterate (GSA_addresses, ¬ify_change, NULL); + } else + { + /* renormalize just this one address */ + normalize_address (NULL, + &address->peer, + address); notify_change (NULL, &address->peer, address); + } GAS_plugin_solver_unlock (); }