From b56915c0dac905b845f0ad81fe77337c768a0e0f Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Thu, 9 Apr 2015 10:08:55 +0000 Subject: removing GNUNET_ATS_Information from ats-testing and logging uses GNUNET_ATS_Properties instead --- src/ats-tests/ats-testing.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/ats-tests/ats-testing.h') diff --git a/src/ats-tests/ats-testing.h b/src/ats-tests/ats-testing.h index a2e61c0d6..42b6b9eb3 100644 --- a/src/ats-tests/ats-testing.h +++ b/src/ats-tests/ats-testing.h @@ -283,7 +283,15 @@ struct BenchmarkPartner */ struct GNUNET_TRANSPORT_TransmitHandle *tth; + + /** + * Handle for traffic generator + */ struct TrafficGenerator *tg; + + /** + * Handle for preference generator + */ struct PreferenceGenerator *pg; /** @@ -317,29 +325,21 @@ struct BenchmarkPartner unsigned int bytes_received; /* Current ATS properties */ + struct GNUNET_ATS_Properties props; - uint32_t ats_distance; - - uint32_t ats_delay; - + /* Bandwidth assigned inbound */ uint32_t bandwidth_in; + /* Bandwidth assigned outbound */ uint32_t bandwidth_out; - uint32_t ats_utilization_up; - - uint32_t ats_utilization_down; - - uint32_t ats_network_type; - - uint32_t ats_cost_wan; + /* Current preference values for bandwidth */ + double pref_bandwidth; - uint32_t ats_cost_lan; + /* Current preference values for delay */ + double pref_delay; - uint32_t ats_cost_wlan; - double pref_bandwidth; - double pref_delay; }; /** -- cgit v1.2.3