X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fnet.h;h=7306d136b63967e40345c63280bf43322dc9c042;hb=92948780909cc9e3349409d6102dbe5adf1d5a10;hp=2d635faefdf4f2d54626680174721189a3824d93;hpb=e3af34101250095febe11520d67c6e0070ef3181;p=novacoin.git diff --git a/src/net.h b/src/net.h index 2d635fa..7306d13 100644 --- a/src/net.h +++ b/src/net.h @@ -39,6 +39,7 @@ void AddressCurrentlyConnected(const CService& addr); CNode* FindNode(const CNetAddr& ip); CNode* FindNode(const CService& ip); CNode* ConnectNode(CAddress addrConnect, const char *strDest = NULL, int64_t nTimeout=0); +bool OpenNetworkConnection(const CAddress& addrConnect, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false); void MapPort(); unsigned short GetListenPort(); bool BindListenPort(const CService &bindAddr, std::string& strError=REF(std::string())); @@ -125,6 +126,8 @@ extern CAddrMan addrman; extern std::vector vNodes; extern CCriticalSection cs_vNodes; +extern std::vector vAddedNodes; +extern CCriticalSection cs_vAddedNodes; extern std::map mapRelay; extern std::deque > vRelayExpiration; extern CCriticalSection cs_mapRelay; @@ -230,7 +233,7 @@ public: nLastSendEmpty = GetTime(); nTimeConnected = GetTime(); nHeaderStart = -1; - nMessageStart = -1; + nMessageStart = UINT_MAX; addr = addrIn; addrName = addrNameIn == "" ? addr.ToStringIPPort() : addrNameIn; nVersion = 0; @@ -372,7 +375,7 @@ public: return; vSend.resize(nHeaderStart); nHeaderStart = -1; - nMessageStart = -1; + nMessageStart = UINT_MAX; LEAVE_CRITICAL_SECTION(cs_vSend); if (fDebug) @@ -407,7 +410,7 @@ public: } nHeaderStart = -1; - nMessageStart = -1; + nMessageStart = UINT_MAX; LEAVE_CRITICAL_SECTION(cs_vSend); }