davide/palladum-lightning
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

lightningd: fix race with mutual connect.

Browse Source 
65dccea5bd "pytest: fix flake in test_reconnect_signed" accidentally
introduced a bug, where the connect command may not return.

If we call "connect" while a connection is still being processed
through the peer_connected hooks, we would call peer_channels_cleanup(),
which (if the peer has no channels) would free the peer.

Then when the peer_connected hook returned, it would lookup the peer,
see it was gone, and silently return.  The connect_succeeded() function
was never called, and the connect command never woken.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Changelog-None: bug introduced this release.
This commit is contained in:
Rusty Russell
2025-11-19 10:10:58 +10:30
parent 79e609468a
commit 55d622bd0e
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lightningd/connect_control.c
View File

@@ -219,21 +219,28 @@ static struct command_result *json_connect(struct command *cmd,
/* If we know about peer, see if it's already connected. */
peer = peer_by_id(cmd->ld, &id_addr.id);
if (peer && peer->connected == PEER_CONNECTED) {
log_debug(cmd->ld->log, "Already connected via %s",
fmt_wireaddr_internal(tmpctx,
if (peer) {
switch (peer->connected) {
case PEER_CONNECTED:
log_debug(cmd->ld->log, "Already connected via %s",
fmt_wireaddr_internal(tmpctx,
&peer->addr));
return connect_cmd_succeed(cmd, peer,
peer->connected_incoming,
&peer->addr);
return connect_cmd_succeed(cmd, peer,
peer->connected_incoming,
&peer->addr);
case PEER_DISCONNECTED:
/* When a peer disconnects, we give subds time to clean themselves up
* (this lets connectd ensure they've seen the final messages). But
* now it's going to try to reconnect, we've gotta force them out. */
peer_channels_cleanup(peer);
break;
case PEER_CONNECTING:
/* Just wait until connection finished. Though we still ask connectd to connect,
* it's going to ignore it. */
break;
}
}
/* When a peer disconnects, we give subds time to clean themselves up
* (this lets connectd ensure they've seen the final messages). But
* now it's going to try to reconnect, we've gotta force them out. */
if (peer)
peer_channels_cleanup(peer);
subd_send_msg(cmd->ld->connectd,
take(towire_connectd_connect_to_peer(NULL, &id_addr.id,
addr, true,