connectd: handle alt addr for outbound connection

Author: maxrantil

connectd/connectd.c

@@ -1709,6 +1709,7 @@ static void try_connect_peer(struct daemon *daemon,
 			     const struct node_id *id,
 			     struct wireaddr *gossip_addrs,
 			     struct wireaddr_internal *addrhint STEALS,
+			     struct wireaddr_internal *peer_alt_addr STEALS,
 			     bool dns_fallback,
 			     bool transient)
 {
@@ -1736,6 +1737,11 @@ static void try_connect_peer(struct daemon *daemon,
 			tal_arr_expand(&connect->addrs, *addrhint);
 		}
 
+		/* Update addrs with peer_alt_addrs if provided */
+		for (size_t i = 0; i < tal_count(peer_alt_addr); i++)
+			if (peer_alt_addr[i].u.wireaddr.wireaddr.addrlen > 0)
+				tal_arr_expand(&connect->addrs, peer_alt_addr[i]);
+
 		return;
 	}
 
@@ -1749,10 +1755,15 @@ static void try_connect_peer(struct daemon *daemon,
 
 	/* Tell it to omit the existing hint (if that's a wireaddr itself) */
 	add_gossip_addrs(&addrs, gossip_addrs,
-			 addrhint
-			 && addrhint->itype == ADDR_INTERNAL_WIREADDR
-			 && !addrhint->u.wireaddr.is_websocket
-			 ? &addrhint->u.wireaddr.wireaddr : NULL);
+			addrhint
+			&& addrhint->itype == ADDR_INTERNAL_WIREADDR
+			&& !addrhint->u.wireaddr.is_websocket
+			? &addrhint->u.wireaddr.wireaddr : NULL);
+
+	/* Add all peer_alt_addrs next so they're tried after addrhint by connectd */
+	for (size_t i = 0; i < tal_count(peer_alt_addr); i++)
+		if (peer_alt_addr[i].u.wireaddr.wireaddr.addrlen > 0)
+			tal_arr_expand(&addrs, peer_alt_addr[i]);
 
 	if (tal_count(addrs) == 0) {
 		/* Don't resolve via DNS seed if we're supposed to use proxy. */
@@ -1809,17 +1820,19 @@ static void connect_to_peer(struct daemon *daemon, const u8 *msg)
 {
 	struct node_id id;
 	struct wireaddr_internal *addrhint;
+	struct wireaddr_internal *peer_alt_addr;
 	struct wireaddr *addrs;
 	bool dns_fallback;
 	bool transient;
 
 	if (!fromwire_connectd_connect_to_peer(tmpctx, msg,
 					       &id, &addrs, &addrhint,
-					       &dns_fallback,
+					       &peer_alt_addr, &dns_fallback,
 					       &transient))
 		master_badmsg(WIRE_CONNECTD_CONNECT_TO_PEER, msg);
 
-	try_connect_peer(daemon, &id, addrs, addrhint, dns_fallback, transient);
+	try_connect_peer(daemon, &id, addrs, addrhint,
+			 peer_alt_addr, dns_fallback, transient);
 }
 
 /* lightningd tells us a peer should be disconnected. */

connectd/connectd_wire.csv

@@ -62,6 +62,7 @@ msgdata,connectd_connect_to_peer,id,node_id,
 msgdata,connectd_connect_to_peer,len,u32,
 msgdata,connectd_connect_to_peer,addrs,wireaddr,len
 msgdata,connectd_connect_to_peer,addrhint,?wireaddr_internal,
+msgdata,connectd_connect_to_peer,peer_alt_addr,?wireaddr_internal,
 msgdata,connectd_connect_to_peer,dns_fallback,bool,
 msgdata,connectd_connect_to_peer,transient,bool,
 

lightningd/connect_control.c

@@ -263,6 +263,7 @@ struct delayed_reconnect {
 	struct lightningd *ld;
 	struct node_id id;
 	struct wireaddr_internal *addrhint;
+	struct wireaddr_internal *peer_alt_addr;
 	bool dns_fallback;
 };
 
@@ -304,6 +305,7 @@ static void gossipd_got_addrs(struct subd *subd,
 						     &d->id,
 						     addrs,
 						     d->addrhint,
+						     d->peer_alt_addr,
 						     d->dns_fallback,
 						     transient);
 	subd_send_msg(d->ld->connectd, take(connectmsg));
@@ -332,6 +334,7 @@ static void try_connect(const tal_t *ctx,
 {
 	struct delayed_reconnect *d;
 	struct peer *peer;
+	struct wireaddr_internal *p_alt_addr;
 
 	/* Don't stack, unless this is an instant reconnect */
 	d = delayed_reconnect_map_get(ld->delayed_reconnect_map, id);
@@ -343,10 +346,13 @@ static void try_connect(const tal_t *ctx,
 		tal_free(d);
 	}
 
+	p_alt_addr = wallet_get_alt_addr(ld->wallet, id, false);
+
 	d = tal(ctx, struct delayed_reconnect);
 	d->ld = ld;
 	d->id = *id;
 	d->addrhint = tal_dup_or_null(d, struct wireaddr_internal, addrhint);
+	d->peer_alt_addr = tal_dup_or_null(d, struct wireaddr_internal, p_alt_addr);
 	d->dns_fallback = dns_fallback;
 	delayed_reconnect_map_add(ld->delayed_reconnect_map, d);
 	tal_add_destructor(d, destroy_delayed_reconnect);