X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Futil.cpp;h=76eb8a5755512f6f67419de4d0637f58e2a9b740;hb=47d3ceb3da845e216fc9577cbf52f8b5600e5f93;hp=5422d0b46a18cd9ad1a08d57877061aad1da345c;hpb=7ac0ffc894b6a23aa2e3a1e0939a15fe95fe9eca;p=novacoin.git diff --git a/src/util.cpp b/src/util.cpp index 5422d0b..76eb8a5 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -5,21 +5,11 @@ #include "util.h" #include "sync.h" -#include "strlcpy.h" #include "version.h" -#include "ui_interface.h" +#include "interface.h" #include - -// Work around clang compilation problem in Boost 1.46: -// /usr/include/boost/program_options/detail/config_file.hpp:163:17: error: call to function 'to_internal' that is neither visible in the template definition nor found by argument-dependent lookup -// See also: http://stackoverflow.com/questions/10020179/compilation-fail-in-boost-librairies-program-options -// http://clang.debian.net/status.php?version=3.0&key=CANNOT_FIND_FUNCTION -namespace boost { - namespace program_options { - std::string to_internal(const std::string&); - } -} - +#include // for to_lower() +#include // for startswith() and endswith() #include #include #include @@ -30,34 +20,15 @@ namespace boost { #include #include #include -#include #ifdef WIN32 -#ifdef _MSC_VER -#pragma warning(disable:4786) -#pragma warning(disable:4804) -#pragma warning(disable:4805) -#pragma warning(disable:4717) -#endif -#ifdef _WIN32_WINNT -#undef _WIN32_WINNT -#endif -#define _WIN32_WINNT 0x0501 -#ifdef _WIN32_IE -#undef _WIN32_IE -#endif -#define _WIN32_IE 0x0501 -#define WIN32_LEAN_AND_MEAN 1 -#ifndef NOMINMAX -#define NOMINMAX -#endif #include /* for _commit */ #include "shlobj.h" #elif defined(__linux__) # include #endif -#ifndef WIN32 +#if !defined(WIN32) && !defined(ANDROID) #include #endif @@ -80,7 +51,7 @@ string strMiscWarning; bool fTestNet = false; bool fNoListen = false; bool fLogTimestamps = false; -CMedianFilter vTimeOffsets(200,0); +CMedianFilter vTimeOffsets(200,0); bool fReopenDebugLog = false; // Extended DecodeDumpTime implementation, see this page for details: @@ -156,7 +127,7 @@ instance_of_cinit; void RandAddSeed() { // Seed with CPU performance counter - int64 nCounter = GetPerformanceCounter(); + int64_t nCounter = GetPerformanceCounter(); RAND_add(&nCounter, sizeof(nCounter), 1.5); memset(&nCounter, 0, sizeof(nCounter)); } @@ -166,7 +137,7 @@ void RandAddSeedPerfmon() RandAddSeed(); // This can take up to 2 seconds, so only do it every 10 minutes - static int64 nLastPerfmon; + static int64_t nLastPerfmon; if (GetTime() < nLastPerfmon + 10 * 60) return; nLastPerfmon = GetTime(); @@ -182,21 +153,21 @@ void RandAddSeedPerfmon() if (ret == ERROR_SUCCESS) { RAND_add(pdata, nSize, nSize/100.0); - memset(pdata, 0, nSize); + OPENSSL_cleanse(pdata, nSize); printf("RandAddSeed() %lu bytes\n", nSize); } #endif } -uint64 GetRand(uint64 nMax) +uint64_t GetRand(uint64_t nMax) { if (nMax == 0) return 0; // The range of the random source must be a multiple of the modulus // to give every possible output value an equal possibility - uint64 nRange = (std::numeric_limits::max() / nMax) * nMax; - uint64 nRand = 0; + uint64_t nRange = (std::numeric_limits::max() / nMax) * nMax; + uint64_t nRand = 0; do RAND_bytes((unsigned char*)&nRand, sizeof(nRand)); while (nRand >= nRange); @@ -205,7 +176,7 @@ uint64 GetRand(uint64 nMax) int GetRandInt(int nMax) { - return GetRand(nMax); + return static_cast(GetRand(nMax)); } uint256 GetRandHash() @@ -293,7 +264,7 @@ inline int OutputDebugStringF(const char* pszFormat, ...) buffer += vstrprintf(pszFormat, arg_ptr); va_end(arg_ptr); - int line_start = 0, line_end; + size_t line_start = 0, line_end; while((line_end = buffer.find('\n', line_start)) != -1) { OutputDebugStringA(buffer.substr(line_start, line_end - line_start).c_str()); @@ -312,10 +283,14 @@ string vstrprintf(const char *format, va_list ap) char* p = buffer; int limit = sizeof(buffer); int ret; - while (true) + for ( ; ; ) { +#ifndef _MSC_VER va_list arg_ptr; va_copy(arg_ptr, ap); +#else + va_list arg_ptr = ap; +#endif #ifdef WIN32 ret = _vsnprintf(p, limit, format, arg_ptr); #else @@ -327,7 +302,7 @@ string vstrprintf(const char *format, va_list ap) if (p != buffer) delete[] p; limit *= 2; - p = new char[limit]; + p = new(nothrow) char[limit]; if (p == NULL) throw std::bad_alloc(); } @@ -372,7 +347,7 @@ void ParseString(const string& str, char c, vector& v) return; string::size_type i1 = 0; string::size_type i2; - while (true) + for ( ; ; ) { i2 = str.find(c, i1); if (i2 == str.npos) @@ -386,39 +361,39 @@ void ParseString(const string& str, char c, vector& v) } -string FormatMoney(int64 n, bool fPlus) +string FormatMoney(int64_t n, bool fPlus) { // Note: not using straight sprintf here because we do NOT want // localized number formatting. - int64 n_abs = (n > 0 ? n : -n); - int64 quotient = n_abs/COIN; - int64 remainder = n_abs%COIN; - string str = strprintf("%"PRI64d".%08"PRI64d, quotient, remainder); + int64_t n_abs = (n > 0 ? n : -n); + int64_t quotient = n_abs/COIN; + int64_t remainder = n_abs%COIN; + string str = strprintf("%" PRId64 ".%06" PRId64, quotient, remainder); // Right-trim excess zeros before the decimal point: - int nTrim = 0; - for (int i = str.size()-1; (str[i] == '0' && isdigit(str[i-2])); --i) + size_t nTrim = 0; + for (size_t i = str.size()-1; (str[i] == '0' && isdigit(str[i-2])); --i) ++nTrim; if (nTrim) str.erase(str.size()-nTrim, nTrim); if (n < 0) - str.insert((unsigned int)0, 1, '-'); + str.insert(0u, 1, '-'); else if (fPlus && n > 0) - str.insert((unsigned int)0, 1, '+'); + str.insert(0u, 1, '+'); return str; } -bool ParseMoney(const string& str, int64& nRet) +bool ParseMoney(const string& str, int64_t& nRet) { return ParseMoney(str.c_str(), nRet); } -bool ParseMoney(const char* pszIn, int64& nRet) +bool ParseMoney(const char* pszIn, int64_t& nRet) { string strWhole; - int64 nUnits = 0; + int64_t nUnits = 0; const char* p = pszIn; while (isspace(*p)) p++; @@ -427,7 +402,7 @@ bool ParseMoney(const char* pszIn, int64& nRet) if (*p == '.') { p++; - int64 nMult = CENT*10; + int64_t nMult = CENT*10; while (isdigit(*p) && (nMult > 0)) { nUnits += nMult * (*p++ - '0'); @@ -448,8 +423,8 @@ bool ParseMoney(const char* pszIn, int64& nRet) return false; if (nUnits < 0 || nUnits > COIN) return false; - int64 nWhole = atoi64(strWhole); - int64 nValue = nWhole*COIN + nUnits; + int64_t nWhole = atoi64(strWhole); + int64_t nValue = nWhole*COIN + nUnits; nRet = nValue; return true; @@ -488,7 +463,7 @@ vector ParseHex(const char* psz) { // convert hex dump to vector vector vch; - while (true) + for ( ; ; ) { while (isspace(*psz)) psz++; @@ -531,24 +506,24 @@ void ParseParameters(int argc, const char* const argv[]) mapMultiArgs.clear(); for (int i = 1; i < argc; i++) { - char psz[10000]; - strlcpy(psz, argv[i], sizeof(psz)); - char* pszValue = (char*)""; - if (strchr(psz, '=')) + std::string str(argv[i]); + std::string strValue; + size_t is_index = str.find('='); + if (is_index != std::string::npos) { - pszValue = strchr(psz, '='); - *pszValue++ = '\0'; + strValue = str.substr(is_index+1); + str = str.substr(0, is_index); } - #ifdef WIN32 - _strlwr(psz); - if (psz[0] == '/') - psz[0] = '-'; - #endif - if (psz[0] != '-') +#ifdef WIN32 + boost::to_lower(str); + if (boost::algorithm::starts_with(str, "/")) + str = "-" + str.substr(1); +#endif + if (str[0] != '-') break; - mapArgs[psz] = pszValue; - mapMultiArgs[psz].push_back(pszValue); + mapArgs[str] = strValue; + mapMultiArgs[str].push_back(strValue); } // New 0.6 features: @@ -577,13 +552,27 @@ std::string GetArg(const std::string& strArg, const std::string& strDefault) return strDefault; } -int64 GetArg(const std::string& strArg, int64 nDefault) +int64_t GetArg(const std::string& strArg, int64_t nDefault) { if (mapArgs.count(strArg)) return atoi64(mapArgs[strArg]); return nDefault; } +int32_t GetArgInt(const std::string& strArg, int32_t nDefault) +{ + if (mapArgs.count(strArg)) + return strtol(mapArgs[strArg]); + return nDefault; +} + +uint32_t GetArgUInt(const std::string& strArg, uint32_t nDefault) +{ + if (mapArgs.count(strArg)) + return strtoul(mapArgs[strArg]); + return nDefault; +} + bool GetBoolArg(const std::string& strArg, bool fDefault) { if (mapArgs.count(strArg)) @@ -597,9 +586,11 @@ bool GetBoolArg(const std::string& strArg, bool fDefault) bool SoftSetArg(const std::string& strArg, const std::string& strValue) { - if (mapArgs.count(strArg)) + if (mapArgs.count(strArg) || mapMultiArgs.count(strArg)) return false; mapArgs[strArg] = strValue; + mapMultiArgs[strArg].push_back(strValue); + return true; } @@ -691,7 +682,7 @@ vector DecodeBase64(const char* p, bool* pfInvalid) int mode = 0; int left = 0; - while (1) + for ( ; ; ) { int dec = decode64_table[(unsigned char)*p]; if (dec == -1) break; @@ -844,7 +835,7 @@ vector DecodeBase32(const char* p, bool* pfInvalid) int mode = 0; int left = 0; - while (1) + for ( ; ; ) { int dec = decode32_table[(unsigned char)*p]; if (dec == -1) break; @@ -940,7 +931,7 @@ string DecodeBase32(const string& str) } -int64 DecodeDumpTime(const std::string& s) +int64_t DecodeDumpTime(const std::string& s) { bt::ptime pt; @@ -955,7 +946,7 @@ int64 DecodeDumpTime(const std::string& s) return pt_to_time_t(pt); } -std::string EncodeDumpTime(int64 nTime) { +std::string EncodeDumpTime(int64_t nTime) { return DateTimeStrFormat("%Y-%m-%dT%H:%M:%SZ", nTime); } @@ -987,7 +978,7 @@ std::string DecodeDumpString(const std::string &str) { bool WildcardMatch(const char* psz, const char* mask) { - while (true) + for ( ; ; ) { switch (*mask) { @@ -1056,7 +1047,7 @@ void LogStackTrace() { printf("\n\n******* exception encountered *******\n"); if (fileout) { -#ifndef WIN32 +#if !defined(WIN32) && !defined(ANDROID) void* pszBuffer[32]; size_t size; size = backtrace(pszBuffer, 32); @@ -1090,7 +1081,7 @@ boost::filesystem::path GetDefaultDataDir() pathRet = fs::path("/"); else pathRet = fs::path(pszHome); -#ifdef MAC_OSX +#ifdef __APPLE__ // Mac pathRet /= "Library/Application Support"; fs::create_directory(pathRet); @@ -1137,6 +1128,37 @@ const boost::filesystem::path &GetDataDir(bool fNetSpecific) return path; } +string randomStrGen(int length) { + static string charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"; + string result; + result.resize(length); + for (int32_t i = 0; i < length; i++) + result[i] = charset[rand() % charset.length()]; + + return result; +} + +void createConf() +{ + srand(static_cast(time(NULL))); + + ofstream pConf; +#if BOOST_FILESYSTEM_VERSION >= 3 + pConf.open(GetConfigFile().generic_string().c_str()); +#else + pConf.open(GetConfigFile().string().c_str()); +#endif + pConf << "rpcuser=user\nrpcpassword=" + + randomStrGen(15) + + "\nrpcport=8344" + + "\n#(0=off, 1=on) daemon - run in the background as a daemon and accept commands" + + "\ndaemon=0" + + "\n#(0=off, 1=on) server - accept command line and JSON-RPC commands" + + "\nserver=0" + + "\nrpcallowip=127.0.0.1"; + pConf.close(); +} + boost::filesystem::path GetConfigFile() { boost::filesystem::path pathConfigFile(GetArg("-conf", "novacoin.conf")); @@ -1149,7 +1171,12 @@ void ReadConfigFile(map& mapSettingsRet, { boost::filesystem::ifstream streamConfig(GetConfigFile()); if (!streamConfig.good()) - return; // No bitcoin.conf file is OK + { + createConf(); + new(&streamConfig) boost::filesystem::ifstream(GetConfigFile()); + if(!streamConfig.good()) + return; + } set setOptions; setOptions.insert("*"); @@ -1191,7 +1218,7 @@ bool RenameOver(boost::filesystem::path src, boost::filesystem::path dest) { #ifdef WIN32 return MoveFileExA(src.string().c_str(), dest.string().c_str(), - MOVEFILE_REPLACE_EXISTING); + MOVEFILE_REPLACE_EXISTING) != 0; #else int rc = std::rename(src.string().c_str(), dest.string().c_str()); return (rc == 0); @@ -1226,16 +1253,23 @@ void ShrinkDebugFile() if (file && GetFilesize(file) > 10 * 1000000) { // Restart the file with some of the end - char pch[200000]; - fseek(file, -sizeof(pch), SEEK_END); - int nBytes = fread(pch, 1, sizeof(pch), file); - fclose(file); - - file = fopen(pathLog.string().c_str(), "w"); - if (file) - { - fwrite(pch, 1, nBytes, file); + try { + vector* vBuf = new vector (200000, 0); + fseek(file, -((long)(vBuf->size())), SEEK_END); + size_t nBytes = fread(&vBuf->operator[](0), 1, vBuf->size(), file); fclose(file); + file = fopen(pathLog.string().c_str(), "w"); + if (file) + { + fwrite(&vBuf->operator[](0), 1, nBytes, file); + fclose(file); + } + delete vBuf; + } + catch (const bad_alloc& e) { + // Bad things happen - no free memory in heap at program startup + fclose(file); + printf("Warning: %s in %s:%d\n ShrinkDebugFile failed - debug.log expands further", e.what(), __FILE__, __LINE__); } } } @@ -1254,35 +1288,48 @@ void ShrinkDebugFile() // - Median of other nodes clocks // - The user (asking the user to fix the system clock if the first two disagree) // -static int64 nMockTime = 0; // For unit testing -int64 GetTime() +// System clock +int64_t GetTime() { - if (nMockTime) return nMockTime; - - return time(NULL); + int64_t now = time(NULL); + assert(now > 0); + return now; } -void SetMockTime(int64 nMockTimeIn) +// Trusted NTP offset or median of NTP samples. +extern int64_t nNtpOffset; + +// Median of time samples given by other nodes. +static int64_t nNodesOffset = INT64_MAX; + +// Select time offset: +int64_t GetTimeOffset() { - nMockTime = nMockTimeIn; -} + // If NTP and system clock are in agreement within 40 minutes, then use NTP. + if (abs64(nNtpOffset) < 40 * 60) + return nNtpOffset; -static int64 nTimeOffset = 0; + // If not, then choose between median peer time and system clock. + if (abs64(nNodesOffset) < 70 * 60) + return nNodesOffset; + + return 0; +} -int64 GetTimeOffset() +int64_t GetNodesOffset() { - return nTimeOffset; + return nNodesOffset; } -int64 GetAdjustedTime() +int64_t GetAdjustedTime() { return GetTime() + GetTimeOffset(); } -void AddTimeData(const CNetAddr& ip, int64 nTime) +void AddTimeData(const CNetAddr& ip, int64_t nTime) { - int64 nOffsetSample = nTime - GetTime(); + int64_t nOffsetSample = nTime - GetTime(); // Ignore duplicates static set setKnown; @@ -1291,26 +1338,27 @@ void AddTimeData(const CNetAddr& ip, int64 nTime) // Add data vTimeOffsets.input(nOffsetSample); - printf("Added time data, samples %d, offset %+"PRI64d" (%+"PRI64d" minutes)\n", vTimeOffsets.size(), nOffsetSample, nOffsetSample/60); + printf("Added time data, samples %d, offset %+" PRId64 " (%+" PRId64 " minutes)\n", vTimeOffsets.size(), nOffsetSample, nOffsetSample/60); if (vTimeOffsets.size() >= 5 && vTimeOffsets.size() % 2 == 1) { - int64 nMedian = vTimeOffsets.median(); - std::vector vSorted = vTimeOffsets.sorted(); + int64_t nMedian = vTimeOffsets.median(); + std::vector vSorted = vTimeOffsets.sorted(); // Only let other nodes change our time by so much if (abs64(nMedian) < 70 * 60) { - nTimeOffset = nMedian; + nNodesOffset = nMedian; } else { - nTimeOffset = 0; + nNodesOffset = INT64_MAX; static bool fDone; if (!fDone) { - // If nobody has a time different than ours but within 5 minutes of ours, give a warning bool fMatch = false; - BOOST_FOREACH(int64 nOffset, vSorted) + + // If nobody has a time different than ours but within 5 minutes of ours, give a warning + BOOST_FOREACH(int64_t nOffset, vSorted) if (nOffset != 0 && abs64(nOffset) < 5 * 60) fMatch = true; @@ -1325,21 +1373,15 @@ void AddTimeData(const CNetAddr& ip, int64 nTime) } } if (fDebug) { - BOOST_FOREACH(int64 n, vSorted) - printf("%+"PRI64d" ", n); + BOOST_FOREACH(int64_t n, vSorted) + printf("%+" PRId64 " ", n); printf("| "); } - printf("nTimeOffset = %+"PRI64d" (%+"PRI64d" minutes)\n", nTimeOffset, nTimeOffset/60); + if (nNodesOffset != INT64_MAX) + printf("nNodesOffset = %+" PRId64 " (%+" PRId64 " minutes)\n", nNodesOffset, nNodesOffset/60); } } - - - - - - - string FormatVersion(int nVersion) { if (nVersion%100 == 0) @@ -1394,16 +1436,10 @@ void RenameThread(const char* name) #if defined(PR_SET_NAME) // Only the first 15 characters are used (16 - NUL terminator) ::prctl(PR_SET_NAME, name, 0, 0, 0); -#elif 0 && (defined(__FreeBSD__) || defined(__OpenBSD__)) - // TODO: This is currently disabled because it needs to be verified to work - // on FreeBSD or OpenBSD first. When verified the '0 &&' part can be - // removed. +#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) pthread_set_name_np(pthread_self(), name); - -// This is XCode 10.6-and-later; bring back if we drop 10.5 support: -// #elif defined(MAC_OSX) -// pthread_setname_np(name); - +#elif defined(__APPLE__) + pthread_setname_np(name); #else // Prevent warnings for unused parameters... (void)name; @@ -1421,3 +1457,13 @@ bool NewThread(void(*pfn)(void*), void* parg) } return true; } + +std::string DateTimeStrFormat(const char* pszFormat, int64_t nTime) +{ + // std::locale takes ownership of the pointer + std::locale loc(std::locale::classic(), new boost::posix_time::time_facet(pszFormat)); + std::stringstream ss; + ss.imbue(loc); + ss << boost::posix_time::from_time_t(nTime); + return ss.str(); +}