aboutsummaryrefslogtreecommitdiff
path: root/src/ats/gnunet-service-ats_addresses.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2015-01-22 21:43:13 +0000
committerChristian Grothoff <christian@grothoff.org>2015-01-22 21:43:13 +0000
commit03c7d2c186ae7371ce5be6fddd376faf90c44e53 (patch)
tree1a961bd69ed3f758a218df2d5166ffea7a000870 /src/ats/gnunet-service-ats_addresses.c
parent8c0022803d0a2f74b8f8e3fbbbb9afddf2b621bc (diff)
downloadgnunet-03c7d2c186ae7371ce5be6fddd376faf90c44e53.tar.gz
gnunet-03c7d2c186ae7371ce5be6fddd376faf90c44e53.zip
also simplify message format for AddressSuggestionMessage
Diffstat (limited to 'src/ats/gnunet-service-ats_addresses.c')
-rw-r--r--src/ats/gnunet-service-ats_addresses.c29
1 files changed, 13 insertions, 16 deletions
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index 21f6ac448..53c8ca25c 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -1244,10 +1244,10 @@ GAS_addresses_request_address (struct GAS_Addresses_Handle *handle,
1244 GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Suggesting address %p for peer `%s'\n", 1244 GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Suggesting address %p for peer `%s'\n",
1245 aa, GNUNET_i2s (peer)); 1245 aa, GNUNET_i2s (peer));
1246 1246
1247 GAS_scheduling_transmit_address_suggestion (peer, aa->plugin, aa->addr, 1247 GAS_scheduling_transmit_address_suggestion (peer,
1248 aa->addr_len, aa->local_address_info, aa->session_id, aa->atsi, 1248 aa->session_id,
1249 aa->atsi_count, GNUNET_BANDWIDTH_value_init (aa->assigned_bw_out), 1249 GNUNET_BANDWIDTH_value_init (aa->assigned_bw_out),
1250 GNUNET_BANDWIDTH_value_init (aa->assigned_bw_in)); 1250 GNUNET_BANDWIDTH_value_init (aa->assigned_bw_in));
1251 1251
1252 aa->block_interval = GNUNET_TIME_relative_add (aa->block_interval, 1252 aa->block_interval = GNUNET_TIME_relative_add (aa->block_interval,
1253 ATS_BLOCKING_DELTA); 1253 ATS_BLOCKING_DELTA);
@@ -1767,13 +1767,11 @@ bandwidth_changed_cb (void *cls, struct ATS_Address *address)
1767 "Telling transport to disconnect peer `%s'\n", 1767 "Telling transport to disconnect peer `%s'\n",
1768 GNUNET_i2s (&address->peer)); 1768 GNUNET_i2s (&address->peer));
1769 1769
1770 /* *Notify scheduling clients about suggestion */ 1770 /* Notify scheduling clients about suggestion */
1771 GAS_scheduling_transmit_address_suggestion (&address->peer, address->plugin, 1771 GAS_scheduling_transmit_address_suggestion (&address->peer,
1772 address->addr, address->addr_len, address->local_address_info, 1772 address->session_id,
1773 address->session_id, address->atsi, address->atsi_count, 1773 GNUNET_BANDWIDTH_value_init (0),
1774 GNUNET_BANDWIDTH_value_init (0), 1774 GNUNET_BANDWIDTH_value_init (0));
1775 GNUNET_BANDWIDTH_value_init (0));
1776
1777 return; 1775 return;
1778 } 1776 }
1779 1777
@@ -1791,11 +1789,10 @@ bandwidth_changed_cb (void *cls, struct ATS_Address *address)
1791 address->assigned_bw_out); 1789 address->assigned_bw_out);
1792 1790
1793 /* *Notify scheduling clients about suggestion */ 1791 /* *Notify scheduling clients about suggestion */
1794 GAS_scheduling_transmit_address_suggestion (&address->peer, address->plugin, 1792 GAS_scheduling_transmit_address_suggestion (&address->peer,
1795 address->addr, address->addr_len, address->local_address_info, 1793 address->session_id,
1796 address->session_id, address->atsi, address->atsi_count, 1794 GNUNET_BANDWIDTH_value_init (address->assigned_bw_out),
1797 GNUNET_BANDWIDTH_value_init (address->assigned_bw_out), 1795 GNUNET_BANDWIDTH_value_init (address->assigned_bw_in));
1798 GNUNET_BANDWIDTH_value_init (address->assigned_bw_in));
1799 1796
1800 address->last_notified_bw_out = address->assigned_bw_out; 1797 address->last_notified_bw_out = address->assigned_bw_out;
1801 address->last_notified_bw_in = address->assigned_bw_in; 1798 address->last_notified_bw_in = address->assigned_bw_in;