aboutsummaryrefslogtreecommitdiff
path: root/rpc.cpp
diff options
context:
space:
mode:
authorgavinandresen <gavinandresen@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2010-12-03 19:38:09 +0000
committergavinandresen <gavinandresen@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2010-12-03 19:38:09 +0000
commitbdde31d787c4fe2da8e9fb168abbd22af2c27442 (patch)
tree46005f6e32c45217699a84a4ed3b8a665359a0bb /rpc.cpp
parentbfd471f53e14c4218ae7a1544beb7f1de3e695b2 (diff)
downloadbitcoin-bdde31d787c4fe2da8e9fb168abbd22af2c27442.tar.xz
All boolean options/flags now work the same way.
git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@194 1a98c847-1fd6-4fd8-948a-caf3550aa51b
Diffstat (limited to 'rpc.cpp')
-rw-r--r--rpc.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/rpc.cpp b/rpc.cpp
index 0d00f4cc83..b9ed61de73 100644
--- a/rpc.cpp
+++ b/rpc.cpp
@@ -1525,7 +1525,7 @@ void ThreadRPCServer2(void* parg)
return;
}
- bool fUseSSL = (mapArgs.count("-rpcssl") > 0);
+ bool fUseSSL = GetBoolArg("-rpcssl");
asio::ip::address bindAddress = mapArgs.count("-rpcallowip") ? asio::ip::address_v4::any() : asio::ip::address_v4::loopback();
asio::io_service io_service;
@@ -1552,7 +1552,7 @@ void ThreadRPCServer2(void* parg)
}
#else
if (fUseSSL)
- throw runtime_error("-rpcssl=true, but bitcoin compiled without full openssl libraries.");
+ throw runtime_error("-rpcssl=1, but bitcoin compiled without full openssl libraries.");
#endif
loop
@@ -1642,7 +1642,7 @@ void ThreadRPCServer2(void* parg)
// Observe safe mode
string strWarning = GetWarnings("rpc");
- if (strWarning != "" && !mapArgs.count("-disablesafemode") && !setAllowInSafeMode.count(strMethod))
+ if (strWarning != "" && !GetBoolArg("-disablesafemode") && !setAllowInSafeMode.count(strMethod))
throw JSONRPCError(-2, string("Safe mode: ") + strWarning);
try
@@ -1692,7 +1692,7 @@ Object CallRPC(const string& strMethod, const Array& params)
GetConfigFile().c_str()));
// Connect to localhost
- bool fUseSSL = (mapArgs.count("-rpcssl") > 0);
+ bool fUseSSL = GetBoolArg("-rpcssl");
#ifdef USE_SSL
asio::io_service io_service;
ssl::context context(io_service, ssl::context::sslv23);
@@ -1704,7 +1704,7 @@ Object CallRPC(const string& strMethod, const Array& params)
throw runtime_error("couldn't connect to server");
#else
if (fUseSSL)
- throw runtime_error("-rpcssl=true, but bitcoin compiled without full openssl libraries.");
+ throw runtime_error("-rpcssl=1, but bitcoin compiled without full openssl libraries.");
ip::tcp::iostream stream(GetArg("-rpcconnect", "127.0.0.1"), GetArg("-rpcport", "8332"));
if (stream.fail())