From 361a74fcaf3e362d72490e5fa63942f55796e585 Mon Sep 17 00:00:00 2001 From: Josh Rickmar Date: Tue, 6 May 2014 12:50:39 -0500 Subject: [PATCH] Rename listen option to rpclisten. This matches the use of the rpclisten option in btcd to specify the listening interfaces and ports for an RPC server. --- config.go | 2 +- sample-btcwallet.conf | 40 ++++++++++++++++++++-------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/config.go b/config.go index d69438e..eedeb63 100644 --- a/config.go +++ b/config.go @@ -53,7 +53,7 @@ type config struct { Connect string `short:"c" long:"connect" description:"Server and port of btcd instance to connect to (default localhost:18334, mainnet: localhost:8334)"` DebugLevel string `short:"d" long:"debuglevel" description:"Logging level {trace, debug, info, warn, error, critical}"` ConfigFile string `short:"C" long:"configfile" description:"Path to configuration file"` - SvrListeners []string `long:"listen" description:"Listen for RPC/websocket connections on this interface/port (default port: 18332, mainnet: 8332)"` + SvrListeners []string `long:"rpclisten" description:"Listen for RPC/websocket connections on this interface/port (default port: 18332, mainnet: 8332)"` DataDir string `short:"D" long:"datadir" description:"Directory to store wallets and transactions"` Username string `short:"u" long:"username" description:"Username for btcd authorization"` Password string `short:"P" long:"password" default-mask:"-" description:"Password for btcd authorization"` diff --git a/sample-btcwallet.conf b/sample-btcwallet.conf index a70455b..1da076d 100644 --- a/sample-btcwallet.conf +++ b/sample-btcwallet.conf @@ -25,8 +25,8 @@ ; ------------------------------------------------------------------------------ ; Connect via a SOCKS5 proxy. NOTE: Specifying a proxy will disable listening -; for incoming connections unless listen addresses are provided via the 'listen' -; option. +; for incoming connections unless listen addresses are provided via the +; 'rpclisten' option. ; proxy=127.0.0.1:9050 ; proxyuser= ; proxypass= @@ -47,24 +47,24 @@ ; rpccert=~/.btcwallet/rpc.cert ; rpckey=~/.btcwallet/rpc.key -; Specify the interfaces for the RPC server listen on. One listen address per -; line. Multiple listen options may be set in the same configuration, and each -; will be used to listen for connections. NOTE: The default port is modified by -; some options such as 'mainnet', so it is recommended to not specify a port and -; allow a proper default to be chosen unless you have a specific reason to do -; otherwise. -; listen= ; all interfaces on default port -; listen=0.0.0.0 ; all ipv4 interfaces on default port -; listen=:: ; all ipv6 interfaces on default port -; listen=:18332 ; all interfaces on port 18332 -; listen=0.0.0.0:18332 ; all ipv4 interfaces on port 18332 -; listen=[::]:18332 ; all ipv6 interfaces on port 18332 -; listen=127.0.0.1:18332 ; only ipv4 localhost on port 18332 (this is a default) -; listen=[::1]:18332 ; only ipv6 localhost on port 18332 (this is a default) -; listen=127.0.0.1:18337 ; only ipv4 localhost on non-standard port 18337 -; listen=:18337 ; all interfaces on non-standard port 18337 -; listen=0.0.0.0:18337 ; all ipv4 interfaces on non-standard port 18337 -; listen=[::]:18337 ; all ipv6 interfaces on non-standard port 18337 +; Specify the interfaces for the RPC server listen on. One rpclisten address +; per line. Multiple rpclisten options may be set in the same configuration, +; and each will be used to listen for connections. NOTE: The default port is +; modified by some options such as 'mainnet', so it is recommended to not +; specify a port and allow a proper default to be chosen unless you have a +; specific reason to do otherwise. +; rpclisten= ; all interfaces on default port +; rpclisten=0.0.0.0 ; all ipv4 interfaces on default port +; rpclisten=:: ; all ipv6 interfaces on default port +; rpclisten=:18332 ; all interfaces on port 18332 +; rpclisten=0.0.0.0:18332 ; all ipv4 interfaces on port 18332 +; rpclisten=[::]:18332 ; all ipv6 interfaces on port 18332 +; rpclisten=127.0.0.1:18332 ; only ipv4 localhost on port 18332 (this is a default) +; rpclisten=[::1]:18332 ; only ipv6 localhost on port 18332 (this is a default) +; rpclisten=127.0.0.1:18337 ; only ipv4 localhost on non-standard port 18337 +; rpclisten=:18337 ; all interfaces on non-standard port 18337 +; rpclisten=0.0.0.0:18337 ; all ipv4 interfaces on non-standard port 18337 +; rpclisten=[::]:18337 ; all ipv6 interfaces on non-standard port 18337