Mercurial > hg > bitcoin
changeset 319:a2c88a77d6ac draft
correction
git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@200 1a98c847-1fd6-4fd8-948a-caf3550aa51b
author | s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b> |
---|---|
date | Sun, 12 Dec 2010 18:38:02 +0000 |
parents | 87b3b19407e4 |
children | a7def0257265 9a662320a97e |
files | main.cpp main.h rpc.cpp |
diffstat | 3 files changed, 34 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/main.cpp +++ b/main.cpp @@ -1953,7 +1953,6 @@ { nPriority = alert.nPriority; strStatusBar = alert.strStatusBar; - strRPC = alert.strRPCError; } } }
--- a/main.h +++ b/main.h @@ -1754,7 +1754,7 @@ // Actions string strComment; string strStatusBar; - string strRPCError; + string strReserved; IMPLEMENT_SERIALIZE ( @@ -1772,7 +1772,7 @@ READWRITE(strComment); READWRITE(strStatusBar); - READWRITE(strRPCError); + READWRITE(strReserved); ) void SetNull() @@ -1790,7 +1790,7 @@ strComment.clear(); strStatusBar.clear(); - strRPCError.clear(); + strReserved.clear(); } string ToString() const @@ -1815,7 +1815,6 @@ " nPriority = %d\n" " strComment = \"%s\"\n" " strStatusBar = \"%s\"\n" - " strRPCError = \"%s\"\n" ")\n", nVersion, nRelayUntil, @@ -1828,8 +1827,7 @@ strSetSubVer.c_str(), nPriority, strComment.c_str(), - strStatusBar.c_str(), - strRPCError.c_str()); + strStatusBar.c_str()); } void print() const
--- a/rpc.cpp +++ b/rpc.cpp @@ -1178,6 +1178,31 @@ }; 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 @@ 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