correction
git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@200 1a98c847-1fd6-4fd8-948a-caf3550aa51b
This commit is contained in:
parent
97ee01ad89
commit
986b5e257e
3 changed files with 34 additions and 7 deletions
1
main.cpp
1
main.cpp
|
@ -1953,7 +1953,6 @@ string GetWarnings(string strFor)
|
|||
{
|
||||
nPriority = alert.nPriority;
|
||||
strStatusBar = alert.strStatusBar;
|
||||
strRPC = alert.strRPCError;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
10
main.h
10
main.h
|
@ -1754,7 +1754,7 @@ public:
|
|||
// Actions
|
||||
string strComment;
|
||||
string strStatusBar;
|
||||
string strRPCError;
|
||||
string strReserved;
|
||||
|
||||
IMPLEMENT_SERIALIZE
|
||||
(
|
||||
|
@ -1772,7 +1772,7 @@ public:
|
|||
|
||||
READWRITE(strComment);
|
||||
READWRITE(strStatusBar);
|
||||
READWRITE(strRPCError);
|
||||
READWRITE(strReserved);
|
||||
)
|
||||
|
||||
void SetNull()
|
||||
|
@ -1790,7 +1790,7 @@ public:
|
|||
|
||||
strComment.clear();
|
||||
strStatusBar.clear();
|
||||
strRPCError.clear();
|
||||
strReserved.clear();
|
||||
}
|
||||
|
||||
string ToString() const
|
||||
|
@ -1815,7 +1815,6 @@ public:
|
|||
" nPriority = %d\n"
|
||||
" strComment = \"%s\"\n"
|
||||
" strStatusBar = \"%s\"\n"
|
||||
" strRPCError = \"%s\"\n"
|
||||
")\n",
|
||||
nVersion,
|
||||
nRelayUntil,
|
||||
|
@ -1828,8 +1827,7 @@ public:
|
|||
strSetSubVer.c_str(),
|
||||
nPriority,
|
||||
strComment.c_str(),
|
||||
strStatusBar.c_str(),
|
||||
strRPCError.c_str());
|
||||
strStatusBar.c_str());
|
||||
}
|
||||
|
||||
void print() const
|
||||
|
|
30
rpc.cpp
30
rpc.cpp
|
@ -1178,6 +1178,31 @@ pair<string, rpcfn_type> pCallTable[] =
|
|||
};
|
||||
map<string, rpcfn_type> mapCallTable(pCallTable, pCallTable + sizeof(pCallTable)/sizeof(pCallTable[0]));
|
||||
|
||||
string pAllowInSafeMode[] =
|
||||
{
|
||||
"help",
|
||||
"stop",
|
||||
"getblockcount",
|
||||
"getblocknumber",
|
||||
"getconnectioncount",
|
||||
"getdifficulty",
|
||||
"getgenerate",
|
||||
"setgenerate",
|
||||
"gethashespersec",
|
||||
"getinfo",
|
||||
"getnewaddress",
|
||||
"getaccountaddress",
|
||||
"setlabel",
|
||||
"getaccount",
|
||||
"getlabel", // deprecated
|
||||
"getaddressesbyaccount",
|
||||
"getaddressesbylabel", // deprecated
|
||||
"backupwallet",
|
||||
"validateaddress",
|
||||
"getwork",
|
||||
};
|
||||
set<string> setAllowInSafeMode(pAllowInSafeMode, pAllowInSafeMode + sizeof(pAllowInSafeMode)/sizeof(pAllowInSafeMode[0]));
|
||||
|
||||
|
||||
|
||||
|
||||
|
@ -1615,6 +1640,11 @@ void ThreadRPCServer2(void* parg)
|
|||
if (mi == mapCallTable.end())
|
||||
throw JSONRPCError(-32601, "Method not found");
|
||||
|
||||
// Observe safe mode
|
||||
string strWarning = GetWarnings("rpc");
|
||||
if (strWarning != "" && !GetBoolArg("-disablesafemode") && !setAllowInSafeMode.count(strMethod))
|
||||
throw JSONRPCError(-2, string("Safe mode: ") + strWarning);
|
||||
|
||||
try
|
||||
{
|
||||
// Execute
|
||||
|
|
Loading…
Reference in a new issue