mirrors/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-02-24 06:47:44 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1478 from wpaulino/resolve-tor-dns-host

Browse source 
config: only normalize and resolve tor DNS host if it has changed
This commit is contained in:
Olaoluwa Osuntokun 2018-07-03 21:59:49 -05:00 • committed by GitHub
commit 5626fd6c9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config.go
View file

@ -438,6 +438,9 @@ func loadConfig() (*config, error) {
} }
cfg.Tor.SOCKS = socks.String() cfg.Tor.SOCKS = socks.String()
// We'll only attempt to normalize and resolve the DNS host if it hasn't
// changed, as it doesn't need to be done for the default.
if cfg.Tor.DNS != defaultTorDNS {
dns, err := lncfg.ParseAddressString( dns, err := lncfg.ParseAddressString(
cfg.Tor.DNS, strconv.Itoa(defaultTorDNSPort), cfg.Tor.DNS, strconv.Itoa(defaultTorDNSPort),
cfg.net.ResolveTCPAddr, cfg.net.ResolveTCPAddr,
@ -446,6 +449,7 @@ func loadConfig() (*config, error) {
return nil, err return nil, err
} }
cfg.Tor.DNS = dns.String() cfg.Tor.DNS = dns.String()
}
control, err := lncfg.ParseAddressString( control, err := lncfg.ParseAddressString(
cfg.Tor.Control, strconv.Itoa(defaultTorControlPort), cfg.Tor.Control, strconv.Itoa(defaultTorControlPort),