X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fnet.h;h=f071ac734936a9ce48be27a3dcca19c3c79d66bb;hb=34694c603fa90378d59d70804a5862df3845b2b8;hp=56c7b2f0b9203cfe1386d9e80878b83c36b38c74;hpb=1c7ed42093c5935e3958584ed98a2b03466a0023;p=novacoin.git diff --git a/src/net.h b/src/net.h index 56c7b2f..f071ac7 100644 --- a/src/net.h +++ b/src/net.h @@ -19,7 +19,6 @@ #include "mruset.h" #include "netbase.h" -#include "protocol.h" #include "addrman.h" #include "hash.h" @@ -77,7 +76,7 @@ CAddress GetLocalAddress(const CNetAddr *paddrPeer = NULL); enum { MSG_TX = 1, - MSG_BLOCK, + MSG_BLOCK }; class CRequestTracker @@ -113,6 +112,7 @@ enum threadId THREAD_MINTER, THREAD_SCRIPTCHECK, THREAD_NTP, + THREAD_IPCOLLECTOR, THREAD_MAX }; @@ -236,9 +236,9 @@ public: nHeaderStart = -1; nMessageStart = std::numeric_limits::max(); addr = addrIn; - addrName = addrNameIn == "" ? addr.ToStringIPPort() : addrNameIn; + addrName = addrNameIn.empty() ? addr.ToStringIPPort() : addrNameIn; nVersion = 0; - strSubVer = ""; + strSubVer.clear(); fOneShot = false; fClient = false; // set by version message fInbound = fInboundIn; @@ -266,8 +266,7 @@ public: { if (hSocket != INVALID_SOCKET) { - closesocket(hSocket); - hSocket = INVALID_SOCKET; + CloseSocket(hSocket); } }