#include "net.h"
#include "init.h"
#include "util.h"
+#include "ntp.h"
#include "ui_interface.h"
#include "checkpoints.h"
#include <boost/format.hpp>
nConnectTimeout = nNewTimeout;
}
- // Continue to put "/P2SH/" in the coinbase to monitor
- // BIP16 support.
- // This can be removed eventually...
- const char* pszP2SH = "/P2SH/";
- COINBASE_FLAGS << std::vector<unsigned char>(pszP2SH, pszP2SH+strlen(pszP2SH));
-
+ // Put client version data into coinbase flags.
+ COINBASE_FLAGS << PROTOCOL_VERSION << DISPLAY_VERSION_MAJOR << DISPLAY_VERSION_MINOR << DISPLAY_VERSION_REVISION;
if (mapArgs.count("-paytxfee"))
{
CService addrProxy;
bool fProxy = false;
if (mapArgs.count("-proxy")) {
- addrProxy = CService(mapArgs["-proxy"], 9050);
+ addrProxy = CService(mapArgs["-proxy"], nSocksDefault);
if (!addrProxy.IsValid())
return InitError(strprintf(_("Invalid -proxy address: '%s'"), mapArgs["-proxy"].c_str()));
if (!mapArgs.count("-tor"))
addrOnion = addrProxy;
else
- addrOnion = CService(mapArgs["-tor"], 9050);
+ addrOnion = CService(mapArgs["-tor"], nSocksDefault);
if (!addrOnion.IsValid())
return InitError(strprintf(_("Invalid -tor address: '%s'"), mapArgs["-tor"].c_str()));
SetProxy(NET_TOR, addrOnion, 5);
if (fServer)
NewThread(ThreadRPCServer, NULL);
+ // ********************************************************* Step 12: add time data from four random NTP servers.
+ uiInterface.InitMessage(_("Synchronizing time through NTP..."));
+ printf("Synchronizing time through NTP...\n");
+ int i = 0;
+ while(i < 4) {
+ CNetAddr ip;
+ int64_t nTime = NtpGetTime(ip);
+
+ if (nTime > 0 && nTime != 2085978496) { // Skip the deliberately wrong timestamps
+ AddTimeData(ip, nTime);
+ printf("AddTimeData(%s, %" PRId64 ")\n", ip.ToString().c_str(), nTime);
+ }
+
+ i++;
+ }
+ uiInterface.InitMessage(_("Done"));
+ printf("Done\n");
// ********************************************************* Step 12: finished
uiInterface.InitMessage(_("Done loading"));