diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2012-10-25 11:25:08 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2012-10-25 11:25:08 +0000 |
commit | 00ac4bcc595cf3b7a78fc130881a3078eb24f783 (patch) | |
tree | 7b8a3e4e868694bdcbd4855e24cb626d8da01602 | |
parent | 2959827fcacd160a0e9624d868f419e1530daee3 (diff) | |
download | gnunet-00ac4bcc595cf3b7a78fc130881a3078eb24f783.tar.gz gnunet-00ac4bcc595cf3b7a78fc130881a3078eb24f783.zip |
changes
-rw-r--r-- | src/ats/gnunet-service-ats_addresses.c | 12 | ||||
-rw-r--r-- | src/ats/gnunet-service-ats_addresses.h | 10 | ||||
-rw-r--r-- | src/ats/gnunet-service-ats_performance.c | 14 |
3 files changed, 28 insertions, 8 deletions
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c index 448b9eb20..22afbebb9 100644 --- a/src/ats/gnunet-service-ats_addresses.c +++ b/src/ats/gnunet-service-ats_addresses.c | |||
@@ -1115,7 +1115,13 @@ int peerinfo_it (void *cls, | |||
1115 | struct ATS_Address *addr = (struct ATS_Address *) value; | 1115 | struct ATS_Address *addr = (struct ATS_Address *) value; |
1116 | 1116 | ||
1117 | if (NULL != pi_ctx->it) | 1117 | if (NULL != pi_ctx->it) |
1118 | pi_ctx->it (pi_ctx->it_cls, &addr->peer, addr->plugin); | 1118 | pi_ctx->it (pi_ctx->it_cls, |
1119 | &addr->peer, | ||
1120 | addr->plugin, | ||
1121 | addr->addr, addr->addr_len, | ||
1122 | addr->ats, addr->ats_count, | ||
1123 | addr->assigned_bw_out, | ||
1124 | addr->assigned_bw_in); | ||
1119 | return GNUNET_YES; | 1125 | return GNUNET_YES; |
1120 | } | 1126 | } |
1121 | 1127 | ||
@@ -1123,16 +1129,18 @@ void | |||
1123 | GAS_addresses_get_peer_info (const struct GNUNET_PeerIdentity *peer, GNUNET_ATS_PeerInfo_Iterator pi_it, void *pi_it_cls) | 1129 | GAS_addresses_get_peer_info (const struct GNUNET_PeerIdentity *peer, GNUNET_ATS_PeerInfo_Iterator pi_it, void *pi_it_cls) |
1124 | { | 1130 | { |
1125 | struct PeerInfoIteratorContext pi_ctx; | 1131 | struct PeerInfoIteratorContext pi_ctx; |
1132 | struct GNUNET_BANDWIDTH_Value32NBO zero_bw; | ||
1126 | GNUNET_assert (NULL != peer); | 1133 | GNUNET_assert (NULL != peer); |
1127 | GNUNET_assert (NULL != addresses); | 1134 | GNUNET_assert (NULL != addresses); |
1128 | 1135 | ||
1136 | zero_bw = GNUNET_BANDWIDTH_value_init (0); | ||
1129 | pi_ctx.it = pi_it; | 1137 | pi_ctx.it = pi_it; |
1130 | pi_ctx.it_cls = pi_it_cls; | 1138 | pi_ctx.it_cls = pi_it_cls; |
1131 | 1139 | ||
1132 | GNUNET_CONTAINER_multihashmap_get_multiple (addresses, &peer->hashPubKey, &peerinfo_it, &pi_ctx); | 1140 | GNUNET_CONTAINER_multihashmap_get_multiple (addresses, &peer->hashPubKey, &peerinfo_it, &pi_ctx); |
1133 | 1141 | ||
1134 | if (NULL != pi_it) | 1142 | if (NULL != pi_it) |
1135 | pi_it (pi_it_cls, NULL, NULL); | 1143 | pi_it (pi_it_cls, NULL, NULL, NULL, 0, NULL, 0, zero_bw, zero_bw); |
1136 | 1144 | ||
1137 | } | 1145 | } |
1138 | 1146 | ||
diff --git a/src/ats/gnunet-service-ats_addresses.h b/src/ats/gnunet-service-ats_addresses.h index 4c64239be..d6b5a72ee 100644 --- a/src/ats/gnunet-service-ats_addresses.h +++ b/src/ats/gnunet-service-ats_addresses.h | |||
@@ -172,8 +172,14 @@ void | |||
172 | GAS_addresses_iterate_peers (GNUNET_ATS_Peer_Iterator p_it, void *cls); | 172 | GAS_addresses_iterate_peers (GNUNET_ATS_Peer_Iterator p_it, void *cls); |
173 | 173 | ||
174 | typedef void (*GNUNET_ATS_PeerInfo_Iterator) (void *cls, | 174 | typedef void (*GNUNET_ATS_PeerInfo_Iterator) (void *cls, |
175 | const struct GNUNET_PeerIdentity *id, | 175 | const struct GNUNET_PeerIdentity *id, |
176 | const char *plugin); | 176 | const char *plugin_name, |
177 | const void *plugin_addr, size_t plugin_addr_len, | ||
178 | const struct GNUNET_ATS_Information *atsi, | ||
179 | uint32_t atsi_count, | ||
180 | struct GNUNET_BANDWIDTH_Value32NBO | ||
181 | bandwidth_out, | ||
182 | struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in); | ||
177 | 183 | ||
178 | void | 184 | void |
179 | GAS_addresses_get_peer_info (const struct GNUNET_PeerIdentity *peer, GNUNET_ATS_PeerInfo_Iterator pi_it, void *pi_it_cls); | 185 | GAS_addresses_get_peer_info (const struct GNUNET_PeerIdentity *peer, GNUNET_ATS_PeerInfo_Iterator pi_it, void *pi_it_cls); |
diff --git a/src/ats/gnunet-service-ats_performance.c b/src/ats/gnunet-service-ats_performance.c index a4b50513a..5bc4b9fe2 100644 --- a/src/ats/gnunet-service-ats_performance.c +++ b/src/ats/gnunet-service-ats_performance.c | |||
@@ -93,19 +93,25 @@ find_client (struct GNUNET_SERVER_Client *client) | |||
93 | return NULL; | 93 | return NULL; |
94 | } | 94 | } |
95 | 95 | ||
96 | |||
97 | static void | 96 | static void |
98 | peerinfo_it (void *cls, | 97 | peerinfo_it (void *cls, |
99 | const struct GNUNET_PeerIdentity *id, | 98 | const struct GNUNET_PeerIdentity *id, |
100 | const char *plugin) | 99 | const char *plugin_name, |
100 | const void *plugin_addr, size_t plugin_addr_len, | ||
101 | const struct GNUNET_ATS_Information *atsi, | ||
102 | uint32_t atsi_count, | ||
103 | struct GNUNET_BANDWIDTH_Value32NBO | ||
104 | bandwidth_out, | ||
105 | struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in) | ||
101 | { | 106 | { |
102 | struct PerformanceClient *pc = cls; | 107 | struct PerformanceClient *pc = cls; |
103 | GNUNET_assert (NULL != pc); | 108 | GNUNET_assert (NULL != pc); |
104 | if (NULL != id) | 109 | if (NULL != id) |
105 | { | 110 | { |
106 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Callback for peer `%s' plugin `%s'\n", GNUNET_i2s (id), plugin); | 111 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Callback for peer `%s' plugin `%s' BW out %llu, BW in %llu \n", |
112 | GNUNET_i2s (id), | ||
113 | plugin_name, ntohl (bandwidth_out.value__), ntohl (bandwidth_in.value__)); | ||
107 | /* TODO: Notify client here! */ | 114 | /* TODO: Notify client here! */ |
108 | //GNUNET_break (0); | ||
109 | } | 115 | } |
110 | 116 | ||
111 | } | 117 | } |