connected: tell lightningd if we didn't find an address we could even *try* to connect to.

This is important: if it's tor-only and we don't have a proxy, we will fail
to connect, but it's no indication that the node is unreachable.  Same with
IPv6.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

Author: rustyrussell

connectd/connectd.c

@@ -789,11 +789,12 @@ struct io_plan *connection_out(struct io_conn *conn, struct connecting *connect)
  */
 static void connect_failed(struct daemon *daemon,
 			   const struct node_id *id,
+			   bool connect_attempted,
 			   const char *connect_reason,
 			   struct timemono start,
 			   enum jsonrpc_errcode errcode,
 			   const char *errfmt, ...)
-	PRINTF_FMT(6, 7);
+	PRINTF_FMT(7, 8);
 
 static void reconnect(struct important_id *imp)
 {
@@ -865,6 +866,7 @@ void release_one_waiting_connection(struct daemon *daemon, const char *why)
 
 static void connect_failed(struct daemon *daemon,
 			   const struct node_id *id,
+			   bool connect_attempted,
 			   const char *connect_reason,
 			   struct timemono start,
 			   enum jsonrpc_errcode errcode,
@@ -885,7 +887,8 @@ static void connect_failed(struct daemon *daemon,
 	msg = towire_connectd_connect_failed(NULL, id,
 					     connect_reason,
 					     time_to_nsec(timemono_since(start)),
-					     errcode, errmsg);
+					     errcode, errmsg,
+					     connect_attempted);
 	daemon_conn_send(daemon->master, take(msg));
 
 	/* If we're supposed to schedule a reconnect, do so */
@@ -1037,7 +1040,7 @@ static void try_connect_one_addr(struct connecting *connect)
 		struct node_id id = connect->id;
 		const char *errors = tal_steal(tmpctx, connect->errors);
 
-		connect_failed(daemon, &id,
+		connect_failed(daemon, &id, connect->connect_attempted,
 			       connect->reason, connect->start,
 			       CONNECT_ALL_ADDRESSES_FAILED,
 			       "All addresses failed: %s",
@@ -1166,6 +1169,8 @@ static void try_connect_one_addr(struct connecting *connect)
 		goto next;
 	}
 
+	connect->connect_attempted = true;
+
 	/* This creates the new connection using our fd, with the initialization
 	 * function one of the above. */
 	if (use_proxy)
@@ -1872,7 +1877,7 @@ static void try_connect_peer(struct daemon *daemon,
 	/* Still no address?  Fail immediately.  Important ones get
 	 * retried; an address may get gossiped. */
 	if (tal_count(addrs) == 0) {
-		connect_failed(daemon, id, reason, time_mono(),
+		connect_failed(daemon, id, false, reason, time_mono(),
 			       CONNECT_NO_KNOWN_ADDRESS,
 			       "Unable to connect, no address known for peer");
 		return;
@@ -1892,6 +1897,7 @@ static void try_connect_peer(struct daemon *daemon,
 	connect->connstate = "Connection establishment";
 	connect->errors = tal_strdup(connect, "");
 	connect->conn = NULL;
+	connect->connect_attempted = false;
 	connecting_htable_add(daemon->connecting, connect);
 	tal_add_destructor(connect, destroy_connecting);
 

connectd/connectd.h

@@ -214,6 +214,9 @@ struct connecting {
 	/* When did we start? */
 	struct timemono start;
 
+	/* Did we find an address we could attempt to connect to? */
+	bool connect_attempted;
+
 	/* Accumulated errors */
 	char *errors;
 };

connectd/connectd_wire.csv

@@ -73,6 +73,7 @@ msgdata,connectd_connect_failed,connect_reason,wirestring,
 msgdata,connectd_connect_failed,connect_nsec,u64,
 msgdata,connectd_connect_failed,failcode,enum jsonrpc_errcode,
 msgdata,connectd_connect_failed,failreason,wirestring,
+msgdata,connectd_connect_failed,connect_attempted,bool,
 
 # Connectd -> master: we got a peer.
 msgtype,connectd_peer_connected,2002

lightningd/connect_control.c

@@ -257,7 +257,8 @@ static void connect_failed(struct lightningd *ld,
 			   const char *connect_reason,
 			   u64 connect_nsec,
 			   enum jsonrpc_errcode errcode,
-			   const char *errmsg)
+			   const char *errmsg,
+			   bool connect_attempted)
 {
 	struct connect *c;
 
@@ -275,7 +276,8 @@ void connect_failed_disconnect(struct lightningd *ld,
 	connect_failed(ld, id, addrhint,
 		       "", 0,
 		       CONNECT_DISCONNECTED_DURING,
-		       "disconnected during connection");
+		       "disconnected during connection",
+		       false);
 }
 
 static void handle_connect_failed(struct lightningd *ld, const u8 *msg)
@@ -285,15 +287,18 @@ static void handle_connect_failed(struct lightningd *ld, const u8 *msg)
 	char *errmsg;
 	char *connect_reason;
 	u64 nsec;
+	bool connect_attempted;
 
 	if (!fromwire_connectd_connect_failed(tmpctx, msg, &id,
 					      &connect_reason,
 					      &nsec,
-					      &errcode, &errmsg))
+					      &errcode, &errmsg,
+					      &connect_attempted))
 		fatal("Connect gave bad CONNECTD_CONNECT_FAILED message %s",
 		      tal_hex(msg, msg));
 
-	connect_failed(ld, &id, NULL, connect_reason, nsec, errcode, errmsg);
+	connect_failed(ld, &id, NULL, connect_reason, nsec, errcode, errmsg,
+		       connect_attempted);
 }
 
 const char *connect_any_cmd_id(const tal_t *ctx,