From c3a3fbcabf894384269b9d9d634cf6dc135c0aeb Mon Sep 17 00:00:00 2001 From: Dave Collins Date: Wed, 13 Nov 2013 21:16:49 -0600 Subject: [PATCH] Don't bother parsing listeners if disabled. --- server.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/server.go b/server.go index 5a26a9d3..8fbfc384 100644 --- a/server.go +++ b/server.go @@ -815,12 +815,14 @@ func newServer(listenAddrs []string, db btcdb.Db, btcnet btcwire.BitcoinNet) (*s return nil, err } - ipv4Addrs, ipv6Addrs, err := parseListeners(listenAddrs) - if err != nil { - return nil, err - } - listeners := make([]net.Listener, 0, len(ipv4Addrs)+len(ipv6Addrs)) + var listeners []net.Listener if !cfg.DisableListen { + ipv4Addrs, ipv6Addrs, err := parseListeners(listenAddrs) + if err != nil { + return nil, err + } + listeners = make([]net.Listener, 0, len(ipv4Addrs)+len(ipv6Addrs)) + for _, addr := range ipv4Addrs { listener, err := net.Listen("tcp4", addr) if err != nil { @@ -840,6 +842,7 @@ func newServer(listenAddrs []string, db btcdb.Db, btcnet btcwire.BitcoinNet) (*s } listeners = append(listeners, listener) } + if len(listeners) == 0 { return nil, errors.New("No valid listen address") }