aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-05 23:24:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

lightningd: move notification of disconnect into when we hear from connectd.

Browse Source 
Simpler, and closes a potential race.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2022-03-23 06:56:30 +10:30
parent deecedb033
commit 77b1087cdf
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lightningd/dual_open_control.c
View File

@@ -46,8 +46,6 @@ static void channel_disconnect(struct channel *channel,
log_(channel->log, level, NULL, false, "%s", desc);
channel_cleanup_commands(channel, desc);
notify_disconnect(channel->peer->ld, &channel->peer->id);
if (!reconnect)
channel_set_owner(channel, NULL);
else

1
lightningd/opening_common.c
View File

@@ -110,7 +110,6 @@ void uncommitted_channel_disconnect(struct uncommitted_channel *uc,
subd_send_msg(uc->peer->ld->connectd, msg);
if (uc->fc && uc->fc->cmd)
was_pending(command_fail(uc->fc->cmd, LIGHTNINGD, "%s", desc));
notify_disconnect(uc->peer->ld, &uc->peer->id);
}

5
lightningd/peer_control.c
View File

@@ -293,8 +293,6 @@ void channel_errmsg(struct channel *channel,
bool warning,
const u8 *err_for_them)
{
notify_disconnect(channel->peer->ld, &channel->peer->id);
/* Clean up any in-progress open attempts */
channel_cleanup_commands(channel, desc);
@@ -1267,6 +1265,9 @@ void peer_disconnect_done(struct lightningd *ld, const u8 *msg)
if (p)
p->is_connected = false;
/* Fire off plugin notifications */
notify_disconnect(ld, &id);
/* Wake any disconnect commands (removes self from list) */
list_for_each_safe(&ld->disconnect_commands, i, next, list) {
if (!node_id_eq(&i->id, &id))