diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2011-11-22 14:21:52 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2011-11-22 14:21:52 +0000 |
commit | d778dbc46a3186140b8947d8614f6e6df9de7718 (patch) | |
tree | b426651751391180976e436afc06ce0a2f90a2d4 /src/transport | |
parent | 91674d5325a591860ccff1e7c269a33e67ed143c (diff) | |
download | gnunet-d778dbc46a3186140b8947d8614f6e6df9de7718.tar.gz gnunet-d778dbc46a3186140b8947d8614f6e6df9de7718.zip |
fix for mantis 1928 in combination with rev 18254
Diffstat (limited to 'src/transport')
-rw-r--r-- | src/transport/gnunet-service-transport_neighbours.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c index e7fa7baf0..22eb45398 100644 --- a/src/transport/gnunet-service-transport_neighbours.c +++ b/src/transport/gnunet-service-transport_neighbours.c | |||
@@ -531,7 +531,6 @@ change (struct NeighbourMapEntry *n, int state, int line) | |||
531 | return GNUNET_SYSERR; | 531 | return GNUNET_SYSERR; |
532 | } | 532 | } |
533 | #if DEBUG_TRANSPORT | 533 | #if DEBUG_TRANSPORT |
534 | |||
535 | { | 534 | { |
536 | char *old = GNUNET_strdup (print_state (n->state)); | 535 | char *old = GNUNET_strdup (print_state (n->state)); |
537 | char *new = GNUNET_strdup (print_state (state)); | 536 | char *new = GNUNET_strdup (print_state (state)); |
@@ -1081,7 +1080,7 @@ ats_suggest_cancel (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1081 | n->ats_suggest = GNUNET_SCHEDULER_NO_TASK; | 1080 | n->ats_suggest = GNUNET_SCHEDULER_NO_TASK; |
1082 | 1081 | ||
1083 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1082 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1084 | " ATS did not suggested address to connect to peer `%s'\n", | 1083 | "ATS did not suggested address to connect to peer `%s'\n", |
1085 | GNUNET_i2s (&n->id)); | 1084 | GNUNET_i2s (&n->id)); |
1086 | 1085 | ||
1087 | disconnect_neighbour (n); | 1086 | disconnect_neighbour (n); |
@@ -2504,6 +2503,7 @@ handle_connect_blacklist_cont (void *cls, | |||
2504 | if (n->state != S_CONNECT_RECV) | 2503 | if (n->state != S_CONNECT_RECV) |
2505 | change_state (n, S_CONNECT_RECV); | 2504 | change_state (n, S_CONNECT_RECV); |
2506 | 2505 | ||
2506 | |||
2507 | /* Ask ATS for an address to connect via that address */ | 2507 | /* Ask ATS for an address to connect via that address */ |
2508 | if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK) | 2508 | if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK) |
2509 | GNUNET_SCHEDULER_cancel (n->ats_suggest); | 2509 | GNUNET_SCHEDULER_cancel (n->ats_suggest); |
@@ -2534,8 +2534,8 @@ GST_neighbours_handle_connect (const struct GNUNET_MessageHeader *message, | |||
2534 | uint32_t ats_count) | 2534 | uint32_t ats_count) |
2535 | { | 2535 | { |
2536 | const struct SessionConnectMessage *scm; | 2536 | const struct SessionConnectMessage *scm; |
2537 | struct NeighbourMapEntry *n; | ||
2538 | struct BlackListCheckContext *bcc = NULL; | 2537 | struct BlackListCheckContext *bcc = NULL; |
2538 | struct NeighbourMapEntry *n; | ||
2539 | 2539 | ||
2540 | #if DEBUG_TRANSPORT | 2540 | #if DEBUG_TRANSPORT |
2541 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 2541 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
@@ -2551,15 +2551,16 @@ GST_neighbours_handle_connect (const struct GNUNET_MessageHeader *message, | |||
2551 | scm = (const struct SessionConnectMessage *) message; | 2551 | scm = (const struct SessionConnectMessage *) message; |
2552 | GNUNET_break_op (ntohl (scm->reserved) == 0); | 2552 | GNUNET_break_op (ntohl (scm->reserved) == 0); |
2553 | 2553 | ||
2554 | GNUNET_ATS_address_update (GST_ats, address, session, ats, ats_count); | ||
2555 | |||
2554 | n = lookup_neighbour (peer); | 2556 | n = lookup_neighbour (peer); |
2555 | if ( (n != NULL) && | 2557 | if ( (n != NULL) && (S_CONNECTED == n->state) ) |
2556 | (S_CONNECTED == n->state) ) | ||
2557 | { | 2558 | { |
2558 | /* connected peer switches addresses */ | 2559 | /* connected peer switches addresses */ |
2559 | GNUNET_ATS_address_update (GST_ats, address, session, ats, ats_count); | 2560 | return; |
2560 | return; | ||
2561 | } | 2561 | } |
2562 | 2562 | ||
2563 | |||
2563 | /* we are not connected to this peer */ | 2564 | /* we are not connected to this peer */ |
2564 | /* do blacklist check */ | 2565 | /* do blacklist check */ |
2565 | bcc = | 2566 | bcc = |