#include "util.h"
#include "sync.h"
-#include "strlcpy.h"
#include "version.h"
#include "ui_interface.h"
#include <boost/algorithm/string/join.hpp>
+#include <boost/algorithm/string/case_conv.hpp> // for to_lower()
+#include <boost/algorithm/string/predicate.hpp> // for startswith() and endswith()
// 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
#include <openssl/rand.h>
#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
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
int GetRandInt(int nMax)
{
- return GetRand(nMax);
+ return static_cast<int>(GetRand(nMax));
}
uint256 GetRandHash()
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());
char* p = buffer;
int limit = sizeof(buffer);
int ret;
- while (true)
+ for ( ; ; )
{
#ifndef _MSC_VER
va_list arg_ptr;
if (p != buffer)
delete[] p;
limit *= 2;
- p = new char[limit];
+ p = new(nothrow) char[limit];
if (p == NULL)
throw std::bad_alloc();
}
return;
string::size_type i1 = 0;
string::size_type i2;
- while (true)
+ for ( ; ; )
{
i2 = str.find(c, i1);
if (i2 == str.npos)
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;
}
{
// convert hex dump to vector
vector<unsigned char> vch;
- while (true)
+ for ( ; ; )
{
while (isspace(*psz))
psz++;
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:
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))
int mode = 0;
int left = 0;
- while (1)
+ for ( ; ; )
{
int dec = decode64_table[(unsigned char)*p];
if (dec == -1) break;
int mode = 0;
int left = 0;
- while (1)
+ for ( ; ; )
{
int dec = decode32_table[(unsigned char)*p];
if (dec == -1) break;
bool WildcardMatch(const char* psz, const char* mask)
{
- while (true)
+ for ( ; ; )
{
switch (*mask)
{
void createConf()
{
- srand(time(NULL));
+ srand(static_cast<unsigned int>(time(NULL)));
ofstream pConf;
#if BOOST_FILESYSTEM_VERSION >= 3
pConf << "rpcuser=user\nrpcpassword="
+ randomStrGen(15)
+ "\nrpcport=8344"
- + "\nport=7777"
+ "\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"
- + "\ntestnet=0";
+ + "\nrpcallowip=127.0.0.1";
pConf.close();
}
{
#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);
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<char>* vBuf = new vector <char>(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__);
}
}
}
// - Median of other nodes clocks
// - The user (asking the user to fix the system clock if the first two disagree)
//
-static int64_t nMockTime = 0; // For unit testing
+// 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_t nMockTimeIn)
-{
- nMockTime = nMockTimeIn;
-}
+// Trusted NTP offset or median of NTP samples.
+extern int64_t nNtpOffset;
-static int64_t nTimeOffset = 0;
+// Median of time samples given by other nodes.
+static int64_t nNodesOffset = INT64_MAX;
+// Select time offset:
int64_t GetTimeOffset()
{
- return nTimeOffset;
+ // If NTP and system clock are in agreement within 40 minutes, then use NTP.
+ if (abs64(nNtpOffset) < 40 * 60)
+ return nNtpOffset;
+
+ // If not, then choose between median peer time and system clock.
+ if (abs64(nNodesOffset) < 70 * 60)
+ return nNodesOffset;
+
+ return 0;
+}
+
+int64_t GetNodesOffset()
+{
+ return nNodesOffset;
}
int64_t GetAdjustedTime()
// 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;
+
+ // 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;
printf("%+" PRId64 " ", n);
printf("| ");
}
- printf("nTimeOffset = %+" PRId64 " (%+" PRId64 " 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)
}
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();
+}
git://git.novaco.in / novacoin.git / blobdiff