mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2024-11-19 09:54:16 +01:00
Code Issues Projects Releases Wiki Activity

peer: fix maximum htlc value when we disconnect.

Browse Source 
If we send an HTLC #1, then get disconnected before a confirm, we will
forget it.  But we've incremented peer->htlc_id_counter, so when we offer
it again we'll make it HTLC #2, which is non-consecutive.

To make this clear, we always start htlc ids at 0 now.  That revealed
the bugs handled in the previous patch.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2016-08-28 12:51:57 +09:30
parent 555a753564
commit b0278d7152
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
daemon/peer.c
View File

@ -1932,7 +1932,15 @@ again:
if (!cstate_add_htlc(peer->remote.staging_cstate, h))
fatal("Could not add HTLC?");
break;
} /* Fall thru */
}
/* Adjust counter to lowest HTLC removed */
if (peer->htlc_id_counter > h->id) {
log_debug(peer->log,
"Lowering htlc_id_counter to %"PRIu64,
h->id);
peer->htlc_id_counter = h->id;
}
/* Fall thru */
case RCVD_ADD_HTLC:
log_debug(peer->log, "Forgetting %s %"PRIu64,
htlc_state_name(h->state), h->id);
@ -1975,6 +1983,11 @@ again:
= tal_free(peer->feechanges[SENT_FEECHANGE]);
peer->feechanges[RCVD_FEECHANGE]
= tal_free(peer->feechanges[RCVD_FEECHANGE]);
/* Make sure our HTLC counter is correct. */
if (peer->htlc_id_counter != 0)
assert(htlc_get(&peer->htlcs, peer->htlc_id_counter-1, LOCAL));
assert(!htlc_get(&peer->htlcs, peer->htlc_id_counter, LOCAL));
}
static void retransmit_pkts(struct peer *peer, s64 ack)
@ -2417,9 +2430,7 @@ static bool peer_first_connected(struct peer *peer,
peer->id = tal_dup(peer, struct pubkey, id);
peer->local.commit_fee_rate = desired_commit_feerate(peer->dstate);
/* Make it different from other node (to catch bugs!), but a
* round number for simple eyeballing. */
peer->htlc_id_counter = pseudorand(1ULL << 32) * 1000;
peer->htlc_id_counter = 0;
/* If we free peer, conn should be closed, but can't be freed
* immediately so don't make peer a parent. */