/*
This file is part of GNUnet.
- (C) 2010-2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2010-2013 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
*/
static struct GNUNET_ATS_SchedulingHandle *sched_ats;
+/**
+ * Connectivity handle
+ */
+static struct GNUNET_ATS_ConnectivityHandle *connect_ats;
+
/**
* Return value
*/
sched_ats = NULL;
}
+ if (NULL != connect_ats)
+ {
+ GNUNET_ATS_connectivity_done (connect_ats);
+ connect_ats = NULL;
+ }
GNUNET_STATISTICS_watch_cancel (stats, "ats", "# addresses", &stat_cb, NULL);
if (NULL != stats)
{
GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
stats = NULL;
}
-
free_test_address (&test_addr);
-
ret = 0;
}
GNUNET_assert (ntohl(bandwidth_out.value__) > 0);
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Received sugggestion for peer `%s', deleting address\n",
- GNUNET_i2s (&address->peer));
+ "Received sugggestion for peer `%s', deleting address\n",
+ GNUNET_i2s (&address->peer));
address_deleted = GNUNET_YES;
+ /* Destroying address and wait for disconnect suggestion */
GNUNET_ATS_address_destroy (ar);
ar = NULL;
}
else
{
/* Expecting disconnect */
-
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Received sugggestion for peer `%s': %u %u\n",
- GNUNET_i2s (&address->peer),
+ GNUNET_i2s (peer),
(unsigned int) ntohl (bandwidth_in.value__),
(unsigned int) ntohl (bandwidth_out.value__));
const char *name, uint64_t value,
int is_persistent)
{
- static struct GNUNET_ATS_SuggestHandle *sh;
+ static struct GNUNET_ATS_ConnectivitySuggestHandle *sh;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"ATS statistics: `%s' `%s' %llu\n",
name,
value);
if (NULL == sh)
- sh = GNUNET_ATS_suggest_address (sched_ats, &p.id);
+ sh = GNUNET_ATS_connectivity_suggest (connect_ats, &p.id);
return GNUNET_OK;
}
stats = GNUNET_STATISTICS_create ("ats", mycfg);
GNUNET_STATISTICS_watch (stats, "ats", "# addresses", &stat_cb, NULL);
+ connect_ats = GNUNET_ATS_connectivity_init (mycfg);
/* Connect to ATS scheduling */
sched_ats = GNUNET_ATS_scheduling_init (mycfg, &address_suggest_cb, NULL);
return ret;
}
-/* end of file test_ats_solver_add_address.c */
+/* end of file test_ats_solver_request_and_delete_address_proportional.c */