diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2014-03-17 16:20:38 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2014-03-17 16:20:38 +0000 |
commit | 681617ac3ed15e39a6ffec4cca8917d7e1025967 (patch) | |
tree | aecf698a65dc2d0e5ece418ec7b0772d3a4aaa2e /src | |
parent | 9587f52d6d72e7107464fa4cdc863bc64321eb8a (diff) | |
download | gnunet-681617ac3ed15e39a6ffec4cca8917d7e1025967.tar.gz gnunet-681617ac3ed15e39a6ffec4cca8917d7e1025967.zip |
Remove blacklist check after address switch: blacklist check is now performed before switching
Diffstat (limited to 'src')
-rw-r--r-- | src/transport/gnunet-service-transport_neighbours.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c index 3ccd510f7..117cc8869 100644 --- a/src/transport/gnunet-service-transport_neighbours.c +++ b/src/transport/gnunet-service-transport_neighbours.c | |||
@@ -2567,12 +2567,13 @@ switch_address_bl_check_cont (void *cls, | |||
2567 | free_neighbour (n, GNUNET_NO); | 2567 | free_neighbour (n, GNUNET_NO); |
2568 | return; | 2568 | return; |
2569 | case GNUNET_TRANSPORT_PS_INIT_ATS: | 2569 | case GNUNET_TRANSPORT_PS_INIT_ATS: |
2570 | /* We requested an address and ATS suggests one: | ||
2571 | * set primary address and send CONNECT message*/ | ||
2570 | set_primary_address (n, blc_ctx->address, blc_ctx->session, | 2572 | set_primary_address (n, blc_ctx->address, blc_ctx->session, |
2571 | blc_ctx->bandwidth_in, blc_ctx->bandwidth_out, GNUNET_NO); | 2573 | blc_ctx->bandwidth_in, blc_ctx->bandwidth_out, GNUNET_NO); |
2572 | set_state_and_timeout (n, GNUNET_TRANSPORT_PS_INIT_BLACKLIST, | 2574 | set_state_and_timeout (n, GNUNET_TRANSPORT_PS_CONNECT_SENT, |
2573 | GNUNET_TIME_relative_to_absolute (BLACKLIST_RESPONSE_TIMEOUT)); | 2575 | GNUNET_TIME_relative_to_absolute (SETUP_CONNECTION_TIMEOUT)); |
2574 | check_blacklist (&n->id, n->connect_ack_timestamp, | 2576 | send_session_connect (&n->primary_address); |
2575 | blc_ctx->address, blc_ctx->session); | ||
2576 | break; | 2577 | break; |
2577 | case GNUNET_TRANSPORT_PS_INIT_BLACKLIST: | 2578 | case GNUNET_TRANSPORT_PS_INIT_BLACKLIST: |
2578 | /* ATS suggests a different address, switch again */ | 2579 | /* ATS suggests a different address, switch again */ |