From ceef61dbbd5bdfd4e1a1dd9d5899d35b2d08e7ba Mon Sep 17 00:00:00 2001 From: Christian Decker Date: Wed, 20 Jun 2018 13:18:33 +0200 Subject: [PATCH] gossip: Pass use_dns option down to gossipd Signed-off-by: Christian Decker --- gossipd/gossip.c | 4 +++- gossipd/gossip_wire.csv | 1 + lightningd/gossip_control.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gossipd/gossip.c b/gossipd/gossip.c index d63c3e164..5906b2837 100644 --- a/gossipd/gossip.c +++ b/gossipd/gossip.c @@ -170,6 +170,8 @@ struct daemon { bool use_proxy_always; char *tor_password; + /* @see lightningd.config.use_dns */ + bool use_dns; }; /* Peers we're trying to reach. */ @@ -2836,7 +2838,7 @@ static struct io_plan *gossip_init(struct daemon_conn *master, &daemon->proposed_listen_announce, daemon->rgb, daemon->alias, &update_channel_interval, &daemon->reconnect, &proxyaddr, &daemon->use_proxy_always, - &dev_allow_localhost, + &dev_allow_localhost, &daemon->use_dns, &daemon->tor_password)) { master_badmsg(WIRE_GOSSIPCTL_INIT, msg); } diff --git a/gossipd/gossip_wire.csv b/gossipd/gossip_wire.csv index 7d2461632..e24358dd5 100644 --- a/gossipd/gossip_wire.csv +++ b/gossipd/gossip_wire.csv @@ -23,6 +23,7 @@ gossipctl_init,,num_tor_proxyaddrs,u16 gossipctl_init,,tor_proxyaddr,num_tor_proxyaddrs*struct wireaddr gossipctl_init,,use_tor_proxy_always,bool gossipctl_init,,dev_allow_localhost,bool +gossipctl_init,,use_dns,bool gossipctl_init,,tor_password,wirestring # Activate the gossip daemon, so others can connect. diff --git a/lightningd/gossip_control.c b/lightningd/gossip_control.c index cd8800096..5137f55b5 100644 --- a/lightningd/gossip_control.c +++ b/lightningd/gossip_control.c @@ -246,7 +246,7 @@ void gossip_init(struct lightningd *ld) listen_announce, ld->rgb, ld->alias, ld->config.channel_update_interval, ld->reconnect, ld->proxyaddr, ld->use_proxy_always || ld->pure_tor_setup, - allow_localhost, + allow_localhost, ld->config.use_dns, ld->tor_service_password ? ld->tor_service_password : ""); subd_send_msg(ld->gossip, msg); }