diff --git a/src/Makefile.am b/src/Makefile.am --- a/src/Makefile.am +++ b/src/Makefile.am @@ -391,7 +391,6 @@ seeder/dns.cpp \ seeder/dns.h \ seeder/strlcpy.h \ - seeder/util.cpp \ seeder/util.h nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h diff --git a/src/seeder/bitcoin.cpp b/src/seeder/bitcoin.cpp --- a/src/seeder/bitcoin.cpp +++ b/src/seeder/bitcoin.cpp @@ -1,6 +1,7 @@ #include "bitcoin.h" #include "db.h" +#include "hash.h" #include "netbase.h" #include "serialize.h" #include "streams.h" @@ -18,7 +19,7 @@ static const uint32_t allones(-1); -class CNode { +class CSeederNode { SOCKET sock; CDataStream vSend; CDataStream vRecv; @@ -240,7 +241,7 @@ } public: - CNode(const CService &ip, std::vector *vAddrIn) + CSeederNode(const CService &ip, std::vector *vAddrIn) : vSend(SER_NETWORK, 0), vRecv(SER_NETWORK, 0), nHeaderStart(-1), nMessageStart(-1), nVersion(0), vAddr(vAddrIn), ban(0), doneAfter(0), you(ip, ServiceFlags(NODE_NETWORK | NODE_BITCOIN_CASH)) { @@ -319,7 +320,7 @@ std::string &clientSV, int &blocks, std::vector *vAddr) { try { - CNode node(cip, vAddr); + CSeederNode node(cip, vAddr); bool ret = node.Run(); if (!ret) { ban = node.GetBan(); @@ -336,15 +337,3 @@ return false; } } - -/* -int main(void) { - CService ip("bitcoin.sipa.be", 8333, true); - std::vector vAddr; - vAddr.clear(); - int ban = 0; - bool ret = TestNode(ip, ban, vAddr); - printf("ret=%s ban=%i vAddr.size()=%i\n", ret ? "good" : "bad", ban, -(int)vAddr.size()); -} -*/ diff --git a/src/seeder/util.h b/src/seeder/util.h --- a/src/seeder/util.h +++ b/src/seeder/util.h @@ -1,41 +1,10 @@ #ifndef BITCOIN_SEEDER_UTIL_H #define BITCOIN_SEEDER_UTIL_H -#include -#include -#include -#include +#include -#include "uint256.h" - -#define loop for (;;) #define BEGIN(a) ((char *)&(a)) #define END(a) ((char *)&((&(a))[1])) -#define UBEGIN(a) ((uint8_t *)&(a)) -#define UEND(a) ((uint8_t *)&((&(a))[1])) -#define ARRAYLEN(array) (sizeof(array) / sizeof((array)[0])) - -#define WSAGetLastError() errno -#define WSAEINVAL EINVAL -#define WSAEALREADY EALREADY -#define WSAEWOULDBLOCK EWOULDBLOCK -#define WSAEMSGSIZE EMSGSIZE -#define WSAEINTR EINTR -#define WSAEINPROGRESS EINPROGRESS -#define WSAEADDRINUSE EADDRINUSE -#define WSAENOTSOCK EBADF -#define INVALID_SOCKET (SOCKET)(~0) -#define SOCKET_ERROR -1 - -template inline uint256 Hash(const T1 pbegin, const T1 pend) { - static uint8_t pblank[1]; - uint256 hash1; - SHA256((pbegin == pend ? pblank : (uint8_t *)&pbegin[0]), - (pend - pbegin) * sizeof(pbegin[0]), (uint8_t *)&hash1); - uint256 hash2; - SHA256((uint8_t *)&hash1, sizeof(hash1), (uint8_t *)&hash2); - return hash2; -} static inline void Sleep(int nMilliSec) { struct timespec wa; @@ -44,27 +13,4 @@ nanosleep(&wa, nullptr); } -std::string vstrprintf(const char *format, va_list ap); - -static inline std::string strprintf(const char *format, ...) { - va_list arg_ptr; - va_start(arg_ptr, format); - std::string ret = vstrprintf(format, arg_ptr); - va_end(arg_ptr); - return ret; -} - -static inline bool error(std::string err, ...) { - return false; -} - -static inline bool my_printf(std::string err, ...) { - return true; -} - -std::vector DecodeBase32(const char *p, bool *pfInvalid = nullptr); -std::string DecodeBase32(const std::string &str); -std::string EncodeBase32(const uint8_t *pch, size_t len); -std::string EncodeBase32(const std::string &str); - #endif diff --git a/src/seeder/util.cpp b/src/seeder/util.cpp deleted file mode 100644 --- a/src/seeder/util.cpp +++ /dev/null @@ -1,24 +0,0 @@ -#include "util.h" - -#include - -std::string vstrprintf(const char *format, va_list ap) { - char buffer[50000]; - char *p = buffer; - int limit = sizeof(buffer); - int ret; - loop { - va_list arg_ptr; - va_copy(arg_ptr, ap); - ret = vsnprintf(p, limit, format, arg_ptr); - va_end(arg_ptr); - if (ret >= 0 && ret < limit) break; - if (p != buffer) delete[] p; - limit *= 2; - p = new char[limit]; - if (p == nullptr) throw std::bad_alloc(); - } - std::string str(p, p + ret); - if (p != buffer) delete[] p; - return str; -}