aboutsummaryrefslogtreecommitdiff
path: root/src/rpcserver.h
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-05-09 17:26:16 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2014-05-09 17:26:42 +0200
commit605d5b55582f00ea8a089fe632cd8a52e951126b (patch)
treec92db0c674fb1adf9f3a8f0c743547af1db59523 /src/rpcserver.h
parent8bcfccbc2de25e3b40d1c222d7c5d9991345a0aa (diff)
parent21bf3d257b88c45e2bb0b47e36e73d7462760c2c (diff)
downloadbitcoin-605d5b55582f00ea8a089fe632cd8a52e951126b.tar.xz
Merge pull request #4102
21bf3d2 Add tests for BoostAsioToCNetAddr (Wladimir J. van der Laan) fdbd707 Remove unused function WildcardMatch (Wladimir J. van der Laan) ee21912 rpc: Use netmasks instead of wildcards for IP address matching (Wladimir J. van der Laan) e16be73 net: Add CSubNet class for subnet matching (Wladimir J. van der Laan) d864275 Use new function parseint32 in SplitHostPort (Wladimir J. van der Laan) 0d4ea1c util: add parseint32 function with strict error reporting (Wladimir J. van der Laan)
Diffstat (limited to 'src/rpcserver.h')
-rw-r--r--src/rpcserver.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/rpcserver.h b/src/rpcserver.h
index 1092c691be..e8cd2cd0fc 100644
--- a/src/rpcserver.h
+++ b/src/rpcserver.h
@@ -19,6 +19,7 @@
#include "json/json_spirit_writer_template.h"
class CBlockIndex;
+class CNetAddr;
/* Start RPC threads */
void StartRPCThreads();
@@ -50,6 +51,9 @@ void RPCTypeCheck(const json_spirit::Object& o,
*/
void RPCRunLater(const std::string& name, boost::function<void(void)> func, int64_t nSeconds);
+//! Convert boost::asio address to CNetAddr
+extern CNetAddr BoostAsioToCNetAddr(boost::asio::ip::address address);
+
typedef json_spirit::Value(*rpcfn_type)(const json_spirit::Array& params, bool fHelp);
class CRPCCommand