aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-02-23 15:04:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

gossip: Pass use_dns option down to gossipd

Browse Source 
Signed-off-by: Christian Decker <decker.christian@gmail.com>
This commit is contained in:
Christian Decker
2018-06-20 13:18:33 +02:00
parent 1bfa02d877
commit ceef61dbbd
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gossipd/gossip.c
View File

@@ -170,6 +170,8 @@ struct daemon {
bool use_proxy_always; bool use_proxy_always;
char *tor_password; char *tor_password;
/* @see lightningd.config.use_dns */
bool use_dns;
}; };
/* Peers we're trying to reach. */ /* 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->proposed_listen_announce, daemon->rgb,
daemon->alias, &update_channel_interval, &daemon->reconnect, daemon->alias, &update_channel_interval, &daemon->reconnect,
&proxyaddr, &daemon->use_proxy_always, &proxyaddr, &daemon->use_proxy_always,
&dev_allow_localhost, &dev_allow_localhost, &daemon->use_dns,
&daemon->tor_password)) { &daemon->tor_password)) {
master_badmsg(WIRE_GOSSIPCTL_INIT, msg); master_badmsg(WIRE_GOSSIPCTL_INIT, msg);
} }

1
gossipd/gossip_wire.csv
View File

@@ -23,6 +23,7 @@ gossipctl_init,,num_tor_proxyaddrs,u16
gossipctl_init,,tor_proxyaddr,num_tor_proxyaddrs*struct wireaddr gossipctl_init,,tor_proxyaddr,num_tor_proxyaddrs*struct wireaddr
gossipctl_init,,use_tor_proxy_always,bool gossipctl_init,,use_tor_proxy_always,bool
gossipctl_init,,dev_allow_localhost,bool gossipctl_init,,dev_allow_localhost,bool
gossipctl_init,,use_dns,bool
gossipctl_init,,tor_password,wirestring gossipctl_init,,tor_password,wirestring
# Activate the gossip daemon, so others can connect. # Activate the gossip daemon, so others can connect.
1 #include <common/cryptomsg.h>
23 gossipctl_init,,use_tor_proxy_always,bool
24 gossipctl_init,,dev_allow_localhost,bool
25 gossipctl_init,,tor_password,wirestring gossipctl_init,,use_dns,bool
26 gossipctl_init,,tor_password,wirestring
27 # Activate the gossip daemon, so others can connect.
28 gossipctl_activate,3025
29 # Do we listen?

2
lightningd/gossip_control.c
View File

@@ -246,7 +246,7 @@ void gossip_init(struct lightningd *ld)
listen_announce, ld->rgb, listen_announce, ld->rgb,
ld->alias, ld->config.channel_update_interval, ld->reconnect, ld->alias, ld->config.channel_update_interval, ld->reconnect,
ld->proxyaddr, ld->use_proxy_always || ld->pure_tor_setup, 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 : ""); ld->tor_service_password ? ld->tor_service_password : "");
subd_send_msg(ld->gossip, msg); subd_send_msg(ld->gossip, msg);
} }