X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=blobdiff_plain;f=src%2Fnetbase.cpp;h=b68a43a2fa353cdc569e196f5dc448b382c7d1ae;hp=a9caddfc631e583354e9b5328dc4d304ca9833b2;hb=27ce22da0815f4c1fa0e949cc4740e3f4dd1ea9c;hpb=75c3915a7c5c1a1542ac9c2bfe2db215e8cdd98c diff --git a/src/netbase.cpp b/src/netbase.cpp index a9caddf..b68a43a 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -136,11 +136,6 @@ bool LookupHost(const char *pszName, std::vector& vIP, unsigned int nM return LookupIntern(strHost.c_str(), vIP, nMaxSolutions, fAllowLookup); } -bool LookupHostNumeric(const char *pszName, std::vector& vIP, unsigned int nMaxSolutions) -{ - return LookupHost(pszName, vIP, nMaxSolutions, false); -} - bool Lookup(const char *pszName, std::vector& vAddr, uint16_t portDefault, bool fAllowLookup, unsigned int nMaxSolutions) { if (pszName[0] == 0) @@ -226,11 +221,9 @@ bool static Socks5(string strDest, uint16_t port, SOCKET& hSocket) CloseSocket(hSocket); return error("Hostname too long"); } - char pszSocks5Init[] = "\5\1\0"; - ssize_t nSize = sizeof(pszSocks5Init) - 1; - - ssize_t ret = send(hSocket, pszSocks5Init, nSize, MSG_NOSIGNAL); - if (ret != nSize) + const char pszSocks5Init[] = "\5\1\0"; + ssize_t ret = send(hSocket, pszSocks5Init, 3, MSG_NOSIGNAL); + if (ret != 3) { CloseSocket(hSocket); return error("Error sending to proxy"); @@ -252,7 +245,7 @@ bool static Socks5(string strDest, uint16_t port, SOCKET& hSocket) strSocks5 += strDest; strSocks5 += static_cast((port >> 8) & 0xFF); strSocks5 += static_cast((port >> 0) & 0xFF); - ret = send(hSocket, strSocks5.c_str(), strSocks5.size(), MSG_NOSIGNAL); + ret = send(hSocket, strSocks5.data(), strSocks5.size(), MSG_NOSIGNAL); if (ret != (ssize_t)strSocks5.size()) { CloseSocket(hSocket); @@ -930,11 +923,6 @@ uint64_t CNetAddr::GetHash() const return nRet; } -void CNetAddr::print() const -{ - printf("CNetAddr(%s)\n", ToString().c_str()); -} - // private extensions to enum Network, only returned by GetExtNetwork, // and only used in GetReachabilityFrom static const int NET_UNKNOWN = NET_MAX + 0; @@ -1177,11 +1165,6 @@ std::string CService::ToString() const return ToStringIPPort(); } -void CService::print() const -{ - printf("CService(%s)\n", ToString().c_str()); -} - void CService::SetPort(unsigned short portIn) { port = portIn; @@ -1198,4 +1181,4 @@ bool CloseSocket(SOCKET& hSocket) #endif hSocket = INVALID_SOCKET; return ret != SOCKET_ERROR; -} \ No newline at end of file +}