aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main.h1
-rw-r--r--src/makefile.linux-mingw2
-rw-r--r--src/makefile.mingw2
-rw-r--r--src/makefile.osx2
-rw-r--r--src/makefile.unix2
-rw-r--r--src/makefile.vc2
-rw-r--r--src/net.h98
-rw-r--r--src/protocol.cpp61
-rw-r--r--src/protocol.h52
9 files changed, 125 insertions, 97 deletions
diff --git a/src/main.h b/src/main.h
index d4b89225d1..427067bc94 100644
--- a/src/main.h
+++ b/src/main.h
@@ -21,7 +21,6 @@ class CKeyItem;
class CReserveKey;
class CWalletDB;
-class CMessageHeader;
class CAddress;
class CInv;
class CRequestTracker;
diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw
index c03cb9d2aa..12f6e212f9 100644
--- a/src/makefile.linux-mingw
+++ b/src/makefile.linux-mingw
@@ -48,6 +48,7 @@ HEADERS = \
main.h \
net.h \
noui.h \
+ protocol.h \
rpc.h \
script.h \
serialize.h \
@@ -75,6 +76,7 @@ OBJS= \
obj/keystore.o \
obj/main.o \
obj/net.o \
+ obj/protocol.o \
obj/rpc.o \
obj/script.o \
obj/util.o \
diff --git a/src/makefile.mingw b/src/makefile.mingw
index 55cb8a7058..893700b882 100644
--- a/src/makefile.mingw
+++ b/src/makefile.mingw
@@ -45,6 +45,7 @@ HEADERS = \
main.h \
net.h \
noui.h \
+ protocol.h \
rpc.h \
script.h \
serialize.h \
@@ -72,6 +73,7 @@ OBJS= \
obj/keystore.o \
obj/main.o \
obj/net.o \
+ obj/protocol.o \
obj/rpc.o \
obj/script.o \
obj/util.o \
diff --git a/src/makefile.osx b/src/makefile.osx
index 7172bcc417..48908d9f30 100644
--- a/src/makefile.osx
+++ b/src/makefile.osx
@@ -45,6 +45,7 @@ HEADERS = \
main.h \
net.h \
noui.h \
+ protocol.h \
rpc.h \
script.h \
serialize.h \
@@ -63,6 +64,7 @@ OBJS= \
obj/keystore.o \
obj/main.o \
obj/net.o \
+ obj/protocol.o \
obj/rpc.o \
obj/script.o \
obj/util.o \
diff --git a/src/makefile.unix b/src/makefile.unix
index 7cc72e0ea2..a4f13ae2c9 100644
--- a/src/makefile.unix
+++ b/src/makefile.unix
@@ -51,6 +51,7 @@ HEADERS = \
main.h \
net.h \
noui.h \
+ protocol.h \
rpc.h \
script.h \
serialize.h \
@@ -69,6 +70,7 @@ OBJS= \
obj/keystore.o \
obj/main.o \
obj/net.o \
+ obj/protocol.o \
obj/rpc.o \
obj/script.o \
obj/util.o \
diff --git a/src/makefile.vc b/src/makefile.vc
index edaba80a7b..a5437bcf5c 100644
--- a/src/makefile.vc
+++ b/src/makefile.vc
@@ -58,6 +58,7 @@ HEADERS = \
main.h \
net.h \
noui.h \
+ protocol.h \
rpc.h \
script.h \
serialize.h \
@@ -77,6 +78,7 @@ OBJS= \
obj\main.o \
obj\net.o \
obj\rpc.o \
+ obj\protocol.o \
obj\script.o \
obj\util.o \
obj\wallet.o \
diff --git a/src/net.h b/src/net.h
index 52568ef4ce..7a4706d53b 100644
--- a/src/net.h
+++ b/src/net.h
@@ -14,7 +14,8 @@
#include <arpa/inet.h>
#endif
-class CMessageHeader;
+#include "protocol.h"
+
class CAddress;
class CAddrDB;
class CInv;
@@ -54,101 +55,6 @@ bool BindListenPort(std::string& strError=REF(std::string()));
void StartNode(void* parg);
bool StopNode();
-
-
-
-
-
-
-
-//
-// Message header
-// (4) message start
-// (12) command
-// (4) size
-// (4) checksum
-
-extern unsigned char pchMessageStart[4];
-
-class CMessageHeader
-{
-public:
- enum { COMMAND_SIZE=12 };
- char pchMessageStart[sizeof(::pchMessageStart)];
- char pchCommand[COMMAND_SIZE];
- unsigned int nMessageSize;
- unsigned int nChecksum;
-
- CMessageHeader()
- {
- memcpy(pchMessageStart, ::pchMessageStart, sizeof(pchMessageStart));
- memset(pchCommand, 0, sizeof(pchCommand));
- pchCommand[1] = 1;
- nMessageSize = -1;
- nChecksum = 0;
- }
-
- CMessageHeader(const char* pszCommand, unsigned int nMessageSizeIn)
- {
- memcpy(pchMessageStart, ::pchMessageStart, sizeof(pchMessageStart));
- strncpy(pchCommand, pszCommand, COMMAND_SIZE);
- nMessageSize = nMessageSizeIn;
- nChecksum = 0;
- }
-
- IMPLEMENT_SERIALIZE
- (
- READWRITE(FLATDATA(pchMessageStart));
- READWRITE(FLATDATA(pchCommand));
- READWRITE(nMessageSize);
- if (nVersion >= 209)
- READWRITE(nChecksum);
- )
-
- std::string GetCommand()
- {
- if (pchCommand[COMMAND_SIZE-1] == 0)
- return std::string(pchCommand, pchCommand + strlen(pchCommand));
- else
- return std::string(pchCommand, pchCommand + COMMAND_SIZE);
- }
-
- bool IsValid()
- {
- // Check start string
- if (memcmp(pchMessageStart, ::pchMessageStart, sizeof(pchMessageStart)) != 0)
- return false;
-
- // Check the command string for errors
- for (char* p1 = pchCommand; p1 < pchCommand + COMMAND_SIZE; p1++)
- {
- if (*p1 == 0)
- {
- // Must be all zeros after the first zero
- for (; p1 < pchCommand + COMMAND_SIZE; p1++)
- if (*p1 != 0)
- return false;
- }
- else if (*p1 < ' ' || *p1 > 0x7E)
- return false;
- }
-
- // Message size
- if (nMessageSize > MAX_SIZE)
- {
- printf("CMessageHeader::IsValid() : (%s, %u bytes) nMessageSize > MAX_SIZE\n", GetCommand().c_str(), nMessageSize);
- return false;
- }
-
- return true;
- }
-};
-
-
-
-
-
-
static const unsigned char pchIPv4[12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff };
class CAddress
diff --git a/src/protocol.cpp b/src/protocol.cpp
new file mode 100644
index 0000000000..0bb1da93e0
--- /dev/null
+++ b/src/protocol.cpp
@@ -0,0 +1,61 @@
+// Copyright (c) 2009-2010 Satoshi Nakamoto
+// Copyright (c) 2011 The Bitcoin developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file license.txt or http://www.opensource.org/licenses/mit-license.php.
+
+#include "protocol.h"
+
+CMessageHeader::CMessageHeader()
+{
+ memcpy(pchMessageStart, ::pchMessageStart, sizeof(pchMessageStart));
+ memset(pchCommand, 0, sizeof(pchCommand));
+ pchCommand[1] = 1;
+ nMessageSize = -1;
+ nChecksum = 0;
+}
+
+CMessageHeader::CMessageHeader(const char* pszCommand, unsigned int nMessageSizeIn)
+{
+ memcpy(pchMessageStart, ::pchMessageStart, sizeof(pchMessageStart));
+ strncpy(pchCommand, pszCommand, COMMAND_SIZE);
+ nMessageSize = nMessageSizeIn;
+ nChecksum = 0;
+}
+
+std::string CMessageHeader::GetCommand() const
+{
+ if (pchCommand[COMMAND_SIZE-1] == 0)
+ return std::string(pchCommand, pchCommand + strlen(pchCommand));
+ else
+ return std::string(pchCommand, pchCommand + COMMAND_SIZE);
+}
+
+bool CMessageHeader::IsValid() const
+{
+ // Check start string
+ if (memcmp(pchMessageStart, ::pchMessageStart, sizeof(pchMessageStart)) != 0)
+ return false;
+
+ // Check the command string for errors
+ for (const char* p1 = pchCommand; p1 < pchCommand + COMMAND_SIZE; p1++)
+ {
+ if (*p1 == 0)
+ {
+ // Must be all zeros after the first zero
+ for (; p1 < pchCommand + COMMAND_SIZE; p1++)
+ if (*p1 != 0)
+ return false;
+ }
+ else if (*p1 < ' ' || *p1 > 0x7E)
+ return false;
+ }
+
+ // Message size
+ if (nMessageSize > MAX_SIZE)
+ {
+ printf("CMessageHeader::IsValid() : (%s, %u bytes) nMessageSize > MAX_SIZE\n", GetCommand().c_str(), nMessageSize);
+ return false;
+ }
+
+ return true;
+}
diff --git a/src/protocol.h b/src/protocol.h
new file mode 100644
index 0000000000..b5baeb2a68
--- /dev/null
+++ b/src/protocol.h
@@ -0,0 +1,52 @@
+// Copyright (c) 2009-2010 Satoshi Nakamoto
+// Copyright (c) 2011 The Bitcoin developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file license.txt or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef __cplusplus
+# error This header can only be compiled as C++.
+#endif
+
+#ifndef __INCLUDED_PROTOCOL_H__
+#define __INCLUDED_PROTOCOL_H__
+
+#include "serialize.h"
+#include <string>
+
+//
+// Message header
+// (4) message start
+// (12) command
+// (4) size
+// (4) checksum
+
+extern unsigned char pchMessageStart[4];
+
+class CMessageHeader
+{
+ public:
+ CMessageHeader();
+ CMessageHeader(const char* pszCommand, unsigned int nMessageSizeIn);
+
+ std::string GetCommand() const;
+ bool IsValid() const;
+
+ IMPLEMENT_SERIALIZE
+ (
+ READWRITE(FLATDATA(pchMessageStart));
+ READWRITE(FLATDATA(pchCommand));
+ READWRITE(nMessageSize);
+ if (nVersion >= 209)
+ READWRITE(nChecksum);
+ )
+
+ // TODO: make private (improves encapsulation)
+ public:
+ enum { COMMAND_SIZE=12 };
+ char pchMessageStart[sizeof(::pchMessageStart)];
+ char pchCommand[COMMAND_SIZE];
+ unsigned int nMessageSize;
+ unsigned int nChecksum;
+};
+
+#endif // __INCLUDED_PROTOCOL_H__
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-08 06:10:17 +0000