pay: Do not attempt to filter routehints if we can't find outselves

There are a couple of ways this can happen, but we shouldn't crash.

Fixed #4488
Fixes #4533

Changelog-Fixed: pay: Fixed an issue when filtering routehints when we can't find ourselves in the local network view.
This commit is contained in:
Christian Decker
2021-06-03 18:41:57 +02:00
committed by Rusty Russell
parent 67c03c02a0
commit eeba75ca7c

View File

@@ -2332,8 +2332,16 @@ static struct route_info **filter_routehints(struct gossmap *map,
{
const size_t max_hops = ROUTING_MAX_HOPS / 2;
char *mods = tal_strdup(tmpctx, "");
for (size_t i = 0; i < tal_count(hints); i++) {
struct gossmap_node *entrynode, *src;
struct gossmap_node *src = gossmap_find_node(map, p->local_id);
if (src == NULL) {
tal_append_fmt(&mods,
"Could not locate ourselves in the gossip map, "
"leaving routehints untouched. ");
}
for (size_t i = 0; i < tal_count(hints) && src != NULL; i++) {
struct gossmap_node *entrynode;
u32 distance;
/* Trim any routehint > 10 hops */
@@ -2365,8 +2373,6 @@ static struct route_info **filter_routehints(struct gossmap *map,
/* If routehint entrypoint is unreachable there's no
* point in keeping it. */
entrynode = gossmap_find_node(map, &hints[i][0].pubkey);
src = gossmap_find_node(map, p->local_id);
if (entrynode == NULL) {
tal_append_fmt(&mods,
"Removed routehint %zu because "