mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-18 05:12:45 +01:00
Code Issues Projects Releases Wiki Activity

gossipd: fix gossip send in case query_flags cause no output.

Browse Source 
Fortunately, again, only happens with EXPERIMENTAL_FEATURES.

If the query causes us not to actually send anything, we won't
get called again.  This can validly happen if they only asked for
the node_announcements, for example.

(Found by protocol tests).

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2019-08-27 16:16:02 +09:30 committed by Christian Decker
parent 855dff704c
commit 28185c397c
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gossipd/gossipd.c
View File

@ -1507,8 +1507,10 @@ static void maybe_create_next_scid_reply(struct peer *peer)
* - if bit 0 of `query_flag` is set: * - if bit 0 of `query_flag` is set:
* - MUST reply with a `channel_announcement` * - MUST reply with a `channel_announcement`
*/ */
if (peer->scid_query_flags[i] & SCID_QF_ANNOUNCE) if (peer->scid_query_flags[i] & SCID_QF_ANNOUNCE) {
queue_peer_from_store(peer, &chan->bcast); queue_peer_from_store(peer, &chan->bcast);
sent = true;
}
/* BOLT-61a1365a45cc8b463ddbbe3429d350f8eac787dd #7: /* BOLT-61a1365a45cc8b463ddbbe3429d350f8eac787dd #7:
* - if bit 1 of `query_flag` is set and it has received a * - if bit 1 of `query_flag` is set and it has received a
@ -1520,11 +1522,15 @@ static void maybe_create_next_scid_reply(struct peer *peer)
* - MUST reply with the latest `channel_update` for * - MUST reply with the latest `channel_update` for
* `node_id_2` */ * `node_id_2` */
if ((peer->scid_query_flags[i] & SCID_QF_UPDATE1) if ((peer->scid_query_flags[i] & SCID_QF_UPDATE1)
&& is_halfchan_defined(&chan->half[0])) && is_halfchan_defined(&chan->half[0])) {
queue_peer_from_store(peer, &chan->half[0].bcast); queue_peer_from_store(peer, &chan->half[0].bcast);
sent = true;
}
if ((peer->scid_query_flags[i] & SCID_QF_UPDATE2) if ((peer->scid_query_flags[i] & SCID_QF_UPDATE2)
&& is_halfchan_defined(&chan->half[1])) && is_halfchan_defined(&chan->half[1])) {
queue_peer_from_store(peer, &chan->half[1].bcast); queue_peer_from_store(peer, &chan->half[1].bcast);
sent = true;
}
/* BOLT-61a1365a45cc8b463ddbbe3429d350f8eac787dd #7: /* BOLT-61a1365a45cc8b463ddbbe3429d350f8eac787dd #7:
* - if bit 3 of `query_flag` is set and it has received * - if bit 3 of `query_flag` is set and it has received
@ -1542,7 +1548,6 @@ static void maybe_create_next_scid_reply(struct peer *peer)
if (peer->scid_query_flags[i] & SCID_QF_NODE2) if (peer->scid_query_flags[i] & SCID_QF_NODE2)
tal_arr_expand(&peer->scid_query_nodes, tal_arr_expand(&peer->scid_query_nodes,
chan->nodes[1]->id); chan->nodes[1]->id);
sent = true;
} }
/* Just finished channels? Remove duplicate nodes. */ /* Just finished channels? Remove duplicate nodes. */