From 3610b382c6971808aa1988e8af945a7816e7246b Mon Sep 17 00:00:00 2001
From: Aaron Krebs <aaron.krebs@everbase.net>
Date: Tue, 29 Jul 2014 10:27:24 +0200
Subject: [PATCH] Try connections to unreachable nodes more often.

---
 src/net.c | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/net.c b/src/net.c
index 5f50531b..04753355 100644
--- a/src/net.c
+++ b/src/net.c
@@ -162,8 +162,18 @@ static void periodic_handler(event_loop_t *loop, void *data) {
 			int i = 0;
 
 			for splay_each(node_t, n, mesh->nodes) {
-				if(i++ != r)
-					continue;
+				bool trying_unreachable = false;
+
+				if(i++ != r) {
+					if(n->status->reachable) {
+						continue;
+					} else {
+						/* If we see an unreachable node
+						   before node i, try it anyway.
+						*/
+						trying_unreachable = true;
+					}
+				}
 
 				if(n->connection)
 					break;
@@ -185,6 +195,15 @@ static void periodic_handler(event_loop_t *loop, void *data) {
 					outgoing->name = xstrdup(n->name);
 					list_insert_tail(mesh->outgoings, outgoing);
 					setup_outgoing_connection(mesh, outgoing);
+				} else if(trying_unreachable) {
+					/* We're trying an unreachable node instead
+					   of node i. We already have an outgoing
+					   to it. Try the next node rather than
+					   breaking here, to avoid churning on a
+					   connection attempt to the first
+					   unreachable node.
+					*/
+					continue;
 				}
 				break;
 			}
-- 
2.39.2