From b5f737e5632ecacc309bdaddc6b7722929a4f4f9 Mon Sep 17 00:00:00 2001 From: Christian Decker Date: Fri, 24 Nov 2017 15:03:22 +0100 Subject: [PATCH] gossip: Passing alias, color and wireaddrs through to gossipd First step towards `gossipd` managing the `node_announcement`. Signed-off-by: Christian Decker --- gossipd/gossip.c | 8 +++++++- gossipd/gossip_wire.csv | 4 ++++ lightningd/gossip_control.c | 3 ++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/gossipd/gossip.c b/gossipd/gossip.c index 197db965c..b8629c8e8 100644 --- a/gossipd/gossip.c +++ b/gossipd/gossip.c @@ -71,6 +71,10 @@ struct daemon { /* Local and global features to offer to peers. */ u8 *localfeatures, *globalfeatures; + + u8 alias[33]; + u8 rgb[3]; + struct wireaddr *wireaddrs; }; /* Peers we're trying to reach. */ @@ -1111,7 +1115,9 @@ static struct io_plan *gossip_init(struct daemon_conn *master, &daemon->broadcast_interval, &chain_hash, &daemon->id, &port, &daemon->globalfeatures, - &daemon->localfeatures)) { + &daemon->localfeatures, + &daemon->wireaddrs, + daemon->rgb, daemon->alias)) { master_badmsg(WIRE_GOSSIPCTL_INIT, msg); } daemon->rstate = new_routing_state(daemon, &chain_hash, &daemon->id); diff --git a/gossipd/gossip_wire.csv b/gossipd/gossip_wire.csv index a0c59a66f..02f89903f 100644 --- a/gossipd/gossip_wire.csv +++ b/gossipd/gossip_wire.csv @@ -12,6 +12,10 @@ gossipctl_init,,gflen,u16 gossipctl_init,,gfeatures,gflen*u8 gossipctl_init,,lflen,u16 gossipctl_init,,lfeatures,lflen*u8 +gossipctl_init,,num_wireaddrs,u16 +gossipctl_init,,wireaddrs,num_wireaddrs*struct wireaddr +gossipctl_init,,rgb,3*u8 +gossipctl_init,,alias,32*u8 # Master -> gossipd: Optional hint for where to find peer. gossipctl_peer_addrhint,3014 diff --git a/lightningd/gossip_control.c b/lightningd/gossip_control.c index 0d7255ec6..2bc604201 100644 --- a/lightningd/gossip_control.c +++ b/lightningd/gossip_control.c @@ -126,7 +126,8 @@ void gossip_init(struct lightningd *ld) &get_chainparams(ld)->genesis_blockhash, &ld->id, ld->portnum, get_supported_global_features(tmpctx), - get_supported_local_features(tmpctx)); + get_supported_local_features(tmpctx), + ld->wireaddrs, ld->rgb, ld->alias); subd_send_msg(ld->gossip, msg); tal_free(tmpctx); }