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

lightningd: handle channel cleanups more explicitly.

Browse Source 
1. Freeing an unconfirmed channel already releases the subd, so don't
   do that explicitly.
2. Use channel->owner to transfer ownership where possible, using
   channel_set_owner() which handles all the cases.

This simplifies the code and makes it more readable, IMHO.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2021-12-28 09:51:09 +10:30
parent 18526a3a5b
commit 90b669857e
6 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lightningd/opening_control.c
View File

@@ -319,9 +319,7 @@ static void opening_funder_start_replied(struct subd *openingd, const u8 *resp,
return;
failed:
subd_release_channel(openingd, fc->uc);
fc->uc->open_daemon = NULL;
/* Frees fc too, and tmpctx */
/* Frees fc too */
tal_free(fc->uc);
}
@@ -414,9 +412,7 @@ static void opening_funder_finished(struct subd *openingd, const u8 *resp,
peer_start_channeld(channel, pps, NULL, false, NULL);
cleanup:
subd_release_channel(openingd, fc->uc);
fc->uc->open_daemon = NULL;
/* Frees fc too, and tmpctx */
/* Frees fc too */
tal_free(fc->uc);
}
@@ -528,8 +524,6 @@ static void opening_fundee_finished(struct subd *openingd,
/* On to normal operation! */
peer_start_channeld(channel, pps, fwd_msg, false, NULL);
subd_release_channel(openingd, uc);
uc->open_daemon = NULL;
tal_free(uc);
return;