From c0ea0d12ca3fd2d3ca424d8b28532cf800d0683b Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 7 Feb 2015 18:35:13 +0000 Subject: DCE --- src/ats/gnunet-ats-solver-eval.c | 6 ------ src/ats/gnunet-ats-solver-eval.h | 1 - src/ats/gnunet-service-ats_addresses.h | 10 +++------- src/ats/gnunet-service-ats_plugins.c | 4 ---- 4 files changed, 3 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/ats/gnunet-ats-solver-eval.c b/src/ats/gnunet-ats-solver-eval.c index 99771d0e8..4ecbfc5a5 100644 --- a/src/ats/gnunet-ats-solver-eval.c +++ b/src/ats/gnunet-ats-solver-eval.c @@ -206,7 +206,6 @@ GNUNET_ATS_solver_logging_now (struct LoggingHandle *l) log_a->aid = cur_addr->aid; log_a->active = cur_addr->ats_addr->active; log_a->network = cur_addr->network; - log_a->used = cur_addr->ats_addr->used; log_a->assigned_bw_in = cur_addr->ats_addr->assigned_bw_in; log_a->assigned_bw_out = cur_addr->ats_addr->assigned_bw_out; for (c = 0; c < GNUNET_ATS_PropertyCount; c++) @@ -2170,11 +2169,6 @@ create_ats_address (const struct GNUNET_PeerIdentity *peer, memcpy (&aa[1], plugin_addr, plugin_addr_len); memcpy (aa->plugin, plugin_name, strlen (plugin_name) + 1); aa->session_id = session_id; - aa->active = GNUNET_NO; - aa->used = GNUNET_NO; - aa->solver_information = NULL; - aa->assigned_bw_in = 0; - aa->assigned_bw_out = 0; return aa; } diff --git a/src/ats/gnunet-ats-solver-eval.h b/src/ats/gnunet-ats-solver-eval.h index 17dde6e67..151c12f13 100644 --- a/src/ats/gnunet-ats-solver-eval.h +++ b/src/ats/gnunet-ats-solver-eval.h @@ -135,7 +135,6 @@ struct LoggingAddress long long unsigned int aid; int active; - int used; uint32_t network; uint32_t assigned_bw_in; uint32_t assigned_bw_out; diff --git a/src/ats/gnunet-service-ats_addresses.h b/src/ats/gnunet-service-ats_addresses.h index 89d5ceed0..96752ae42 100644 --- a/src/ats/gnunet-service-ats_addresses.h +++ b/src/ats/gnunet-service-ats_addresses.h @@ -270,7 +270,7 @@ struct ATS_Address char *plugin; /** - * Solver specific information for this address + * Solver-specific information for this address */ void *solver_information; @@ -300,7 +300,8 @@ struct ATS_Address uint32_t session_id; /** - * Field to store local flags + * Field to store local flags. + * FIXME: `enum GNUNET_HELLO_AddressInfo`? */ uint32_t local_address_info; @@ -334,11 +335,6 @@ struct ATS_Address */ int active; - /** - * Is this the address for this peer in use? - */ - int used; - /** * Normalized ATS performance information for this address * Each entry can be accessed using the GNUNET_ATS_QualityProperties avg_queue_index diff --git a/src/ats/gnunet-service-ats_plugins.c b/src/ats/gnunet-service-ats_plugins.c index 8aa915bd7..4fd876817 100644 --- a/src/ats/gnunet-service-ats_plugins.c +++ b/src/ats/gnunet-service-ats_plugins.c @@ -415,10 +415,7 @@ load_quotas (const struct GNUNET_CONFIGURATION_Handle *cfg, int GAS_plugins_init (const struct GNUNET_CONFIGURATION_Handle *cfg) { - unsigned long long quotas_in[GNUNET_ATS_NetworkTypeCount]; - unsigned long long quotas_out[GNUNET_ATS_NetworkTypeCount]; char *mode_str; - unsigned int c; /* Figure out configured solution method */ if (GNUNET_SYSERR == @@ -444,7 +441,6 @@ GAS_plugins_init (const struct GNUNET_CONFIGURATION_Handle *cfg) env.out_quota, env.in_quota, GNUNET_ATS_NetworkTypeCount); - GNUNET_asprintf (&plugin, "libgnunet_plugin_ats_%s", mode_str); -- cgit v1.2.3