mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 12:02:48 +01:00
misc small changes to polish after include cleanup
This commit is contained in:
parent
a6aa179699
commit
cd696e64df
@ -1,6 +1,7 @@
|
||||
//
|
||||
// Alert system
|
||||
//
|
||||
// Copyright (c) 2010 Satoshi Nakamoto
|
||||
// Copyright (c) 2009-2013 The Bitcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#include "alert.h"
|
||||
|
||||
|
@ -3,8 +3,6 @@
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
||||
|
||||
#include "bitcoinrpc.h"
|
||||
#include "init.h"
|
||||
#include "main.h"
|
||||
|
18
src/main.cpp
18
src/main.cpp
@ -3039,7 +3039,7 @@ void static ProcessGetData(CNode* pfrom)
|
||||
|
||||
// Track requests for our stuff.
|
||||
g_signals.Inventory(inv.hash);
|
||||
|
||||
|
||||
if (inv.type == MSG_BLOCK || inv.type == MSG_FILTERED_BLOCK)
|
||||
break;
|
||||
}
|
||||
@ -3576,10 +3576,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
|
||||
size_t nAvail = vRecv.in_avail();
|
||||
bool bPingFinished = false;
|
||||
std::string sProblem;
|
||||
|
||||
|
||||
if (nAvail >= sizeof(nonce)) {
|
||||
vRecv >> nonce;
|
||||
|
||||
|
||||
// Only process pong message if there is an outstanding ping (old ping without nonce should never pong)
|
||||
if (pfrom->nPingNonceSent != 0) {
|
||||
if (nonce == pfrom->nPingNonceSent) {
|
||||
@ -3610,7 +3610,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
|
||||
bPingFinished = true;
|
||||
sProblem = "Short payload";
|
||||
}
|
||||
|
||||
|
||||
if (!(sProblem.empty())) {
|
||||
LogPrint("net", "pong %s %s: %s, %"PRIx64" expected, %"PRIx64" received, %"PRIszu" bytes\n",
|
||||
pfrom->addr.ToString().c_str(),
|
||||
@ -3624,8 +3624,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
|
||||
pfrom->nPingNonceSent = 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
else if (strCommand == "alert")
|
||||
{
|
||||
CAlert alert;
|
||||
@ -3761,10 +3761,10 @@ bool ProcessMessages(CNode* pfrom)
|
||||
|
||||
if (!pfrom->vRecvGetData.empty())
|
||||
ProcessGetData(pfrom);
|
||||
|
||||
|
||||
// this maintains the order of responses
|
||||
if (!pfrom->vRecvGetData.empty()) return fOk;
|
||||
|
||||
|
||||
std::deque<CNetMessage>::iterator it = pfrom->vRecvMsg.begin();
|
||||
while (!pfrom->fDisconnect && it != pfrom->vRecvMsg.end()) {
|
||||
// Don't bother if send buffer is too full to respond anyway
|
||||
@ -3853,7 +3853,7 @@ bool ProcessMessages(CNode* pfrom)
|
||||
|
||||
if (!fRet)
|
||||
LogPrintf("ProcessMessage(%s, %u bytes) FAILED\n", strCommand.c_str(), nMessageSize);
|
||||
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -25,7 +25,6 @@
|
||||
#include <arpa/inet.h>
|
||||
#endif
|
||||
|
||||
//#include <boost/array.hpp>
|
||||
#include <boost/foreach.hpp>
|
||||
#include <boost/signals2/signal.hpp>
|
||||
#include <openssl/rand.h>
|
||||
|
@ -130,7 +130,6 @@ Value importwallet(const Array& params, bool fHelp)
|
||||
|
||||
int64_t nTimeBegin = chainActive.Tip()->nTime;
|
||||
|
||||
|
||||
bool fGood = true;
|
||||
|
||||
while (file.good()) {
|
||||
|
@ -3,8 +3,6 @@
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
|
||||
|
||||
#include "bitcoinrpc.h"
|
||||
#include "chainparams.h"
|
||||
#include "db.h"
|
||||
|
@ -27,8 +27,6 @@
|
||||
#include <sys/resource.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/types.h>
|
||||
#else
|
||||
typedef int pid_t; /* define for Windows compatibility */
|
||||
#endif
|
||||
|
||||
#include <boost/filesystem/path.hpp>
|
||||
@ -109,7 +107,7 @@ inline void MilliSleep(int64_t n)
|
||||
#elif defined(HAVE_WORKING_BOOST_SLEEP)
|
||||
boost::this_thread::sleep(boost::posix_time::milliseconds(n));
|
||||
#else
|
||||
//should never get here
|
||||
//should never get here
|
||||
#error missing boost sleep implementation
|
||||
#endif
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user