Browse Source

[utils] allow square brackets for ipv6 addresses in bitcoin-cli

-rpcconnect can now accept ipv6 addresses with and without square
brackets.
0.15
John Newbery 7 years ago
parent
commit
5c643241e5
  1. 11
      src/bitcoin-cli.cpp

11
src/bitcoin-cli.cpp

@ -10,6 +10,7 @@
#include "chainparamsbase.h" #include "chainparamsbase.h"
#include "clientversion.h" #include "clientversion.h"
#include "fs.h" #include "fs.h"
#include "utilstrencodings.h"
#include "rpc/client.h" #include "rpc/client.h"
#include "rpc/protocol.h" #include "rpc/protocol.h"
#include "util.h" #include "util.h"
@ -191,8 +192,14 @@ static void http_error_cb(enum evhttp_request_error err, void *ctx)
UniValue CallRPC(const std::string& strMethod, const UniValue& params) UniValue CallRPC(const std::string& strMethod, const UniValue& params)
{ {
std::string host = GetArg("-rpcconnect", DEFAULT_RPCCONNECT); std::string host;
int port = GetArg("-rpcport", BaseParams().RPCPort()); // In preference order, we choose the following for the port:
// 1. -rpcport
// 2. port in -rpcconnect (ie following : in ipv4 or ]: in ipv6)
// 3. default port for chain
int port = BaseParams().RPCPort();
SplitHostPort(GetArg("-rpcconnect", DEFAULT_RPCCONNECT), port, host);
port = GetArg("-rpcport", port);
// Obtain event base // Obtain event base
raii_event_base base = obtain_event_base(); raii_event_base base = obtain_event_base();

Loading…
Cancel
Save