diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-02-08 18:13:10 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-02-08 18:13:10 +0000 |
commit | ed8beb3bda5f3b1d2bf31f57f077bf90e40af812 (patch) | |
tree | 4ee276dfc49030a79cd7a8c5b26ab08a6aaffde2 /src/ats/gnunet-ats-solver-eval.c | |
parent | e1669fabbcb9f21c509e03811fe2d8b5b568b15c (diff) | |
download | gnunet-ed8beb3bda5f3b1d2bf31f57f077bf90e40af812.tar.gz gnunet-ed8beb3bda5f3b1d2bf31f57f077bf90e40af812.zip |
changing s_get API to return void instead of address, have plugin use existing mechanism to signal address activation
Diffstat (limited to 'src/ats/gnunet-ats-solver-eval.c')
-rw-r--r-- | src/ats/gnunet-ats-solver-eval.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/src/ats/gnunet-ats-solver-eval.c b/src/ats/gnunet-ats-solver-eval.c index a10d745fd..8cf4b115b 100644 --- a/src/ats/gnunet-ats-solver-eval.c +++ b/src/ats/gnunet-ats-solver-eval.c | |||
@@ -2382,7 +2382,6 @@ static void | |||
2382 | enforce_start_request (struct GNUNET_ATS_TEST_Operation *op) | 2382 | enforce_start_request (struct GNUNET_ATS_TEST_Operation *op) |
2383 | { | 2383 | { |
2384 | struct TestPeer *p; | 2384 | struct TestPeer *p; |
2385 | const struct ATS_Address *res; | ||
2386 | 2385 | ||
2387 | if (NULL == (p = find_peer_by_id (op->peer_id))) | 2386 | if (NULL == (p = find_peer_by_id (op->peer_id))) |
2388 | { | 2387 | { |
@@ -2396,18 +2395,10 @@ enforce_start_request (struct GNUNET_ATS_TEST_Operation *op) | |||
2396 | op->peer_id); | 2395 | op->peer_id); |
2397 | p->is_requested = GNUNET_YES; | 2396 | p->is_requested = GNUNET_YES; |
2398 | 2397 | ||
2399 | res = sh->sf->s_get (sh->sf->cls, &p->peer_id); | 2398 | sh->sf->s_get (sh->sf->cls, &p->peer_id); |
2400 | if (NULL != res) | ||
2401 | { | ||
2402 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Suggested address for peer %u: %llu %llu\n", | ||
2403 | op->peer_id, | ||
2404 | res->assigned_bw_in, | ||
2405 | res->assigned_bw_out); | ||
2406 | if (NULL != l) | ||
2407 | GNUNET_ATS_solver_logging_now (l); | ||
2408 | } | ||
2409 | } | 2399 | } |
2410 | 2400 | ||
2401 | |||
2411 | static void | 2402 | static void |
2412 | enforce_stop_request (struct GNUNET_ATS_TEST_Operation *op) | 2403 | enforce_stop_request (struct GNUNET_ATS_TEST_Operation *op) |
2413 | { | 2404 | { |
@@ -2421,10 +2412,9 @@ enforce_stop_request (struct GNUNET_ATS_TEST_Operation *op) | |||
2421 | return; | 2412 | return; |
2422 | } | 2413 | } |
2423 | 2414 | ||
2424 | 2415 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | |
2425 | 2416 | "Stop requesting address for peer %u\n", | |
2426 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stop requesting address for peer %u\n", | 2417 | op->peer_id); |
2427 | op->peer_id); | ||
2428 | p->is_requested = GNUNET_NO; | 2418 | p->is_requested = GNUNET_NO; |
2429 | p->assigned_bw_in = 0; | 2419 | p->assigned_bw_in = 0; |
2430 | p->assigned_bw_out = 0; | 2420 | p->assigned_bw_out = 0; |