mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2024-11-19 18:11:28 +01:00
Code Issues Projects Releases Wiki Activity

connectd: clean up the channel stuffs when we get a reconnect

Browse Source 
If they've disconnected/reconnected we need to terminate all the
inflight stuff, plus go ahead and call 'disconnect' plugin trigger etc.
This commit is contained in:
niftynei 2021-03-05 12:39:05 -06:00 committed by Rusty Russell
parent 97e64915c5
commit 8cc2919884
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lightningd/connect_control.c
View File

@ -283,8 +283,10 @@ static void peer_please_disconnect(struct lightningd *ld, const u8 *msg)
c = active_channel_by_id(ld, &id, &uc); c = active_channel_by_id(ld, &id, &uc);
if (uc) if (uc)
kill_uncommitted_channel(uc, "Reconnected"); kill_uncommitted_channel(uc, "Reconnected");
else if (c) else if (c) {
channel_cleanup_commands(c, "Reconnected");
channel_fail_reconnect(c, "Reconnected"); channel_fail_reconnect(c, "Reconnected");
}
#if EXPERIMENTAL_FEATURES #if EXPERIMENTAL_FEATURES
else { else {
/* v2 has unsaved channels, not uncommitted_chans */ /* v2 has unsaved channels, not uncommitted_chans */

7
lightningd/dual_open_control.c
View File

@ -82,11 +82,12 @@ void channel_close_conn(struct channel *channel, const char *why)
channel_disconnect(channel, LOG_INFORM, false, why); channel_disconnect(channel, LOG_INFORM, false, why);
} }
static void channel_close_reconn(struct channel *channel, const char *why) void channel_close_reconn(struct channel *channel, const char *why)
{ {
/* Close dualopend */ /* Close the daemon */
if (channel->owner) { if (channel->owner) {
log_info(channel->log, "Killing dualopend: %s", why); log_info(channel->log, "Killing %s: %s",
channel->owner->name, why);
subd_release_channel(channel->owner, channel); subd_release_channel(channel->owner, channel);
channel->owner = NULL; channel->owner = NULL;

3
lightningd/dual_open_control.h
View File

@ -23,6 +23,9 @@ void dualopen_tell_depth(struct subd *dualopend,
void channel_close_conn(struct channel *channel, void channel_close_conn(struct channel *channel,
const char *why); const char *why);
void channel_close_reconn(struct channel *channel,
const char *why);
void json_add_unsaved_channel(struct json_stream *response, void json_add_unsaved_channel(struct json_stream *response,
const struct channel *channel); const struct channel *channel);
#endif /* LIGHTNING_LIGHTNINGD_DUAL_OPEN_CONTROL_H */ #endif /* LIGHTNING_LIGHTNINGD_DUAL_OPEN_CONTROL_H */