aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-22 00:24:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

gossip: don't use hand-coded nested messages for getnodes array.

Browse Source 
We can simply tell it 'nodes' is 'num_nodes*struct gossip_getnodes_entry'.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2017-03-16 14:35:26 +10:30
parent e042198cf8
commit de651bf8fb
3 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lightningd/gossip/gossip.c
View File

@@ -442,20 +442,23 @@ static struct io_plan *release_peer(struct io_conn *conn, struct daemon *daemon,
static struct io_plan *getnodes(struct io_conn *conn, struct daemon *daemon) static struct io_plan *getnodes(struct io_conn *conn, struct daemon *daemon)
{ {
tal_t *tmpctx = tal_tmpctx(daemon); tal_t *tmpctx = tal_tmpctx(daemon);
u8 *out, *reply = tal_arr(tmpctx, u8, 0); u8 *out;
struct node *n; struct node *n;
struct node_map_iter i; struct node_map_iter i;
struct gossip_getnodes_entry *nodes;
size_t node_count = 0;
nodes = tal_arr(tmpctx, struct gossip_getnodes_entry, node_count);
n = node_map_first(daemon->rstate->nodes, &i); n = node_map_first(daemon->rstate->nodes, &i);
while (n != NULL) { while (n != NULL) {
struct gossip_getnodes_entry entry; tal_resize(&nodes, node_count + 1);
entry.nodeid = n->id; nodes[node_count].nodeid = n->id;
entry.hostname = n->hostname; nodes[node_count].hostname = n->hostname;
entry.port = n->port; nodes[node_count].port = n->port;
towire_gossip_getnodes_entry(&reply, &entry); node_count++;
n = node_map_next(daemon->rstate->nodes, &i); n = node_map_next(daemon->rstate->nodes, &i);
} }
out = towire_gossip_getnodes_reply(daemon, reply); out = towire_gossip_getnodes_reply(daemon, nodes);
tal_free(tmpctx); tal_free(tmpctx);
return io_write_wire(conn, take(out), next_req_in, daemon); return io_write_wire(conn, take(out), next_req_in, daemon);
} }

5
lightningd/gossip/gossip_wire.csv
View File

@@ -50,6 +50,7 @@ gossipstatus_peer_nongossip,156,msg,len*u8
# Pass JSON-RPC getnodes call through # Pass JSON-RPC getnodes call through
gossip_getnodes_request,5 gossip_getnodes_request,5
#include <lightningd/gossip_msg.h>
gossip_getnodes_reply,105 gossip_getnodes_reply,105
gossip_getnodes_reply,0,replen,u16 gossip_getnodes_reply,0,num_nodes,u16
gossip_getnodes_reply,2,reply,replen*u8 gossip_getnodes_reply,2,nodes,num_nodes*struct gossip_getnodes_entry
1 # These are fatal.
50
51
52
53
54
55
56

29
lightningd/gossip_control.c
View File

@@ -154,35 +154,32 @@ void gossip_init(struct lightningd *ld)
static bool json_getnodes_reply(struct subd *gossip, const u8 *reply, static bool json_getnodes_reply(struct subd *gossip, const u8 *reply,
struct command *cmd) struct command *cmd)
{ {
u8 *inner; struct gossip_getnodes_entry *nodes;
const u8 *cursor;
size_t max;
struct json_result *response = new_json_result(cmd); struct json_result *response = new_json_result(cmd);
fromwire_gossip_getnodes_reply(reply, reply, NULL, &inner); size_t i;
max = tal_len(inner);
cursor = inner; if (!fromwire_gossip_getnodes_reply(reply, reply, NULL, &nodes)) {
command_fail(cmd, "Malformed gossip_getnodes response");
return true;
}
json_object_start(response, NULL); json_object_start(response, NULL);
json_array_start(response, "nodes"); json_array_start(response, "nodes");
while (max > 0) { for (i = 0; i < tal_count(nodes); i++) {
struct gossip_getnodes_entry *entry = tal(reply, struct gossip_getnodes_entry);
fromwire_gossip_getnodes_entry(&cursor, &max, entry);
json_object_start(response, NULL); json_object_start(response, NULL);
json_add_pubkey(response, "nodeid", &entry->nodeid); json_add_pubkey(response, "nodeid", &nodes[i].nodeid);
if (tal_len(entry->hostname) > 0) { if (tal_len(nodes[i].hostname) > 0) {
json_add_string(response, "hostname", entry->hostname); json_add_string(response, "hostname", nodes[i].hostname);
} else { } else {
json_add_null(response, "hostname"); json_add_null(response, "hostname");
} }
json_add_num(response, "port", entry->port); json_add_num(response, "port", nodes[i].port);
json_object_end(response); json_object_end(response);
tal_free(entry);
} }
json_array_end(response); json_array_end(response);
json_object_end(response); json_object_end(response);
command_success(cmd, response); command_success(cmd, response);
tal_free(reply);
return true; return true;
} }