aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-02-06 14:44:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

connectd: also do the shutdown()-close for final_msg sends.

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2022-01-11 11:46:55 +10:30
parent d29795a198
commit 0841e4190b
1 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
connectd/multiplex.c
View File

@@ -142,20 +142,6 @@ void setup_peer_gossip_store(struct peer *peer,
}
}
/* These four function handle subd->peer */
static struct io_plan *after_final_msg(struct io_conn *peer_conn,
struct peer *peer)
{
/* io_close will want to free this itself! */
assert(peer->to_peer == peer_conn);
/* Invert ownership, so io_close frees peer for us */
tal_steal(NULL, peer_conn);
tal_steal(peer_conn, peer);
return io_close(peer_conn);
}
/* We're happy for the kernel to batch update and gossip messages, but a
* commitment message, for example, should be instantly sent. There's no
* great way of doing this, unfortunately.
@@ -415,15 +401,15 @@ static struct io_plan *write_to_peer(struct io_conn *peer_conn,
/* Pop tail of send queue */
msg = msg_dequeue(peer->peer_outq);
/* Nothing to send? */
if (!msg) {
/* Send final once subd is not longer connected */
if (peer->final_msg && !peer->to_subd) {
return encrypt_and_send(peer,
peer->final_msg,
after_final_msg);
}
/* Is it time to send final? */
if (!msg && peer->final_msg && !peer->to_subd) {
/* OK, send this then close. */
msg = peer->final_msg;
peer->final_msg = NULL;
}
/* Still nothing to send? */
if (!msg) {
/* We close once subds are all closed. */
if (!peer->to_subd) {
set_closing_timer(peer, peer_conn);
@@ -641,6 +627,7 @@ struct io_plan *multiplex_peer_setup(struct io_conn *peer_conn,
void multiplex_final_msg(struct peer *peer, const u8 *final_msg TAKES)
{
peer->told_to_close = true;
peer->final_msg = tal_dup_talarr(peer, u8, final_msg);
if (!peer->to_subd)
io_wake(peer->peer_outq);