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

getchannels_req: iterate over channel map rather than nodes.

Browse source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2018-03-02 19:29:16 +10:30 • committed by Christian Decker
parent 5f5d0b3e25
commit a9b1d73148
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
gossipd/gossip.c
View file

@ -1103,32 +1103,37 @@ static void append_half_channel(struct gossip_getchannels_entry **entries,
}
}
static void append_channel(struct gossip_getchannels_entry **entries,
const struct routing_channel *chan)
{
append_half_channel(entries, chan->connections[0]);
append_half_channel(entries, chan->connections[1]);
}
static struct io_plan *getchannels_req(struct io_conn *conn, struct daemon *daemon,
u8 *msg)
{
tal_t *tmpctx = tal_tmpctx(daemon);
u8 *out;
size_t j;
struct gossip_getchannels_entry *entries;
struct node *n;
struct node_map_iter i;
struct routing_channel *chan;
struct short_channel_id *scid;
fromwire_gossip_getchannels_request(msg, msg, &scid);
entries = tal_arr(tmpctx, struct gossip_getchannels_entry, 0);
n = node_map_first(daemon->rstate->nodes, &i);
while (n != NULL) {
for (j=0; j<tal_count(n->channels); j++){
struct routing_channel *chan = n->channels[j];
if (scid && !structeq(scid, &chan->scid)) {
continue;
}
/* FIXME: this avoids printing twice, but better
* to iterate over channels directly */
append_half_channel(&entries, connection_from(n, chan));
if (scid) {
chan = get_channel(daemon->rstate, scid);
if (chan)
append_channel(&entries, chan);
} else {
u64 idx;
for (chan = uintmap_first(&daemon->rstate->channels, &idx);
chan;
chan = uintmap_after(&daemon->rstate->channels, &idx)) {
append_channel(&entries, chan);
}
n = node_map_next(daemon->rstate->nodes, &i);
}
out = towire_gossip_getchannels_reply(daemon, entries);