mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-02-22 14:42:40 +01:00
Code Issues Projects Releases Wiki Activity

fixup! lightningd: Add tx_abort routine to lightningd

Browse source
This commit is contained in:
Dusty Daemon 2024-02-10 12:40:05 -05:00 • committed by Christian Decker
parent ca5c1250de
commit e72be90606
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/wire_error.c
View file

@ -84,7 +84,7 @@ char *sanitize_error(const tal_t *ctx, const u8 *errmsg,
struct channel_id dummy;
u8 *data;
size_t i;
char *tag;
const char *tag;
if (!channel_id)
channel_id = &dummy;

16
lightningd/channel_control.c
View file

@ -323,6 +323,7 @@ static void handle_splice_abort(struct lightningd *ld,
&inflight->funding->outpoint));
wallet_inflight_del(ld->wallet, channel, inflight);
tal_free(inflight);
}
cc = splice_command_for_chan(ld, channel);
@ -348,10 +349,14 @@ static void handle_splice_abort(struct lightningd *ld,
tal_hex(tmpctx, error));
/* Get connectd to send error and close. */
subd_send_msg(ld->connectd,
take(towire_connectd_peer_final_msg(NULL,
&peer->id,
peer->connectd_counter,
error)));
take(towire_connectd_peer_send_msg(NULL,
&peer->id,
peer->connectd_counter,
error)));
subd_send_msg(ld->connectd,
take(towire_connectd_discard_peer(NULL,
&peer->id,
peer->connectd_counter)));
return;
}
log_debug(channel->log, "made the socket pair");
@ -366,8 +371,7 @@ static void handle_splice_abort(struct lightningd *ld,
&channel->cid)));
subd_send_fd(ld->connectd, fds[1]);
log_info(channel->log, "Sent the peer fd to channeld");
}
else {
} else {
log_info(channel->log, "peer_start_channeld failed");
close(fds[1]);
}