aboutsummaryrefslogtreecommitdiff
path: root/src/transport/gnunet-service-transport_neighbours.c
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2014-03-26 15:04:29 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2014-03-26 15:04:29 +0000
commit8fc8d917d98848d7eb9ad15942ca6e7c824c7d62 (patch)
tree1a75a7a082f26cf81e68aa7ce1dfb3cd80f568b8 /src/transport/gnunet-service-transport_neighbours.c
parentadbb8b5d9635d110f0ee116efa4d9a22d16dfd71 (diff)
downloadgnunet-8fc8d917d98848d7eb9ad15942ca6e7c824c7d62.tar.gz
gnunet-8fc8d917d98848d7eb9ad15942ca6e7c824c7d62.zip
we do not need this address in neighbours: was already added when CONNECT was received in _transport.c before CONNECT was given to neighbours
Diffstat (limited to 'src/transport/gnunet-service-transport_neighbours.c')
-rw-r--r--src/transport/gnunet-service-transport_neighbours.c18
1 files changed, 2 insertions, 16 deletions
diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c
index a5deca66d..0292b019e 100644
--- a/src/transport/gnunet-service-transport_neighbours.c
+++ b/src/transport/gnunet-service-transport_neighbours.c
@@ -2284,18 +2284,6 @@ handle_connect_blacklist_check_cont (void *cls,
2284 print_ack_state (n->ack_state), 2284 print_ack_state (n->ack_state),
2285 (GNUNET_OK == result) ? "OK" : "FAIL"); 2285 (GNUNET_OK == result) ? "OK" : "FAIL");
2286 2286
2287 if (GNUNET_OK == result)
2288 {
2289 /* Blacklist agreed on connecting to a peer with this address, notify ATS */
2290 GNUNET_log (GNUNET_ERROR_TYPE_INFO,
2291 "Notifying ATS peer's `%s' %s address `%s' session %p\n",
2292 GNUNET_i2s (peer),
2293 (GNUNET_YES == GNUNET_HELLO_address_check_option(bcc->na.address,
2294 GNUNET_HELLO_ADDRESS_INFO_INBOUND)) ? "inbound" : "outbound",
2295 GST_plugins_a2s (bcc->na.address), bcc->na.session);
2296 GST_ats_add_address (bcc->na.address, bcc->na.session, NULL, 0);
2297 }
2298
2299 switch (n->state) 2287 switch (n->state)
2300 { 2288 {
2301 case GNUNET_TRANSPORT_PS_NOT_CONNECTED: 2289 case GNUNET_TRANSPORT_PS_NOT_CONNECTED:
@@ -2508,14 +2496,12 @@ GST_neighbours_handle_connect (const struct GNUNET_MessageHeader *message,
2508 connect_check_blacklist (peer, ts, address, session); 2496 connect_check_blacklist (peer, ts, address, session);
2509 break; 2497 break;
2510 case GNUNET_TRANSPORT_PS_CONNECTED: 2498 case GNUNET_TRANSPORT_PS_CONNECTED:
2511 /* we are already connected and can thus send the ACK immediately; 2499 /* we are already connected and can thus send the ACK immediately */
2512 still, it can never hurt to have an alternative address, so also
2513 tell ATS about it */
2514 GNUNET_assert (NULL != n->primary_address.address); 2500 GNUNET_assert (NULL != n->primary_address.address);
2515 GNUNET_assert (NULL != n->primary_address.session); 2501 GNUNET_assert (NULL != n->primary_address.session);
2516 n->ack_state = ACK_UNDEFINED; 2502 n->ack_state = ACK_UNDEFINED;
2517 send_connect_ack_message (n->primary_address.address, 2503 send_connect_ack_message (n->primary_address.address,
2518 n->primary_address.session, ts); 2504 n->primary_address.session, ts);
2519 connect_check_blacklist (peer, ts, address, session); 2505 connect_check_blacklist (peer, ts, address, session);
2520 break; 2506 break;
2521 case GNUNET_TRANSPORT_PS_RECONNECT_ATS: 2507 case GNUNET_TRANSPORT_PS_RECONNECT_ATS: