diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-07-30 15:27:03 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-07-30 15:38:58 +0200 |
| commit | 60dc8e4208058814494b301c355a5996af9517a9 (patch) | |
| tree | 685b3bd681e74621ef154a52b2d70478a54df101 | |
| parent | 1de2992e0786f4de0f0cae10eb27a3b69ec6e3de (diff) | |
Allow -onlynet=onion to be used
Just an alias for onlynet=tor, but matches the new name
of the proxy option -onion= better.
| -rw-r--r-- | src/init.cpp | 2 | ||||
| -rw-r--r-- | src/netbase.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/init.cpp b/src/init.cpp index b84c233b99..a908169cd9 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -248,7 +248,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += " -maxreceivebuffer=<n> " + _("Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)") + "\n"; strUsage += " -maxsendbuffer=<n> " + _("Maximum per-connection send buffer, <n>*1000 bytes (default: 1000)") + "\n"; strUsage += " -onion=<ip:port> " + _("Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)") + "\n"; - strUsage += " -onlynet=<net> " + _("Only connect to nodes in network <net> (IPv4, IPv6 or Tor)") + "\n"; + strUsage += " -onlynet=<net> " + _("Only connect to nodes in network <net> (IPv4, IPv6 or Onion)") + "\n"; strUsage += " -permitbaremultisig " + _("Relay non-P2SH multisig (default: 1)") + "\n"; strUsage += " -port=<port> " + _("Listen for connections on <port> (default: 8333 or testnet: 18333)") + "\n"; strUsage += " -proxy=<ip:port> " + _("Connect through SOCKS5 proxy") + "\n"; diff --git a/src/netbase.cpp b/src/netbase.cpp index af6d11f0e2..f9f4755f7b 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -47,7 +47,7 @@ enum Network ParseNetwork(std::string net) { boost::to_lower(net); if (net == "ipv4") return NET_IPV4; if (net == "ipv6") return NET_IPV6; - if (net == "tor") return NET_TOR; + if (net == "tor" || net == "onion") return NET_TOR; return NET_UNROUTABLE; } |