From fbb7bafc3b9bc6c451c29b1eb2f90e144508256e Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Fri, 28 Sep 2018 09:15:37 +0930 Subject: [PATCH] gossipd: don't include channel in query_short_channel_ids reply if no channel_update. This is consistent: we don't broadcast a channel_announce until we've seen a channel_update, so we probably shouldn't advertise it here. Signed-off-by: Rusty Russell --- gossipd/gossipd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gossipd/gossipd.c b/gossipd/gossipd.c index a8ada5b63..ff68e5c28 100644 --- a/gossipd/gossipd.c +++ b/gossipd/gossipd.c @@ -809,7 +809,7 @@ static bool create_next_scid_reply(struct peer *peer) struct chan *chan; chan = get_channel(rstate, &peer->scid_queries[i]); - if (!chan || !is_chan_public(chan)) + if (!chan || !is_chan_announced(chan)) continue; queue_peer_msg(peer, chan->channel_announce); @@ -841,7 +841,7 @@ static bool create_next_scid_reply(struct peer *peer) const struct node *n; n = get_node(rstate, &peer->scid_query_nodes[i]); - if (!n || !n->node_announcement || !n->node_announcement_index) + if (!n || !n->node_announcement_index) continue; queue_peer_msg(peer, n->node_announcement);