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

pay: Fix logic of the intereface find_worst_channel

Browse Source
This commit is contained in:
trueptolemy
2019-09-14 16:48:01 +08:00
committed by Christian Decker
parent bdbfbf7e55
commit c737fa6b91
2 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
plugins/pay.c
View File

@@ -494,22 +494,31 @@ static struct command_result *sendpay_error(struct command *cmd,
static const jsmntok_t *find_worst_channel(const char *buf,
const jsmntok_t *route,
const char *fieldname,
u64 final)
const char *fieldname)
{
u64 prev = final, worstval = 0;
const jsmntok_t *worst = NULL, *t;
u64 prev, worstval = 0;
const jsmntok_t *worst = NULL, *t, *t_prev = NULL;
size_t i;
json_for_each_arr(i, t, route) {
u64 val;
json_to_u64(buf, json_get_member(buf, t, fieldname), &val);
if (worst == NULL || val - prev > worstval) {
worst = t;
worstval = val - prev;
/* For the first hop, now we can't know if it's the worst.
* Just store the info and continue. */
if (!i) {
prev = val;
t_prev = t;
continue;
}
if (worst == NULL || prev - val > worstval) {
worst = t_prev;
worstval = prev - val;
}
prev = val;
t_prev = t;
}
return worst;
@@ -606,7 +615,7 @@ static struct command_result *getroute_done(struct command *cmd,
/* Try excluding most fee-charging channel (unless it's in
* routeboost). */
charger = find_worst_channel(buf, t, "msatoshi", pc->msat.millisatoshis); /* Raw: shared function needs u64 */
charger = find_worst_channel(buf, t, "msatoshi");
if (maybe_exclude(pc, buf, charger)) {
return start_pay_attempt(cmd, pc,
"Excluded expensive channel %s",
@@ -633,7 +642,7 @@ static struct command_result *getroute_done(struct command *cmd,
else
tal_free(failed);
delayer = find_worst_channel(buf, t, "delay", pc->final_cltv);
delayer = find_worst_channel(buf, t, "delay");
/* Try excluding most delaying channel (unless it's in
* routeboost). */