From: Christian Grothoff <christian@grothoff.org>
Date: Mon, 25 Jun 2012 18:31:37 +0000 (+0000)
Subject: -LRN:  gives CONNECT message a priority (stops waiting for ATS to
X-Git-Tag: initial-import-from-subversion-38251~12821
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9876f6551dac194809d05dc9954cf6d1b982415f;p=oweals%2Fgnunet.git

-LRN:  gives CONNECT message a priority (stops waiting for ATS to
provide an address to connect to, and goes straight to checking the
incoming address).
---

diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c
index 918299fef..4f4dbfefa 100644
--- a/src/transport/gnunet-service-transport_neighbours.c
+++ b/src/transport/gnunet-service-transport_neighbours.c
@@ -2048,6 +2048,9 @@ GST_neighbours_handle_connect (const struct GNUNET_MessageHeader *message,
     check_blacklist (peer, ts, address, session, ats, ats_count);
     break;
   case S_INIT_ATS:
+    /* CONNECT message takes priority over us asking ATS for address */
+    n->state = S_CONNECT_RECV_BLACKLIST_INBOUND;
+    /* fallthrough */
   case S_INIT_BLACKLIST:
   case S_CONNECT_SENT:
   case S_CONNECT_RECV_ATS: