mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-02-22 14:42:40 +01:00
Code Issues Projects Releases Wiki Activity

gossipd: load pending spam node announcements without forgetting previous node announcements

Browse source 
Fixes: #6531
This commit is contained in:
Alex Myers 2023-08-11 11:32:07 -05:00 • committed by Rusty Russell
parent 53dd6cd44a
commit d8d2032ba5
2 changed files with 39 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
gossipd/routing.c
View file

@ -22,6 +22,11 @@
/* 365.25 * 24 * 60 / 10 */ /* 365.25 * 24 * 60 / 10 */
#define BLOCKS_PER_YEAR 52596 #define BLOCKS_PER_YEAR 52596
struct pending_spam_node_announce {
u8 *node_announcement;
u32 index;
};
struct pending_node_announce { struct pending_node_announce {
struct routing_state *rstate; struct routing_state *rstate;
struct node_id nodeid; struct node_id nodeid;
@ -31,6 +36,8 @@ struct pending_node_announce {
u32 index; u32 index;
/* If non-NULL this is peer to credit it with */ /* If non-NULL this is peer to credit it with */
struct node_id *source_peer; struct node_id *source_peer;
/* required for loading gossip store */
struct pending_spam_node_announce spam;
}; };
/* As per the below BOLT #7 quote, we delay forgetting a channel until 12 /* As per the below BOLT #7 quote, we delay forgetting a channel until 12
@ -776,6 +783,8 @@ static void catch_node_announcement(const tal_t *ctx,
pna->index = 0; pna->index = 0;
pna->refcount = 0; pna->refcount = 0;
pna->source_peer = NULL; pna->source_peer = NULL;
pna->spam.node_announcement = NULL;
pna->spam.index = 0;
pending_node_map_add(rstate->pending_node_map, pna); pending_node_map_add(rstate->pending_node_map, pna);
} }
pna->refcount++; pna->refcount++;
@ -805,6 +814,22 @@ static void process_pending_node_announcement(struct routing_state *rstate,
/* Never send this again. */ /* Never send this again. */
pna->node_announcement = tal_free(pna->node_announcement); pna->node_announcement = tal_free(pna->node_announcement);
} }
if (pna->spam.node_announcement) {
SUPERVERBOSE(
"Processing deferred node_announcement for node %s",
type_to_string(pna, struct node_id, nodeid));
/* Can fail it timestamp is now too old */
if (!routing_add_node_announcement(rstate,
pna->spam.node_announcement,
pna->spam.index,
NULL, NULL,
true))
status_unusual("pending node_announcement %s too old?",
tal_hex(tmpctx, pna->spam.node_announcement));
/* Never send this again. */
pna->spam.node_announcement = tal_free(pna->spam.node_announcement);
}
/* We don't need to catch any more node_announcements, since we've /* We don't need to catch any more node_announcements, since we've
* accepted the public channel now. But other pending announcements * accepted the public channel now. But other pending announcements
@ -1821,12 +1846,20 @@ bool routing_add_node_announcement(struct routing_state *rstate,
SUPERVERBOSE("Deferring node_announcement for node %s", SUPERVERBOSE("Deferring node_announcement for node %s",
type_to_string(tmpctx, struct node_id, &node_id)); type_to_string(tmpctx, struct node_id, &node_id));
pna->timestamp = timestamp; /* a pending spam node announcement is possible when loading
pna->index = index; * from the store */
if (index && force_spam_flag) {
tal_free(pna->spam.node_announcement);
pna->spam.node_announcement = tal_dup_talarr(pna, u8, msg);
pna->spam.index = index;
} else {
tal_free(pna->node_announcement); tal_free(pna->node_announcement);
tal_free(pna->source_peer); tal_free(pna->source_peer);
pna->node_announcement = tal_dup_talarr(pna, u8, msg); pna->node_announcement = tal_dup_talarr(pna, u8, msg);
pna->source_peer = tal_dup_or_null(pna, struct node_id, source_peer); pna->source_peer = tal_dup_or_null(pna, struct node_id, source_peer);
pna->timestamp = timestamp;
pna->index = index;
}
return true; return true;
} }

1
tests/test_gossip.py
View file

@ -2385,7 +2385,6 @@ def test_dump_own_gossip(node_factory):
assert expect == [] assert expect == []
@pytest.mark.xfail
@pytest.mark.developer("needs --dev-gossip-time") @pytest.mark.developer("needs --dev-gossip-time")
@unittest.skipIf( @unittest.skipIf(
TEST_NETWORK != 'regtest', TEST_NETWORK != 'regtest',