/*
This file is part of GNUnet.
- Copyright (C) 2010,2011 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2010,2011 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
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.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
* @file ats/perf_ats_solver.c
static const double *
get_preferences_cb (void *cls, const struct GNUNET_PeerIdentity *id)
{
- return GAS_normalization_get_preferences_by_peer (NULL, id);
+ return GAS_preference_get_by_peer (NULL, id);
}
}
+static unsigned int
+get_connectivity_cb (void *cls,
+ const struct GNUNET_PeerIdentity *peer)
+{
+ return GNUNET_CONTAINER_multipeermap_contains (ph.addresses,
+ peer);
+}
+
+
/**
* Evaluate average results for all iterations
*/
GNUNET_CONTAINER_multipeermap_remove (ph.addresses,
pid,
cur));
- ph.sf->s_del (ph.sf->cls, cur, GNUNET_NO);
+ ph.sf->s_del (ph.sf->cls, cur);
GNUNET_free_non_null (cur->atsi);
GNUNET_free (cur);
return GNUNET_OK;
&do_delete_address,
NULL);
}
+ if (GNUNET_NO == ph.bulk_running)
+ {
+ ph.sf->s_bulk_stop (ph.sf->cls);
+ ph.bulk_running = GNUNET_NO;
+ }
GNUNET_log(GNUNET_ERROR_TYPE_INFO,
"Iteration done\n");
ph.addresses = GNUNET_CONTAINER_multipeermap_create (128, GNUNET_NO);
ph.env.addresses = ph.addresses;
ph.env.bandwidth_changed_cb = bandwidth_changed_cb;
+ ph.env.get_connectivity = &get_connectivity_cb;
ph.env.get_preferences = &get_preferences_cb;
ph.env.network_count = GNUNET_ATS_NetworkTypeCount;
ph.env.info_cb = &solver_info_cb;