aboutsummaryrefslogtreecommitdiff
path: root/src/net.h
diff options
context:
space:
mode:
authorGiel van Schijndel <me@mortis.eu>2011-08-11 18:49:03 +0200
committerGiel van Schijndel <me@mortis.eu>2011-08-19 07:24:38 +0200
commite4dde849ae5544383703ef2d73592677e6c528ad (patch)
tree5b50a12a27206ddd5c949d1aaed41382a912f5e8 /src/net.h
parent33e28c9948336784324cf5c7248ce608b93dbfde (diff)
downloadbitcoin-e4dde849ae5544383703ef2d73592677e6c528ad.tar.xz
Move CInv to protocol.[ch]pp
This commit does *not* and should not modify *any* code, it only moves it from net.h and splits it across protocol.cpp and protocol.hpp. Signed-off-by: Giel van Schijndel <me@mortis.eu>
Diffstat (limited to 'src/net.h')
-rw-r--r--src/net.h80
1 files changed, 0 insertions, 80 deletions
diff --git a/src/net.h b/src/net.h
index 66f3949b86..efac1f452a 100644
--- a/src/net.h
+++ b/src/net.h
@@ -17,7 +17,6 @@
#include "protocol.h"
class CAddrDB;
-class CInv;
class CRequestTracker;
class CNode;
class CBlockIndex;
@@ -52,85 +51,6 @@ enum
MSG_BLOCK,
};
-static const char* ppszTypeName[] =
-{
- "ERROR",
- "tx",
- "block",
-};
-
-class CInv
-{
-public:
- int type;
- uint256 hash;
-
- CInv()
- {
- type = 0;
- hash = 0;
- }
-
- CInv(int typeIn, const uint256& hashIn)
- {
- type = typeIn;
- hash = hashIn;
- }
-
- CInv(const std::string& strType, const uint256& hashIn)
- {
- int i;
- for (i = 1; i < ARRAYLEN(ppszTypeName); i++)
- {
- if (strType == ppszTypeName[i])
- {
- type = i;
- break;
- }
- }
- if (i == ARRAYLEN(ppszTypeName))
- throw std::out_of_range(strprintf("CInv::CInv(string, uint256) : unknown type '%s'", strType.c_str()));
- hash = hashIn;
- }
-
- IMPLEMENT_SERIALIZE
- (
- READWRITE(type);
- READWRITE(hash);
- )
-
- friend inline bool operator<(const CInv& a, const CInv& b)
- {
- return (a.type < b.type || (a.type == b.type && a.hash < b.hash));
- }
-
- bool IsKnownType() const
- {
- return (type >= 1 && type < ARRAYLEN(ppszTypeName));
- }
-
- const char* GetCommand() const
- {
- if (!IsKnownType())
- throw std::out_of_range(strprintf("CInv::GetCommand() : type=%d unknown type", type));
- return ppszTypeName[type];
- }
-
- std::string ToString() const
- {
- return strprintf("%s %s", GetCommand(), hash.ToString().substr(0,20).c_str());
- }
-
- void print() const
- {
- printf("CInv(%s)\n", ToString().c_str());
- }
-};
-
-
-
-
-
class CRequestTracker
{
public: