X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Finit.cpp;h=b1dec89825acb92fc03145b461bbc370cb5ebea4;hb=f94158ea104e435166e6e6074f0d941b903267eb;hp=2e9193d1cf2610384dae475d44dbb31e84ffdaf0;hpb=134e33628129f3e5c07a1f6651306e5984b106f9;p=novacoin.git diff --git a/src/init.cpp b/src/init.cpp index 2e9193d..b1dec89 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -10,7 +10,6 @@ #include "util.h" #include "ui_interface.h" #include "checkpoints.h" -#include "zerocoin/ZeroTest.h" #include #include #include @@ -32,13 +31,16 @@ CClientUIInterface uiInterface; std::string strWalletFileName; bool fConfChange; unsigned int nNodeLifespan; -unsigned int nDerivationMethodIndex; unsigned int nMinerSleep; bool fUseFastIndex; bool fUseFastStakeMiner; bool fUseMemoryLog; enum Checkpoints::CPMode CheckpointsMode; +// Ping and address broadcast intervals +extern int64_t nPingInterval; +extern int64_t nBroadcastInterval; + ////////////////////////////////////////////////////////////////////////////// // // Shutdown @@ -84,6 +86,7 @@ void Shutdown(void* parg) if (fFirstThread) { fShutdown = true; + fRequestShutdown = true; nTransactionsUpdated++; // CTxDB().Close(); bitdb.Flush(false); @@ -242,6 +245,7 @@ std::string HelpMessage() " -proxy= " + _("Connect through socks proxy") + "\n" + " -socks= " + _("Select the version of socks proxy to use (4-5, default: 5)") + "\n" + " -tor= " + _("Use proxy to reach tor hidden services (default: same as -proxy)") + "\n" + " -torname= " + _("Send the specified hidden service name when connecting to Tor nodes (default: none)") + "\n" " -dns " + _("Allow DNS lookups for -addnode, -seednode and -connect") + "\n" + " -port= " + _("Listen for connections on (default: 7777 or testnet: 17777)") + "\n" + " -maxconnections= " + _("Maintain at most connections to peers (default: 125)") + "\n" + @@ -370,24 +374,30 @@ bool AppInit2() // ********************************************************* Step 2: parameter interactions - nNodeLifespan = GetArg("-addrlifespan", 7); + nNodeLifespan = (unsigned int)(GetArg("-addrlifespan", 7)); fUseFastIndex = GetBoolArg("-fastindex", true); fUseMemoryLog = GetBoolArg("-memorylog", true); - nMinerSleep = GetArg("-minersleep", 500); + nMinerSleep = (unsigned int)(GetArg("-minersleep", 500)); + + // Ping and address broadcast intervals + nPingInterval = max(10 * 60, GetArg("-keepalive", 30 * 60)); + + nBroadcastInterval = max(6 * 60 * 60, GetArg("-addrsetlifetime", 24 * 60 * 60)); CheckpointsMode = Checkpoints::STRICT; std::string strCpMode = GetArg("-cppolicy", "strict"); - if(strCpMode == "strict") + if(strCpMode == "strict") { CheckpointsMode = Checkpoints::STRICT; + } - if(strCpMode == "advisory") + if(strCpMode == "advisory") { CheckpointsMode = Checkpoints::ADVISORY; + } - if(strCpMode == "permissive") + if(strCpMode == "permissive") { CheckpointsMode = Checkpoints::PERMISSIVE; - - nDerivationMethodIndex = 0; + } fTestNet = GetBoolArg("-testnet"); if (fTestNet) { @@ -430,7 +440,7 @@ bool AppInit2() // ********************************************************* Step 3: parameter-to-internal-flags // -par=0 means autodetect, but nScriptCheckThreads==0 means no concurrency - nScriptCheckThreads = GetArg("-par", 0); + nScriptCheckThreads = (int)(GetArg("-par", 0)); if (nScriptCheckThreads == 0) nScriptCheckThreads = boost::thread::hardware_concurrency(); if (nScriptCheckThreads <= 1) @@ -469,7 +479,7 @@ bool AppInit2() if (mapArgs.count("-timeout")) { - int nNewTimeout = GetArg("-timeout", 5000); + int nNewTimeout = (int)(GetArg("-timeout", 5000)); if (nNewTimeout > 0 && nNewTimeout < 600000) nConnectTimeout = nNewTimeout; } @@ -500,7 +510,7 @@ bool AppInit2() // ********************************************************* Step 4: application initialization: dir lock, daemonize, pidfile, debug log std::string strDataDir = GetDataDir().string(); - std::string strWalletFileName = GetArg("-wallet", "wallet.dat"); + strWalletFileName = GetArg("-wallet", "wallet.dat"); // strWalletFileName must be a plain filename without a directory if (strWalletFileName != boost::filesystem::basename(strWalletFileName) + boost::filesystem::extension(strWalletFileName)) @@ -556,7 +566,7 @@ bool AppInit2() NewThread(ThreadScriptCheck, NULL); } - int64 nStart; + int64_t nStart; // ********************************************************* Step 5: verify database integrity @@ -594,7 +604,7 @@ bool AppInit2() // ********************************************************* Step 6: network initialization - int nSocksVersion = GetArg("-socks", 5); + int nSocksVersion = (int)(GetArg("-socks", 5)); if (nSocksVersion != 4 && nSocksVersion != 5) return InitError(strprintf(_("Unknown -socks proxy version requested: %i"), nSocksVersion)); @@ -653,12 +663,21 @@ bool AppInit2() } // see Step 2: parameter interactions for more information about these - fNoListen = !GetBoolArg("-listen", true); - fDiscover = GetBoolArg("-discover", true); - fNameLookup = GetBoolArg("-dns", true); + if (!IsLimited(NET_IPV4) || !IsLimited(NET_IPV6)) + { + fNoListen = !GetBoolArg("-listen", true); + fDiscover = GetBoolArg("-discover", true); + fNameLookup = GetBoolArg("-dns", true); #ifdef USE_UPNP - fUseUPnP = GetBoolArg("-upnp", USE_UPNP); + fUseUPnP = GetBoolArg("-upnp", USE_UPNP); #endif + } else { + // Don't listen, discover addresses or search for nodes if IPv4 and IPv6 networking is disabled. + fNoListen = true; + fDiscover = fNameLookup = fUseUPnP = false; + SoftSetBoolArg("-irc", false); + SoftSetBoolArg("-dnsseed", false); + } bool fBound = false; if (!fNoListen) @@ -680,11 +699,27 @@ bool AppInit2() #endif if (!IsLimited(NET_IPV4)) fBound |= Bind(CService(inaddr_any, GetListenPort()), !fBound); + } if (!fBound) return InitError(_("Failed to listen on any port. Use -listen=0 if you want this.")); } + // If Tor is reachable then listen on loopback interface, + // to allow allow other users reach you through the hidden service + if (!IsLimited(NET_TOR) && mapArgs.count("-torname")) { + std::string strError; + struct in_addr inaddr_loopback; + inaddr_loopback.s_addr = htonl(INADDR_LOOPBACK); + +#ifdef USE_IPV6 + if (!BindListenPort(CService(in6addr_loopback, GetListenPort()), strError)) + return InitError(strError); +#endif + if (!BindListenPort(CService(inaddr_loopback, GetListenPort()), strError)) + return InitError(strError); + } + if (mapArgs.count("-externalip")) { BOOST_FOREACH(string strAddr, mapMultiArgs["-externalip"]) { @@ -697,7 +732,7 @@ bool AppInit2() if (mapArgs.count("-reservebalance")) // ppcoin: reserve balance amount { - int64 nReserveBalance = 0; + int64_t nReserveBalance = 0; if (!ParseMoney(mapArgs["-reservebalance"], nReserveBalance)) { InitError(_("Invalid amount for -reservebalance=")); @@ -732,12 +767,35 @@ bool AppInit2() return false; } - uiInterface.InitMessage(_("Loading block index...")); + printf("Loading block index...\n"); - nStart = GetTimeMillis(); - if (!LoadBlockIndex()) - return InitError(_("Error loading blkindex.dat")); + bool fLoaded = false; + while (!fLoaded) { + std::string strLoadError; + uiInterface.InitMessage(_("Loading block index...")); + + nStart = GetTimeMillis(); + do { + try { + UnloadBlockIndex(); + + if (!LoadBlockIndex()) { + strLoadError = _("Error loading block database"); + break; + } + } catch(std::exception &e) { + strLoadError = _("Error opening block database"); + break; + } + fLoaded = true; + } while(false); + + if (!fLoaded) { + // TODO: suggest reindex here + return InitError(strLoadError); + } + } // as LoadBlockIndex can take several minutes, it's possible the user // requested to kill bitcoin-qt during the last operation. If so, exit. @@ -747,7 +805,7 @@ bool AppInit2() printf("Shutdown requested. Exiting.\n"); return false; } - printf(" block index %15"PRI64d"ms\n", GetTimeMillis() - nStart); + printf(" block index %15" PRId64 "ms\n", GetTimeMillis() - nStart); if (GetBoolArg("-printblockindex") || GetBoolArg("-printblocktree")) { @@ -778,16 +836,6 @@ bool AppInit2() return false; } - // ********************************************************* Testing Zerocoin - - - if (GetBoolArg("-zerotest", false)) - { - printf("\n=== ZeroCoin tests start ===\n"); - Test_RunAllTests(); - printf("=== ZeroCoin tests end ===\n\n"); - } - // ********************************************************* Step 8: load wallet uiInterface.InitMessage(_("Loading wallet...")); @@ -820,7 +868,7 @@ bool AppInit2() if (GetBoolArg("-upgradewallet", fFirstRun)) { - int nMaxVersion = GetArg("-upgradewallet", 0); + int nMaxVersion = (int)(GetArg("-upgradewallet", 0)); if (nMaxVersion == 0) // the -upgradewallet without argument case { printf("Performing wallet upgrade to %i\n", FEATURE_LATEST); @@ -848,7 +896,7 @@ bool AppInit2() } printf("%s", strErrors.str().c_str()); - printf(" wallet %15"PRI64d"ms\n", GetTimeMillis() - nStart); + printf(" wallet %15" PRId64 "ms\n", GetTimeMillis() - nStart); RegisterWallet(pwalletMain); @@ -868,7 +916,7 @@ bool AppInit2() printf("Rescanning last %i blocks (from block %i)...\n", pindexBest->nHeight - pindexRescan->nHeight, pindexRescan->nHeight); nStart = GetTimeMillis(); pwalletMain->ScanForWalletTransactions(pindexRescan, true); - printf(" rescan %15"PRI64d"ms\n", GetTimeMillis() - nStart); + printf(" rescan %15" PRId64 "ms\n", GetTimeMillis() - nStart); } // ********************************************************* Step 9: import blocks @@ -910,7 +958,7 @@ bool AppInit2() printf("Invalid or missing peers.dat; recreating\n"); } - printf("Loaded %i addresses from peers.dat %"PRI64d"ms\n", + printf("Loaded %i addresses from peers.dat %" PRId64 "ms\n", addrman.size(), GetTimeMillis() - nStart); // ********************************************************* Step 11: start node @@ -921,11 +969,11 @@ bool AppInit2() RandAddSeedPerfmon(); //// debug print - printf("mapBlockIndex.size() = %"PRIszu"\n", mapBlockIndex.size()); + printf("mapBlockIndex.size() = %" PRIszu "\n", mapBlockIndex.size()); printf("nBestHeight = %d\n", nBestHeight); - printf("setKeyPool.size() = %"PRIszu"\n", pwalletMain->setKeyPool.size()); - printf("mapWallet.size() = %"PRIszu"\n", pwalletMain->mapWallet.size()); - printf("mapAddressBook.size() = %"PRIszu"\n", pwalletMain->mapAddressBook.size()); + printf("setKeyPool.size() = %" PRIszu "\n", pwalletMain->setKeyPool.size()); + printf("mapWallet.size() = %" PRIszu "\n", pwalletMain->mapWallet.size()); + printf("mapAddressBook.size() = %" PRIszu "\n", pwalletMain->mapAddressBook.size()); if (!NewThread(StartNode, NULL)) InitError(_("Error: could not start node"));