aboutsummaryrefslogtreecommitdiff
path: root/src/ats
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2012-03-23 16:45:17 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2012-03-23 16:45:17 +0000
commit34584e4bca53f072fbf8ba471084957bdf842476 (patch)
treee7a14d83d1a6e368b66ba8a40775ced557ef0224 /src/ats
parent23c25488aa4ed08ce2ebb67e9fff031e23b0cb39 (diff)
downloadgnunet-34584e4bca53f072fbf8ba471084957bdf842476.tar.gz
gnunet-34584e4bca53f072fbf8ba471084957bdf842476.zip
- dedup
Diffstat (limited to 'src/ats')
-rw-r--r--src/ats/gnunet-service-ats_addresses.c44
1 files changed, 20 insertions, 24 deletions
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index fb9bad037..c5923a099 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -67,6 +67,23 @@ static unsigned int active_addr_count;
67static int ats_mode; 67static int ats_mode;
68 68
69 69
70static void
71send_bw_notification (struct ATS_Address *aa)
72{
73 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "New bandwidth for peer %s is %u/%u\n",
74 GNUNET_i2s (&aa->peer), ntohl (aa->assigned_bw_in.value__),
75 ntohl (aa->assigned_bw_out.value__));
76 GAS_scheduling_transmit_address_suggestion (&aa->peer, aa->plugin, aa->addr,
77 aa->addr_len, aa->session_id,
78 aa->ats, aa->ats_count,
79 aa->assigned_bw_out,
80 aa->assigned_bw_in);
81 GAS_reservations_set_bandwidth (&aa->peer, aa->assigned_bw_in);
82 GAS_performance_notify_clients (&aa->peer, aa->plugin, aa->addr, aa->addr_len,
83 aa->ats, aa->ats_count, aa->assigned_bw_out,
84 aa->assigned_bw_in);
85}
86
70/** 87/**
71 * Update a bandwidth assignment for a peer. This trivial method currently 88 * Update a bandwidth assignment for a peer. This trivial method currently
72 * simply assigns the same share to all active connections. 89 * simply assigns the same share to all active connections.
@@ -90,18 +107,8 @@ update_bw_simple_it (void *cls, const GNUNET_HashCode * key, void *value)
90 aa->assigned_bw_in.value__ = htonl (wan_quota_in / active_addr_count); 107 aa->assigned_bw_in.value__ = htonl (wan_quota_in / active_addr_count);
91 aa->assigned_bw_out.value__ = htonl (wan_quota_out / active_addr_count); 108 aa->assigned_bw_out.value__ = htonl (wan_quota_out / active_addr_count);
92 109
93 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "New bandwidth for peer %s is %u/%u\n", 110 send_bw_notification (aa);
94 GNUNET_i2s (&aa->peer), ntohl (aa->assigned_bw_in.value__), 111
95 ntohl (aa->assigned_bw_out.value__));
96 GAS_scheduling_transmit_address_suggestion (&aa->peer, aa->plugin, aa->addr,
97 aa->addr_len, aa->session_id,
98 aa->ats, aa->ats_count,
99 aa->assigned_bw_out,
100 aa->assigned_bw_in);
101 GAS_reservations_set_bandwidth (&aa->peer, aa->assigned_bw_in);
102 GAS_performance_notify_clients (&aa->peer, aa->plugin, aa->addr, aa->addr_len,
103 aa->ats, aa->ats_count, aa->assigned_bw_out,
104 aa->assigned_bw_in);
105 return GNUNET_OK; 112 return GNUNET_OK;
106} 113}
107 114
@@ -617,18 +624,7 @@ void request_address_mlp (const struct GNUNET_PeerIdentity *peer)
617 aa->active = GNUNET_YES; 624 aa->active = GNUNET_YES;
618 active_addr_count++; 625 active_addr_count++;
619 626
620 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "New bandwidth for peer %s is %u/%u\n", 627 send_bw_notification (aa);
621 GNUNET_i2s (&aa->peer), ntohl (aa->assigned_bw_in.value__),
622 ntohl (aa->assigned_bw_out.value__));
623 GAS_scheduling_transmit_address_suggestion (&aa->peer, aa->plugin, aa->addr,
624 aa->addr_len, aa->session_id,
625 aa->ats, aa->ats_count,
626 aa->assigned_bw_out,
627 aa->assigned_bw_in);
628 GAS_reservations_set_bandwidth (&aa->peer, aa->assigned_bw_in);
629 GAS_performance_notify_clients (&aa->peer, aa->plugin, aa->addr, aa->addr_len,
630 aa->ats, aa->ats_count, aa->assigned_bw_out,
631 aa->assigned_bw_in);
632 } 628 }
633 else 629 else
634 { 630 {