Browse Source

Create new rpcnet module, and move 'getconnectioncount' RPC to it

miguelfreitas
Jeff Garzik 13 years ago committed by Jeff Garzik
parent
commit
70ab73a008
  1. 1
      bitcoin-qt.pro
  2. 12
      src/bitcoinrpc.cpp
  3. 1
      src/makefile.linux-mingw
  4. 1
      src/makefile.mingw
  5. 1
      src/makefile.osx
  6. 1
      src/makefile.unix
  7. 21
      src/rpcnet.cpp

1
bitcoin-qt.pro

@ -206,6 +206,7 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/qt/walletmodel.cpp \ src/qt/walletmodel.cpp \
src/bitcoinrpc.cpp \ src/bitcoinrpc.cpp \
src/rpcdump.cpp \ src/rpcdump.cpp \
src/rpcnet.cpp \
src/qt/overviewpage.cpp \ src/qt/overviewpage.cpp \
src/qt/csvmodelwriter.cpp \ src/qt/csvmodelwriter.cpp \
src/crypter.cpp \ src/crypter.cpp \

12
src/bitcoinrpc.cpp

@ -46,6 +46,7 @@ static std::string strRPCUserColonPass;
static int64 nWalletUnlockTime; static int64 nWalletUnlockTime;
static CCriticalSection cs_nWalletUnlockTime; static CCriticalSection cs_nWalletUnlockTime;
extern Value getconnectioncount(const Array& params, bool fHelp);
extern Value dumpprivkey(const Array& params, bool fHelp); extern Value dumpprivkey(const Array& params, bool fHelp);
extern Value importprivkey(const Array& params, bool fHelp); extern Value importprivkey(const Array& params, bool fHelp);
@ -456,17 +457,6 @@ Value getblockcount(const Array& params, bool fHelp)
} }
Value getconnectioncount(const Array& params, bool fHelp)
{
if (fHelp || params.size() != 0)
throw runtime_error(
"getconnectioncount\n"
"Returns the number of connections to other nodes.");
return (int)vNodes.size();
}
Value getdifficulty(const Array& params, bool fHelp) Value getdifficulty(const Array& params, bool fHelp)
{ {
if (fHelp || params.size() != 0) if (fHelp || params.size() != 0)

1
src/makefile.linux-mingw

@ -60,6 +60,7 @@ OBJS= \
obj/protocol.o \ obj/protocol.o \
obj/bitcoinrpc.o \ obj/bitcoinrpc.o \
obj/rpcdump.o \ obj/rpcdump.o \
obj/rpcnet.o \
obj/script.o \ obj/script.o \
obj/sync.o \ obj/sync.o \
obj/util.o \ obj/util.o \

1
src/makefile.mingw

@ -57,6 +57,7 @@ OBJS= \
obj/protocol.o \ obj/protocol.o \
obj/bitcoinrpc.o \ obj/bitcoinrpc.o \
obj/rpcdump.o \ obj/rpcdump.o \
obj/rpcnet.o \
obj/script.o \ obj/script.o \
obj/sync.o \ obj/sync.o \
obj/util.o \ obj/util.o \

1
src/makefile.osx vendored

@ -84,6 +84,7 @@ OBJS= \
obj/protocol.o \ obj/protocol.o \
obj/bitcoinrpc.o \ obj/bitcoinrpc.o \
obj/rpcdump.o \ obj/rpcdump.o \
obj/rpcnet.o \
obj/script.o \ obj/script.o \
obj/sync.o \ obj/sync.o \
obj/util.o \ obj/util.o \

1
src/makefile.unix

@ -104,6 +104,7 @@ OBJS= \
obj/protocol.o \ obj/protocol.o \
obj/bitcoinrpc.o \ obj/bitcoinrpc.o \
obj/rpcdump.o \ obj/rpcdump.o \
obj/rpcnet.o \
obj/script.o \ obj/script.o \
obj/sync.o \ obj/sync.o \
obj/util.o \ obj/util.o \

21
src/rpcnet.cpp

@ -0,0 +1,21 @@
// Copyright (c) 2009-2012 Bitcoin Developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "net.h"
#include "bitcoinrpc.h"
using namespace json_spirit;
using namespace std;
Value getconnectioncount(const Array& params, bool fHelp)
{
if (fHelp || params.size() != 0)
throw runtime_error(
"getconnectioncount\n"
"Returns the number of connections to other nodes.");
return (int)vNodes.size();
}
Loading…
Cancel
Save