diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2012-06-15 15:28:11 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2012-06-15 15:28:11 +0000 |
commit | 5d9f145bbeb7d342dbf0a2e2144d2309a8dd9258 (patch) | |
tree | bb775348b7ff19282a4c819af71ceb5c04ae62ea /src/transport/gnunet-service-transport_neighbours.c | |
parent | 60131038d16e94f837ab47ad2b0383f35c2af305 (diff) | |
download | gnunet-5d9f145bbeb7d342dbf0a2e2144d2309a8dd9258.tar.gz gnunet-5d9f145bbeb7d342dbf0a2e2144d2309a8dd9258.zip |
- fixes
Diffstat (limited to 'src/transport/gnunet-service-transport_neighbours.c')
-rw-r--r-- | src/transport/gnunet-service-transport_neighbours.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c index 2f413290e..44b9338ad 100644 --- a/src/transport/gnunet-service-transport_neighbours.c +++ b/src/transport/gnunet-service-transport_neighbours.c | |||
@@ -2200,6 +2200,11 @@ GST_neighbours_switch_to_address (const struct GNUNET_PeerIdentity *peer, | |||
2200 | address, session, ats, ats_count); | 2200 | address, session, ats, ats_count); |
2201 | break; | 2201 | break; |
2202 | case S_CONNECT_RECV_BLACKLIST_INBOUND: | 2202 | case S_CONNECT_RECV_BLACKLIST_INBOUND: |
2203 | n->timeout = GNUNET_TIME_relative_to_absolute (BLACKLIST_RESPONSE_TIMEOUT); | ||
2204 | check_blacklist (&n->id, | ||
2205 | n->connect_ack_timestamp, | ||
2206 | address, session, ats, ats_count); | ||
2207 | break; | ||
2203 | case S_CONNECT_RECV_BLACKLIST: | 2208 | case S_CONNECT_RECV_BLACKLIST: |
2204 | case S_CONNECT_RECV_ACK: | 2209 | case S_CONNECT_RECV_ACK: |
2205 | /* ATS asks us to switch while we were trying to connect; switch to new | 2210 | /* ATS asks us to switch while we were trying to connect; switch to new |
@@ -2595,6 +2600,11 @@ GST_neighbours_handle_connect_ack (const struct GNUNET_MessageHeader *message, | |||
2595 | ++neighbours_connected, | 2600 | ++neighbours_connected, |
2596 | GNUNET_NO); | 2601 | GNUNET_NO); |
2597 | connect_notify_cb (callback_cls, &n->id, ats, ats_count); | 2602 | connect_notify_cb (callback_cls, &n->id, ats, ats_count); |
2603 | /* Tell ATS that the outbound session we created to send CONNECT was successfull */ | ||
2604 | GNUNET_ATS_address_add(GST_ats, | ||
2605 | n->primary_address.address, | ||
2606 | n->primary_address.session, | ||
2607 | ats, ats_count); | ||
2598 | set_address (&n->primary_address, | 2608 | set_address (&n->primary_address, |
2599 | n->primary_address.address, | 2609 | n->primary_address.address, |
2600 | n->primary_address.session, | 2610 | n->primary_address.session, |
@@ -2712,7 +2722,6 @@ GST_neighbours_session_terminated (const struct GNUNET_PeerIdentity *peer, | |||
2712 | } | 2722 | } |
2713 | 2723 | ||
2714 | n->expect_latency_response = GNUNET_NO; | 2724 | n->expect_latency_response = GNUNET_NO; |
2715 | |||
2716 | switch (n->state) | 2725 | switch (n->state) |
2717 | { | 2726 | { |
2718 | case S_NOT_CONNECTED: | 2727 | case S_NOT_CONNECTED: |