diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2012-12-12 13:28:06 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2012-12-12 13:28:06 +0000 |
commit | ae95d2cfa0d571bde89af7b6712c4f348e193232 (patch) | |
tree | 220d444020575597420f9e322e81e2e6c9458367 /src/ats/gnunet-service-ats_scheduling.c | |
parent | 3d8ac9f662a774b08229e38fbe1e460e12aa584c (diff) | |
download | gnunet-ae95d2cfa0d571bde89af7b6712c4f348e193232.tar.gz gnunet-ae95d2cfa0d571bde89af7b6712c4f348e193232.zip |
changes
Diffstat (limited to 'src/ats/gnunet-service-ats_scheduling.c')
-rw-r--r-- | src/ats/gnunet-service-ats_scheduling.c | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/src/ats/gnunet-service-ats_scheduling.c b/src/ats/gnunet-service-ats_scheduling.c index 4526e1286..70009b310 100644 --- a/src/ats/gnunet-service-ats_scheduling.c +++ b/src/ats/gnunet-service-ats_scheduling.c | |||
@@ -171,10 +171,8 @@ GAS_handle_request_address (void *cls, struct GNUNET_SERVER_Client *client, | |||
171 | 171 | ||
172 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", | 172 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", |
173 | "REQUEST_ADDRESS"); | 173 | "REQUEST_ADDRESS"); |
174 | GNUNET_STATISTICS_update (GSA_stats, "# address requests received", 1, | ||
175 | GNUNET_NO); | ||
176 | GNUNET_break (0 == ntohl (msg->reserved)); | 174 | GNUNET_break (0 == ntohl (msg->reserved)); |
177 | GAS_addresses_request_address (&msg->peer); | 175 | GAS_addresses_request_address (address_handle, &msg->peer); |
178 | GNUNET_SERVER_receive_done (client, GNUNET_OK); | 176 | GNUNET_SERVER_receive_done (client, GNUNET_OK); |
179 | } | 177 | } |
180 | 178 | ||
@@ -198,7 +196,7 @@ GAS_handle_request_address_cancel (void *cls, | |||
198 | "REQUEST_ADDRESS_CANCEL"); | 196 | "REQUEST_ADDRESS_CANCEL"); |
199 | GNUNET_break (0 == ntohl (msg->reserved)); | 197 | GNUNET_break (0 == ntohl (msg->reserved)); |
200 | 198 | ||
201 | GAS_addresses_request_address_cancel (&msg->peer); | 199 | GAS_addresses_request_address_cancel (address_handle, &msg->peer); |
202 | 200 | ||
203 | GNUNET_SERVER_receive_done (client, GNUNET_OK); | 201 | GNUNET_SERVER_receive_done (client, GNUNET_OK); |
204 | } | 202 | } |
@@ -220,10 +218,8 @@ GAS_handle_reset_backoff (void *cls, | |||
220 | 218 | ||
221 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", | 219 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", |
222 | "RESET_BACKOFF"); | 220 | "RESET_BACKOFF"); |
223 | GNUNET_STATISTICS_update (GSA_stats, "# backoff reset requests received", 1, | ||
224 | GNUNET_NO); | ||
225 | GNUNET_break (0 == ntohl (msg->reserved)); | 221 | GNUNET_break (0 == ntohl (msg->reserved)); |
226 | GAS_addresses_handle_backoff_reset (&msg->peer); | 222 | GAS_addresses_handle_backoff_reset (address_handle, &msg->peer); |
227 | GNUNET_SERVER_receive_done (client, GNUNET_OK); | 223 | GNUNET_SERVER_receive_done (client, GNUNET_OK); |
228 | } | 224 | } |
229 | 225 | ||
@@ -280,7 +276,7 @@ GAS_handle_address_add (void *cls, struct GNUNET_SERVER_Client *client, | |||
280 | } | 276 | } |
281 | GNUNET_STATISTICS_update (GSA_stats, "# address updates received", 1, | 277 | GNUNET_STATISTICS_update (GSA_stats, "# address updates received", 1, |
282 | GNUNET_NO); | 278 | GNUNET_NO); |
283 | GAS_addresses_add (&m->peer, plugin_name, address, address_length, | 279 | GAS_addresses_add (address_handle, &m->peer, plugin_name, address, address_length, |
284 | ntohl (m->session_id), atsi, ats_count); | 280 | ntohl (m->session_id), atsi, ats_count); |
285 | GNUNET_SERVER_receive_done (client, GNUNET_OK); | 281 | GNUNET_SERVER_receive_done (client, GNUNET_OK); |
286 | } | 282 | } |
@@ -339,7 +335,7 @@ GAS_handle_address_update (void *cls, struct GNUNET_SERVER_Client *client, | |||
339 | } | 335 | } |
340 | GNUNET_STATISTICS_update (GSA_stats, "# address updates received", 1, | 336 | GNUNET_STATISTICS_update (GSA_stats, "# address updates received", 1, |
341 | GNUNET_NO); | 337 | GNUNET_NO); |
342 | GAS_addresses_update (&m->peer, plugin_name, address, address_length, | 338 | GAS_addresses_update (address_handle, &m->peer, plugin_name, address, address_length, |
343 | ntohl (m->session_id), atsi, ats_count); | 339 | ntohl (m->session_id), atsi, ats_count); |
344 | GNUNET_SERVER_receive_done (client, GNUNET_OK); | 340 | GNUNET_SERVER_receive_done (client, GNUNET_OK); |
345 | } | 341 | } |
@@ -395,12 +391,13 @@ GAS_handle_address_in_use (void *cls, struct GNUNET_SERVER_Client *client, | |||
395 | } | 391 | } |
396 | 392 | ||
397 | in_use = ntohs (m->in_use); | 393 | in_use = ntohs (m->in_use); |
398 | res = GAS_addresses_in_use (&m->peer, | 394 | res = GAS_addresses_in_use (address_handle, |
399 | plugin_name, | 395 | &m->peer, |
400 | address, | 396 | plugin_name, |
401 | address_length, | 397 | address, |
402 | ntohl (m->session_id), | 398 | address_length, |
403 | in_use); | 399 | ntohl (m->session_id), |
400 | in_use); | ||
404 | 401 | ||
405 | if (res == GNUNET_OK) | 402 | if (res == GNUNET_OK) |
406 | GNUNET_SERVER_receive_done (client, GNUNET_OK); | 403 | GNUNET_SERVER_receive_done (client, GNUNET_OK); |
@@ -465,7 +462,8 @@ GAS_handle_address_destroyed (void *cls, struct GNUNET_SERVER_Client *client, | |||
465 | return; | 462 | return; |
466 | } | 463 | } |
467 | GNUNET_STATISTICS_update (GSA_stats, "# addresses destroyed", 1, GNUNET_NO); | 464 | GNUNET_STATISTICS_update (GSA_stats, "# addresses destroyed", 1, GNUNET_NO); |
468 | GAS_addresses_destroy (&m->peer, plugin_name, address, address_length, | 465 | GAS_addresses_destroy (address_handle, &m->peer, plugin_name, |
466 | address, address_length, | ||
469 | ntohl (m->session_id)); | 467 | ntohl (m->session_id)); |
470 | if (0 != ntohl (m->session_id)) | 468 | if (0 != ntohl (m->session_id)) |
471 | { | 469 | { |