vincenzopalazzo
/
rgb-cln
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

refactor: Moving legacy sync method out of routing 

This was the only time we actually reference non-routing structs in
routing, so moving this out should allow us to get it working in the
new subdaemons.
This commit is contained in:
Christian Decker 2017-01-21 15:34:53 +01:00 committed by Rusty Russell
parent 5d10093da3
commit 2c06524165
3 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
daemon/peer.c
View File

@ -702,6 +702,28 @@ static bool open_theiranchor_pkt_in(struct peer *peer, const Pkt *pkt)
return true;
}
/* Dump all known channels and nodes to the peer. Used when a new
* connection was established. */
static void sync_routing_table(struct lightningd_state *dstate, struct peer *peer)
{
struct node *n;
struct node_map_iter it;
int i;
struct node_connection *nc;
for (n = node_map_first(dstate->rstate->nodes, &it); n; n = node_map_next(dstate->rstate->nodes, &it)) {
size_t num_edges = tal_count(n->out);
for (i = 0; i < num_edges; i++) {
nc = n->out[i];
if (nc->channel_announcement)
queue_pkt_nested(peer, WIRE_CHANNEL_ANNOUNCEMENT, nc->channel_announcement);
if (nc->channel_update)
queue_pkt_nested(peer, WIRE_CHANNEL_UPDATE, nc->channel_update);
}
if (n->node_announcement && num_edges > 0)
queue_pkt_nested(peer, WIRE_NODE_ANNOUNCEMENT, n->node_announcement);
}
}
static bool open_wait_pkt_in(struct peer *peer, const Pkt *pkt)
{
Pkt *err;

20
daemon/routing.c
View File

@ -554,26 +554,6 @@ static void json_add_route(struct command *cmd,
command_success(cmd, null_response(cmd));
}
void sync_routing_table(struct lightningd_state *dstate, struct peer *peer)
{
struct node *n;
struct node_map_iter it;
int i;
struct node_connection *nc;
for (n = node_map_first(dstate->rstate->nodes, &it); n; n = node_map_next(dstate->rstate->nodes, &it)) {
size_t num_edges = tal_count(n->out);
for (i = 0; i < num_edges; i++) {
nc = n->out[i];
if (nc->channel_announcement)
queue_pkt_nested(peer, WIRE_CHANNEL_ANNOUNCEMENT, nc->channel_announcement);
if (nc->channel_update)
queue_pkt_nested(peer, WIRE_CHANNEL_UPDATE, nc->channel_update);
}
if (n->node_announcement && num_edges > 0)
queue_pkt_nested(peer, WIRE_NODE_ANNOUNCEMENT, n->node_announcement);
}
}
static const struct json_command dev_add_route_command = {
"dev-add-route",
json_add_route,

4
daemon/routing.h
View File

@ -149,8 +149,4 @@ struct node_map *empty_node_map(const tal_t *ctx);
char *opt_add_route(const char *arg, struct lightningd_state *dstate);
/* Dump all known channels and nodes to the peer. Used when a new connection was established. */
//FIXME(cdecker) Not used in the gossip subdaemon, remove once old daemon is retired
void sync_routing_table(struct lightningd_state *dstate, struct peer *peer);
#endif /* LIGHTNING_DAEMON_ROUTING_H */