aboutsummaryrefslogtreecommitdiff
path: root/src/transport/gnunet-service-transport_neighbours.c
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2012-06-18 13:00:11 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2012-06-18 13:00:11 +0000
commit3243958ee319d4b444a5aa3fb3950f4bcaeb62e6 (patch)
tree690ed60f04c527040667350f35e18f5f1012a173 /src/transport/gnunet-service-transport_neighbours.c
parentd7988f5089d4bbc81c274e210d9bc8e1b993ef92 (diff)
downloadgnunet-3243958ee319d4b444a5aa3fb3950f4bcaeb62e6.tar.gz
gnunet-3243958ee319d4b444a5aa3fb3950f4bcaeb62e6.zip
- fix
Diffstat (limited to 'src/transport/gnunet-service-transport_neighbours.c')
-rw-r--r--src/transport/gnunet-service-transport_neighbours.c20
1 files changed, 15 insertions, 5 deletions
diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c
index 78e160fa0..c6281f1ba 100644
--- a/src/transport/gnunet-service-transport_neighbours.c
+++ b/src/transport/gnunet-service-transport_neighbours.c
@@ -2154,9 +2154,11 @@ GST_neighbours_switch_to_address (const struct GNUNET_PeerIdentity *peer,
2154 return; 2154 return;
2155 } 2155 }
2156 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 2156 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
2157 "ATS tells us to switch to address '%s' for peer `%s'\n", 2157 "ATS tells us to switch to address '%s' session %p for peer `%s'\n",
2158 (address->address_length != 0) ? GST_plugins_a2s (address): "<inbound>", 2158 (address->address_length != 0) ? GST_plugins_a2s (address): "<inbound>",
2159 session,
2159 GNUNET_i2s (peer)); 2160 GNUNET_i2s (peer));
2161
2160 switch (n->state) 2162 switch (n->state)
2161 { 2163 {
2162 case S_NOT_CONNECTED: 2164 case S_NOT_CONNECTED:
@@ -2602,10 +2604,10 @@ GST_neighbours_handle_connect_ack (const struct GNUNET_MessageHeader *message,
2602 GNUNET_NO); 2604 GNUNET_NO);
2603 connect_notify_cb (callback_cls, &n->id, ats, ats_count); 2605 connect_notify_cb (callback_cls, &n->id, ats, ats_count);
2604 /* Tell ATS that the outbound session we created to send CONNECT was successfull */ 2606 /* Tell ATS that the outbound session we created to send CONNECT was successfull */
2605 GNUNET_ATS_address_add(GST_ats, 2607 GNUNET_ATS_address_add (GST_ats,
2606 n->primary_address.address, 2608 n->primary_address.address,
2607 n->primary_address.session, 2609 n->primary_address.session,
2608 ats, ats_count); 2610 ats, ats_count);
2609 set_address (&n->primary_address, 2611 set_address (&n->primary_address,
2610 n->primary_address.address, 2612 n->primary_address.address,
2611 n->primary_address.session, 2613 n->primary_address.session,
@@ -2650,6 +2652,10 @@ GST_neighbours_handle_connect_ack (const struct GNUNET_MessageHeader *message,
2650 n->state = S_CONNECTED; 2652 n->state = S_CONNECTED;
2651 n->timeout = GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT); 2653 n->timeout = GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
2652 GNUNET_break (GNUNET_NO == n->alternative_address.ats_active); 2654 GNUNET_break (GNUNET_NO == n->alternative_address.ats_active);
2655 GNUNET_ATS_address_add(GST_ats,
2656 n->alternative_address.address,
2657 n->alternative_address.session,
2658 ats, ats_count);
2653 set_address (&n->primary_address, 2659 set_address (&n->primary_address,
2654 n->alternative_address.address, 2660 n->alternative_address.address,
2655 n->alternative_address.session, 2661 n->alternative_address.session,
@@ -2856,6 +2862,10 @@ GST_neighbours_handle_session_ack (const struct GNUNET_MessageHeader *message,
2856 ++neighbours_connected, 2862 ++neighbours_connected,
2857 GNUNET_NO); 2863 GNUNET_NO);
2858 connect_notify_cb (callback_cls, &n->id, ats, ats_count); 2864 connect_notify_cb (callback_cls, &n->id, ats, ats_count);
2865 GNUNET_ATS_address_add(GST_ats,
2866 n->primary_address.address,
2867 n->primary_address.session,
2868 ats, ats_count);
2859 set_address (&n->primary_address, 2869 set_address (&n->primary_address,
2860 n->primary_address.address, 2870 n->primary_address.address,
2861 n->primary_address.session, 2871 n->primary_address.session,