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

lightningd: check channeld isn't trying to add 0-satoshi incoming HTLCs.

Browse Source 
The peer shouldn't try, and channeld won't try to add it if it does,
but we shouldn't trust it.  And it would make our htlc_in_check() code
assert.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-01-21 13:19:21 +10:30
committed by Christian Decker
parent 3cb03ab784
commit 3ccf88d6c4
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lightningd/peer_htlcs.c
View File

@@ -994,12 +994,27 @@ void peer_sending_commitsig(struct peer *peer, const u8 *msg)
take(towire_channel_sending_commitsig_reply(msg)));
}
static void added_their_htlc(struct peer *peer,
const struct added_htlc *added,
const struct secret *shared_secret)
static bool peer_added_their_htlc(struct peer *peer,
const struct added_htlc *added,
const struct secret *shared_secret)
{
struct htlc_in *hin;
/* BOLT #2:
*
* - receiving an `amount_msat` equal to 0, OR less than its own `htlc_minimum_msat`:
* - SHOULD fail the channel.
*/
if (added->amount_msat == 0
|| added->amount_msat < peer->our_config.htlc_minimum_msat) {
peer_internal_error(peer,
"trying to add HTLC msat %"PRIu64
" but minimum is %"PRIu64,
added->amount_msat,
peer->our_config.htlc_minimum_msat);
return false;
}
/* This stays around even if we fail it immediately: it *is*
* part of the current commitment. */
hin = new_htlc_in(peer, peer, added->id, added->amount_msat,
@@ -1011,7 +1026,7 @@ static void added_their_htlc(struct peer *peer,
log_debug(peer->log, "Adding their HTLC %"PRIu64, added->id);
connect_htlc_in(&peer->ld->htlcs_in, hin);
return true;
}
/* The peer doesn't tell us this separately, but logically it's a separate
@@ -1092,8 +1107,10 @@ void peer_got_commitsig(struct peer *peer, const u8 *msg)
tal_count(failed), tal_count(changed));
/* New HTLCs */
for (i = 0; i < tal_count(added); i++)
added_their_htlc(peer, &added[i], &shared_secrets[i]);
for (i = 0; i < tal_count(added); i++) {
if (!peer_added_their_htlc(peer, &added[i], &shared_secrets[i]))
return;
}
/* Save information now for fulfilled & failed HTLCs */
for (i = 0; i < tal_count(fulfilled); i++) {