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

daemon/htlc: including routing information.

Browse Source 
This is the logical place for it to belong: with the HTLC.  For the manually-created
HTLCs, we create a simple one-hop route.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2016-06-30 09:08:10 +09:30
parent 4902907628
commit bf3acfab62
5 changed files with 61 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
funding.c
View File

@@ -214,9 +214,11 @@ bool force_fee(struct channel_state *cstate, uint64_t fee)
struct channel_htlc *funding_add_htlc(struct channel_state *cstate,
u32 msatoshis,
const struct abs_locktime *expiry,
const struct sha256 *rhash, uint64_t id,
const struct sha256 *rhash,
uint64_t id,
const u8 *routing,
size_t routing_len,
enum channel_side side)
{
size_t n, nondust;
struct channel_oneside *creator, *recipient;
@@ -240,6 +242,8 @@ struct channel_htlc *funding_add_htlc(struct channel_state *cstate,
creator->htlcs[n].expiry = *expiry;
creator->htlcs[n].rhash = *rhash;
creator->htlcs[n].id = id;
creator->htlcs[n].routing = tal_dup_arr(cstate, u8, routing,
routing_len, 0);
memcheck(&creator->htlcs[n].msatoshis,
sizeof(creator->htlcs[n].msatoshis));
memcheck(&creator->htlcs[n].rhash, sizeof(creator->htlcs[n].rhash));
@@ -276,6 +280,7 @@ static void remove_htlc(struct channel_state *cstate,
abort();
/* Actually remove the HTLC. */
tal_free(htlc->routing);
memmove(htlc, htlc + 1, (end - htlc - 1) * sizeof(*htlc));
tal_resize(&cstate->side[creator].htlcs, n-1);
cstate->changes++;
@@ -325,11 +330,19 @@ struct channel_state *copy_funding(const tal_t *ctx,
const struct channel_state *cstate)
{
struct channel_state *cs = tal_dup(ctx, struct channel_state, cstate);
size_t i;
size_t i, j;
for (i = 0; i < ARRAY_SIZE(cs->side); i++)
for (i = 0; i < ARRAY_SIZE(cs->side); i++) {
cs->side[i].htlcs = tal_dup_arr(cs, struct channel_htlc,
cs->side[i].htlcs,
tal_count(cs->side[i].htlcs), 0);
for (j = 0; j < tal_count(cs->side[i].htlcs); j++) {
struct channel_htlc *h = &cs->side[i].htlcs[j];
h->routing = tal_dup_arr(cs, u8,
h->routing,
tal_count(h->routing),
0);
}
}
return cs;
}