diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-02-07 18:35:13 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-02-07 18:35:13 +0000 |
commit | c0ea0d12ca3fd2d3ca424d8b28532cf800d0683b (patch) | |
tree | a207d8d2d6f27aa3b5bcb20299dd7ac9ba5ce181 | |
parent | 03ace5f308862db05c67759b533ab9bbf07b1556 (diff) | |
download | gnunet-c0ea0d12ca3fd2d3ca424d8b28532cf800d0683b.tar.gz gnunet-c0ea0d12ca3fd2d3ca424d8b28532cf800d0683b.zip |
DCE
-rw-r--r-- | src/ats/gnunet-ats-solver-eval.c | 6 | ||||
-rw-r--r-- | src/ats/gnunet-ats-solver-eval.h | 1 | ||||
-rw-r--r-- | src/ats/gnunet-service-ats_addresses.h | 10 | ||||
-rw-r--r-- | src/ats/gnunet-service-ats_plugins.c | 4 |
4 files changed, 3 insertions, 18 deletions
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) | |||
206 | log_a->aid = cur_addr->aid; | 206 | log_a->aid = cur_addr->aid; |
207 | log_a->active = cur_addr->ats_addr->active; | 207 | log_a->active = cur_addr->ats_addr->active; |
208 | log_a->network = cur_addr->network; | 208 | log_a->network = cur_addr->network; |
209 | log_a->used = cur_addr->ats_addr->used; | ||
210 | log_a->assigned_bw_in = cur_addr->ats_addr->assigned_bw_in; | 209 | log_a->assigned_bw_in = cur_addr->ats_addr->assigned_bw_in; |
211 | log_a->assigned_bw_out = cur_addr->ats_addr->assigned_bw_out; | 210 | log_a->assigned_bw_out = cur_addr->ats_addr->assigned_bw_out; |
212 | for (c = 0; c < GNUNET_ATS_PropertyCount; c++) | 211 | for (c = 0; c < GNUNET_ATS_PropertyCount; c++) |
@@ -2170,11 +2169,6 @@ create_ats_address (const struct GNUNET_PeerIdentity *peer, | |||
2170 | memcpy (&aa[1], plugin_addr, plugin_addr_len); | 2169 | memcpy (&aa[1], plugin_addr, plugin_addr_len); |
2171 | memcpy (aa->plugin, plugin_name, strlen (plugin_name) + 1); | 2170 | memcpy (aa->plugin, plugin_name, strlen (plugin_name) + 1); |
2172 | aa->session_id = session_id; | 2171 | aa->session_id = session_id; |
2173 | aa->active = GNUNET_NO; | ||
2174 | aa->used = GNUNET_NO; | ||
2175 | aa->solver_information = NULL; | ||
2176 | aa->assigned_bw_in = 0; | ||
2177 | aa->assigned_bw_out = 0; | ||
2178 | 2172 | ||
2179 | return aa; | 2173 | return aa; |
2180 | } | 2174 | } |
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 | |||
135 | 135 | ||
136 | long long unsigned int aid; | 136 | long long unsigned int aid; |
137 | int active; | 137 | int active; |
138 | int used; | ||
139 | uint32_t network; | 138 | uint32_t network; |
140 | uint32_t assigned_bw_in; | 139 | uint32_t assigned_bw_in; |
141 | uint32_t assigned_bw_out; | 140 | 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 | |||
270 | char *plugin; | 270 | char *plugin; |
271 | 271 | ||
272 | /** | 272 | /** |
273 | * Solver specific information for this address | 273 | * Solver-specific information for this address |
274 | */ | 274 | */ |
275 | void *solver_information; | 275 | void *solver_information; |
276 | 276 | ||
@@ -300,7 +300,8 @@ struct ATS_Address | |||
300 | uint32_t session_id; | 300 | uint32_t session_id; |
301 | 301 | ||
302 | /** | 302 | /** |
303 | * Field to store local flags | 303 | * Field to store local flags. |
304 | * FIXME: `enum GNUNET_HELLO_AddressInfo`? | ||
304 | */ | 305 | */ |
305 | uint32_t local_address_info; | 306 | uint32_t local_address_info; |
306 | 307 | ||
@@ -335,11 +336,6 @@ struct ATS_Address | |||
335 | int active; | 336 | int active; |
336 | 337 | ||
337 | /** | 338 | /** |
338 | * Is this the address for this peer in use? | ||
339 | */ | ||
340 | int used; | ||
341 | |||
342 | /** | ||
343 | * Normalized ATS performance information for this address | 339 | * Normalized ATS performance information for this address |
344 | * Each entry can be accessed using the GNUNET_ATS_QualityProperties avg_queue_index | 340 | * Each entry can be accessed using the GNUNET_ATS_QualityProperties avg_queue_index |
345 | */ | 341 | */ |
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, | |||
415 | int | 415 | int |
416 | GAS_plugins_init (const struct GNUNET_CONFIGURATION_Handle *cfg) | 416 | GAS_plugins_init (const struct GNUNET_CONFIGURATION_Handle *cfg) |
417 | { | 417 | { |
418 | unsigned long long quotas_in[GNUNET_ATS_NetworkTypeCount]; | ||
419 | unsigned long long quotas_out[GNUNET_ATS_NetworkTypeCount]; | ||
420 | char *mode_str; | 418 | char *mode_str; |
421 | unsigned int c; | ||
422 | 419 | ||
423 | /* Figure out configured solution method */ | 420 | /* Figure out configured solution method */ |
424 | if (GNUNET_SYSERR == | 421 | if (GNUNET_SYSERR == |
@@ -444,7 +441,6 @@ GAS_plugins_init (const struct GNUNET_CONFIGURATION_Handle *cfg) | |||
444 | env.out_quota, | 441 | env.out_quota, |
445 | env.in_quota, | 442 | env.in_quota, |
446 | GNUNET_ATS_NetworkTypeCount); | 443 | GNUNET_ATS_NetworkTypeCount); |
447 | |||
448 | GNUNET_asprintf (&plugin, | 444 | GNUNET_asprintf (&plugin, |
449 | "libgnunet_plugin_ats_%s", | 445 | "libgnunet_plugin_ats_%s", |
450 | mode_str); | 446 | mode_str); |