|
|
|
@ -222,6 +222,7 @@ std::string HelpMessage()
@@ -222,6 +222,7 @@ std::string HelpMessage()
|
|
|
|
|
" -timeout=<n> " + _("Specify connection timeout (in milliseconds)") + "\n" + |
|
|
|
|
" -proxy=<ip:port> " + _("Connect through socks proxy") + "\n" + |
|
|
|
|
" -socks=<n> " + _("Select the version of socks proxy to use (4-5, default: 5)") + "\n" + |
|
|
|
|
" -tor=<ip:port> " + _("Use proxy to reach tor hidden services (default: same as -proxy)") + "\n" |
|
|
|
|
" -dns " + _("Allow DNS lookups for -addnode, -seednode and -connect") + "\n" + |
|
|
|
|
" -port=<port> " + _("Listen for connections on <port> (default: 8333 or testnet: 18333)") + "\n" + |
|
|
|
|
" -maxconnections=<n> " + _("Maintain at most <n> connections to peers (default: 125)") + "\n" + |
|
|
|
@ -229,12 +230,12 @@ std::string HelpMessage()
@@ -229,12 +230,12 @@ std::string HelpMessage()
|
|
|
|
|
" -connect=<ip> " + _("Connect only to the specified node(s)") + "\n" + |
|
|
|
|
" -seednode=<ip> " + _("Connect to a node to retrieve peer addresses, and disconnect") + "\n" + |
|
|
|
|
" -externalip=<ip> " + _("Specify your own public address") + "\n" + |
|
|
|
|
" -onlynet=<net> " + _("Only connect to nodes in network <net> (IPv4 or IPv6)") + "\n" + |
|
|
|
|
" -onlynet=<net> " + _("Only connect to nodes in network <net> (IPv4, IPv6 or Tor)") + "\n" + |
|
|
|
|
" -discover " + _("Discover own IP address (default: 1 when listening and no -externalip)") + "\n" + |
|
|
|
|
" -irc " + _("Find peers using internet relay chat (default: 0)") + "\n" + |
|
|
|
|
" -listen " + _("Accept connections from outside (default: 1 if no -proxy or -connect)") + "\n" + |
|
|
|
|
" -bind=<addr> " + _("Bind to given address. Use [host]:port notation for IPv6") + "\n" + |
|
|
|
|
" -dnsseed " + _("Find peers using DNS lookup (default: 1)") + "\n" + |
|
|
|
|
" -dnsseed " + _("Find peers using DNS lookup (default: 1 unless -connect)") + "\n" + |
|
|
|
|
" -banscore=<n> " + _("Threshold for disconnecting misbehaving peers (default: 100)") + "\n" + |
|
|
|
|
" -bantime=<n> " + _("Number of seconds to keep misbehaving peers from reconnecting (default: 86400)") + "\n" + |
|
|
|
|
" -maxreceivebuffer=<n> " + _("Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)") + "\n" + |
|
|
|
@ -469,8 +470,10 @@ bool AppInit2()
@@ -469,8 +470,10 @@ bool AppInit2()
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
CService addrProxy; |
|
|
|
|
bool fProxy = false; |
|
|
|
|
if (mapArgs.count("-proxy")) { |
|
|
|
|
CService addrProxy = CService(mapArgs["-proxy"], 9050); |
|
|
|
|
addrProxy = CService(mapArgs["-proxy"], 9050); |
|
|
|
|
if (!addrProxy.IsValid()) |
|
|
|
|
return InitError(strprintf(_("Invalid -proxy address: '%s'"), mapArgs["-proxy"].c_str())); |
|
|
|
|
|
|
|
|
@ -483,6 +486,20 @@ bool AppInit2()
@@ -483,6 +486,20 @@ bool AppInit2()
|
|
|
|
|
#endif |
|
|
|
|
SetNameProxy(addrProxy, nSocksVersion); |
|
|
|
|
} |
|
|
|
|
fProxy = true; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// -tor can override normal proxy, -notor disables tor entirely
|
|
|
|
|
if (!(mapArgs.count("-tor") && mapArgs["-tor"] == "0") && (fProxy || mapArgs.count("-tor"))) { |
|
|
|
|
CService addrOnion; |
|
|
|
|
if (!mapArgs.count("-tor")) |
|
|
|
|
addrOnion = addrProxy; |
|
|
|
|
else |
|
|
|
|
addrOnion = CService(mapArgs["-tor"], 9050); |
|
|
|
|
if (!addrOnion.IsValid()) |
|
|
|
|
return InitError(strprintf(_("Invalid -tor address: '%s'"), mapArgs["-tor"].c_str())); |
|
|
|
|
SetProxy(NET_TOR, addrOnion, 5); |
|
|
|
|
SetReachable(NET_TOR); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// see Step 2: parameter interactions for more information about these
|
|
|
|
|