bunch of changes

This commit is contained in:
Michel van Kessel
2020-12-28 14:22:16 +01:00
parent 8beac1bfc4
commit 03c45256e3
69 changed files with 674 additions and 623 deletions

View File

@@ -6,17 +6,18 @@
#ifndef BITCOIN_NET_H
#define BITCOIN_NET_H
#include "addrdb.h"
#include "amount.h"
#include "bloom.h"
#include "compat.h"
#include "limitedmap.h"
#include "netaddress.h"
#include "protocol.h"
#include "random.h"
#include "streams.h"
#include "sync.h"
#include "uint256.h"
#include <addrdb.h>
#include <amount.h>
#include <bloom.h>
#include <compat.h>
#include <limitedmap.h>
#include <netbase.h>
#include <netaddress.h>
#include <protocol.h>
#include <random.h>
#include <streams.h>
#include <sync.h>
#include <uint256.h>
#include <atomic>
#include <deque>
@@ -27,7 +28,6 @@
#endif
#include <boost/filesystem/path.hpp>
#include <boost/foreach.hpp>
#include <boost/signals2/signal.hpp>
class CAddrMan;
@@ -92,7 +92,7 @@ CNode* FindNode(const CSubNet& subNet);
CNode* FindNode(const std::string& addrName);
CNode* FindNode(const CService& ip);
CNode* FindNode(const NodeId id); //TODO: Remove this
bool OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false, bool fFeeler = false);
bool OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound = nullptr, const char *strDest = nullptr, bool fOneShot = false, bool fFeeler = false);
void MapPort(bool fUseUPnP);
unsigned short GetListenPort();
bool BindListenPort(const CService &bindAddr, std::string& strError, bool fWhitelisted = false);
@@ -424,7 +424,7 @@ public:
unsigned int GetTotalRecvSize()
{
unsigned int total = 0;
BOOST_FOREACH(const CNetMessage &msg, vRecvMsg)
for(const CNetMessage &msg: vRecvMsg)
total += msg.vRecv.size() + 24;
return total;
}
@@ -436,7 +436,7 @@ public:
void SetRecvVersion(int nVersionIn)
{
nRecvVersion = nVersionIn;
BOOST_FOREACH(CNetMessage &msg, vRecvMsg)
for(CNetMessage &msg: vRecvMsg)
msg.SetVersion(nVersionIn);
}
@@ -739,7 +739,6 @@ public:
};
class CTransaction;
void RelayTransaction(const CTransaction& tx);