tree checksum vpatch file split hunks
all signers: mircea_popescu trinque ben_vulpes mod6 asciilifeform
antecedents: asciilifeform_ver_now_5_4_and_irc_is_gone_and_now_must_give_ip asciilifeform_add_verifyall_option
press order:
patch:
(175 . 6)(175 . 8)-
5 " -debug \t\t " + _("Output extra debugging information\n") +
6 " -caneat \t\t " + _("Permit the use of 'eatblock'\n") +
7 " -verifyall \t\t " + _("Forbid the skipping of ECDSA signature verification between checkpoints.\n") +
8 " -setverstring \t\t " + _("Set a custom version string.\n") +
9 " -setvernum \t\t " + _("Set a custom version number.\n") +
10 " -logtimestamps \t " + _("Prepend debug output with timestamp\n") +
11 " -printtoconsole \t " + _("Send trace/debug info to console instead of debug.log file\n") +
12 " -rpcuser=<user> \t " + _("Username for JSON-RPC connections\n") +
(199 . 6)(201 . 16)
14 fCanEat = GetBoolArg("-caneat");
15 fVerifyAll = GetBoolArg("-verifyall");
16
17 if (mapArgs.count("-setverstring"))
18 {
19 CLIENT_NAME = mapArgs["-setverstring"];
20 }
21
22 if (mapArgs.count("-setvernum"))
23 {
24 VERSION = atoi(mapArgs["-setvernum"]);
25 }
26
27 if (fDaemon)
28 fServer = true;
29 else
(0 . 0)(1 . 7)
34 #ifndef KNOBS_H
35 #define KNOBS_H
36
37 #define DEFAULT_CLIENT_NAME "therealbitcoin.org"
38 #define DEFAULT_CLIENT_VERSION 99999 /* 50400 */
39
40 #endif
- 929157D5E139336F38E98555F14FC125C4217C23EBA941086B648147E39FCEC9ECAB632567FC3295E58826FEDF6239D5CC0CD028F4E78FD56AE868B795D2DE02(81 . 6)(81 . 7)
45 init.h \
46 key.h \
47 keystore.h \
48 knobs.h \
49 main.h \
50 net.h \
51 noui.h \
- D18800DFC6ABC874CF8F8F3FDF9BBFA000B6611760C571EF64089894B3AC92303C8891AFF55D66648D6B8C0033BFAB31E40AA6562A0BC75E2A9C0950175A733B(360 . 7)(360 . 7)
56 CAddress addrMe = (fUseProxy || !addrLocalHost.IsRoutable() ? CAddress("0.0.0.0") : addrLocalHost);
57 RAND_bytes((unsigned char*)&nLocalHostNonce, sizeof(nLocalHostNonce));
58 PushMessage("version", VERSION, nLocalServices, nTime, addrYou, addrMe,
59 nLocalHostNonce, std::string(pszSubVer), nBestHeight);
60 nLocalHostNonce, FormatSubVersion(CLIENT_NAME, VERSION), nBestHeight);
61 }
62
63
- BC602BFBC512259FBB6C01F2C1633FF142966BF0752612E9A488CEE8A95DA7921B98ABE646E2F7002243F1981939372E0B53948646398E40525ED442C377F449(24 . 6)(24 . 9)- 3DCFE5F29728DCD34A6DFE23E9CD17E5F4A332A8D2E7444355106C8C63436CF54892424DF2018756C2E109463FD87728FC668A5A03914A4AA3F30BB90403B433
68
69 #include <sys/mman.h>
70 #include <limits.h>
71
72 #include "knobs.h"
73
74 /* This comes from limits.h if it's not defined there set a sane default */
75 #ifndef PAGESIZE
76 #include <unistd.h>
(41 . 9)(44 . 7)
78 class CAutoFile;
79 static const unsigned int MAX_SIZE = 0x02000000;
80
81 static const int VERSION = 50400;
82 static const char* pszSubVer = "";
83 static const bool VERSION_IS_BETA = true;
84 static int VERSION = DEFAULT_CLIENT_VERSION;
85
86 // Used to bypass the rule against non-const reference to temporary
87 // where it makes sense with wrappers such as CFlatData or CTxDB
(2 . 6)(2 . 7)- 44BD62E864ED9400105AEEA2E2EF6499F971577FD28B9C8DC52EF72DCDB4D4928168037CD7D7FCA718E5D5A2D4D7C19C65F5B45C87D814D6E24C0D014B307477
92 // Copyright (c) 2009-2012 The Bitcoin developers
93 // Distributed under the MIT/X11 software license, see the accompanying
94 // file license.txt or http://www.opensource.org/licenses/mit-license.php.
95 #include "knobs.h"
96 #include "headers.h"
97 #include "strlcpy.h"
98 #include <boost/program_options/detail/config_file.hpp>
(32 . 7)(33 . 7)
100 bool fNoListen = false;
101 bool fLogTimestamps = false;
102
103
104 std::string CLIENT_NAME(DEFAULT_CLIENT_NAME);
105
106
107 // Workaround for "multiple definition of `_tls_used'"
(889 . 14)(890 . 18)
109
110 string FormatFullVersion()
111 {
112 string s = FormatVersion(VERSION) + pszSubVer;
113 if (VERSION_IS_BETA) {
114 s += "-";
115 s += _("beta");
116 }
117 string s = FormatVersion(VERSION);
118 return s;
119 }
120
121 std::string FormatSubVersion(const std::string& name, int nClientVersion)
122 {
123 std::ostringstream ss;
124 ss << "/";
125 ss << name << ":" << FormatVersion(nClientVersion);
126 ss << "/";
127 return ss.str();
128 }
129
130
131
(121 . 6)(121 . 7)
136 extern std::string strMiscWarning;
137 extern bool fNoListen;
138 extern bool fLogTimestamps;
139 extern std::string CLIENT_NAME;
140
141 void RandAddSeed();
142 void RandAddSeedPerfmon();
(161 . 6)(162 . 7)
144 int64 GetAdjustedTime();
145 void AddTimeData(unsigned int ip, int64 nTime);
146 std::string FormatFullVersion();
147 std::string FormatSubVersion(const std::string& name, int nClientVersion);
148
149
150