diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/net.cpp | 6 | ||||
| -rw-r--r-- | src/qt/guiutil.cpp | 3 | ||||
| -rw-r--r-- | src/rpcmining.cpp | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/src/net.cpp b/src/net.cpp index ce5cd29de..e8df36308 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -995,10 +995,14 @@ void ThreadMapPort() #ifndef UPNPDISCOVER_SUCCESS /* miniupnpc 1.5 */ devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0); -#else +#elif MINIUPNPC_API_VERSION < 14 /* miniupnpc 1.6 */ int error = 0; devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, &error); +#else + /* miniupnpc 1.9.20150730 */ + int error = 0; + devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, 2, &error); #endif struct UPNPUrls urls; diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index 4a1f728e1..227f8993c 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -883,6 +883,9 @@ QString formatServicesStr(quint64 mask) case NODE_GETUTXO: strList.append("GETUTXO"); break; + case NODE_BLOOM: + strList.append("BLOOM"); + break; default: strList.append(QString("%1[%2]").arg("UNKNOWN").arg(check)); } diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index 87693bd8e..da7ca2594 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -752,7 +752,7 @@ Value getauxblockbip22(const Array& params, bool fHelp) " \"coinbasevalue\" (numeric) value of the block's coinbase\n" " \"bits\" (string) compressed target of the block\n" " \"height\" (numeric) height of the block\n" - " \"_target\" (string) target in reversed byte order, deprecated\n" + " \"target\" (string) target in reversed byte order\n" "}\n" "\nResult (with arguments):\n" "xxxxx (boolean) whether the submitted block was correct\n" @@ -845,7 +845,7 @@ Value getauxblockbip22(const Array& params, bool fHelp) result.push_back(Pair("coinbasevalue", (int64_t)block.vtx[0].vout[0].nValue)); result.push_back(Pair("bits", strprintf("%08x", block.nBits))); result.push_back(Pair("height", static_cast<int64_t> (pindexPrev->nHeight + 1))); - result.push_back(Pair("_target", HexStr(BEGIN(target), END(target)))); + result.push_back(Pair("target", HexStr(BEGIN(target), END(target)))); return result; } |