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

peer: Wrap the HTLC out destructor in a DB transaction

Browse Source 
Changelog-Fixed: peer: Fixed a crash when a connection is lost outside of a DB transaction
This commit is contained in:
Christian Decker 2021-10-29 18:58:29 +02:00
parent 344579b233
commit 0351940593
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lightningd/peer_htlcs.c
View File

@ -519,6 +519,12 @@ fail:
*/ */
static void destroy_hout_subd_died(struct htlc_out *hout) static void destroy_hout_subd_died(struct htlc_out *hout)
{ {
struct db *db = hout->key.channel->peer->ld->wallet->db;
/* Under some circumstances we may need to start a DB
* transaction and commit it here again. This is the case when
* we're getting called from the destructor chain. */
bool have_tx =
db_in_transaction(db);
log_debug(hout->key.channel->log, log_debug(hout->key.channel->log,
"Failing HTLC %"PRIu64" due to peer death", "Failing HTLC %"PRIu64" due to peer death",
hout->key.id); hout->key.id);
@ -531,8 +537,14 @@ static void destroy_hout_subd_died(struct htlc_out *hout)
assert(hout->hstate == SENT_ADD_HTLC); assert(hout->hstate == SENT_ADD_HTLC);
hout->hstate = RCVD_REMOVE_HTLC; hout->hstate = RCVD_REMOVE_HTLC;
if (!have_tx)
db_begin_transaction(db);
fail_out_htlc(hout, "Outgoing subdaemon died", fail_out_htlc(hout, "Outgoing subdaemon died",
take(towire_temporary_channel_failure(NULL, NULL))); take(towire_temporary_channel_failure(NULL, NULL)));
if (!have_tx)
db_commit_transaction(db);
} }
/* This is where channeld gives us the HTLC id, and also reports if it /* This is where channeld gives us the HTLC id, and also reports if it