cryptogera/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-02-18 11:29:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,218 Commits 8 Branches 349 Tags
Commit Graph

66 Commits

Author SHA1 Message Date
Dwayne C. Litzenberger
8104274701 Fix phexdigits[255] is undefined. 2012-04-22 09:26:30 -04:00
Luke Dashjr
3374c3ef09 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/qt/bitcoin.cpp
	src/qt/bitcoingui.cpp
	src/qt/guiutil.cpp
	src/qt/guiutil.h
	src/qt/sendcoinsdialog.cpp
	src/qt/sendcoinsdialog.h
	src/util.cpp
 2012-04-15 21:15:48 -04:00
Luke Dashjr
79fc752b61 Merge branch '0.4.x' into 0.5.0.x 
Conflicts:
	src/keystore.h
 2012-04-15 21:05:54 -04:00
Wladimir J. van der Laan
85e975f379 fix warnings: array subscript is of type 'char' [-Wchar-subscripts] 2012-04-15 19:28:09 -04:00
Wladimir J. van der Laan
401db6d96b work around issue in boost::program_options that prevents from compiling in clang 2012-04-15 19:23:01 -04:00
Wladimir J. van der Laan
a6aee96c7e remove unused functions from util.h/util.cpp 2012-03-25 12:33:30 +02:00
Luke Dashjr
7013cc3d97 Merge branch '0.4.x' into 0.5.0.x 2012-03-03 13:59:19 -05:00
Luke Dashjr
88aa771536 Bugfix: Fix possible buffer overflow (#901) 
Upstream commit: 21ae37d (partial)
 2012-03-03 13:51:10 -05:00
Luke Dashjr
4fc8c042a2 Bugfix: Check return value of SHGetSpecialFolderPath in MyGetSpecialFolderPath 
Upstream commit: 21ae37d (partial)
 2012-03-03 13:45:44 -05:00
Gavin Andresen
6dd5ae41ac Merge branch '2012_02_getspecialfolderpath_overflow' of https://github.com/laanwj/bitcoin 2012-02-28 11:45:14 -05:00
Gavin Andresen
3f8cb2c565 Reworked QT settings 2012-02-26 23:38:28 +01:00
Wladimir J. van der Laan
21ae37d215 Simplify MyGetSpecialFolderPath and fix possible buffer overflow (#901) 2012-02-26 17:11:38 +01:00
Chris Moore
d64e124cf4 Fix #846. Allow negative options such as "nolisten=1" in bitcoin.conf as well as on the command line. 2012-02-16 12:08:58 -08:00
Luke Dashjr
b5d9c7d9fb Merge branch '0.4.x' into 0.5.0.x 
Conflicts:
	src/bitcoinrpc.cpp
 2012-02-07 22:46:07 -05:00
Luke Dashjr
4664aae3fe Update copyrights to 2012 for files modified this year 2012-02-07 22:30:50 -05:00
Gavin Andresen
882164196e Update all copyrights to 2012 2012-02-07 11:28:30 -05:00
Gavin Andresen
3ad9f8a70f New GetArg features: allow --, and booleans can be -foo or -nofoo 2012-02-07 09:14:31 -05:00
Gavin Andresen
3ae0735553 Unit tests for the GetArg() methods 2012-02-07 09:14:31 -05:00
Gavin Andresen
7bf8b7c25c -bip16 option (default: 1) to support / not support BIP 16. And bumped default BIP16 switchover date from Feb 15 to Mar 1 2012-02-06 16:27:05 -05:00
Matt Corallo
198fb229a4 Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock. 
If compiled with -DDEBUG_LOCKCONTENTION, Bitcoin will print to
debug.log each time a thread has to wait for a lock to continue.
 2012-01-21 16:16:28 -05:00
Gavin Andresen
922e8e2929 Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). 2012-01-13 10:22:23 -05:00
Pieter Wuille
67a42f929b Network stack refactor 
This introduces CNetAddr and CService, respectively wrapping an
(IPv6) IP address and an IP+port combination. This functionality used
to be part of CAddress, which also contains network flags and
connection attempt information. These extra fields are however not
always necessary.

These classes, along with logic for creating connections and doing
name lookups, are moved to netbase.{h,cpp}, which does not depend on
headers.h.

Furthermore, CNetAddr is mostly IPv6-ready, though IPv6
functionality is not yet enabled for the application itself.
 2012-01-06 18:55:37 +01:00
Luke Dashjr
eb2a10afd6 Merge branch '0.4.x' into 0.5.0.x 
Conflicts:
	src/util.cpp
 2012-01-03 12:19:48 -05:00
Gavin Andresen
84393f15b6 Fix issue #659, and cleanup wallet/command-line argument handling a bit 
Conflicts:
	src/init.cpp
	src/util.cpp
 2012-01-03 11:48:44 -05:00
Gavin Andresen
0fcf91ea1e Fix issue #659, and cleanup wallet/command-line argument handling a bit 2012-01-03 10:17:28 -05:00
Wladimir J. van der Laan
bde280b9a4 Revert "Use standard C99 (and Qt) types for 64-bit integers" 
This reverts commit 21d9f36781604e4ca9fc35dc65265593423b73e9.
 2011-12-21 22:33:19 +01:00
Luke Dashjr
21d9f36781 Use standard C99 (and Qt) types for 64-bit integers 2011-12-20 16:52:59 -05:00
Gavin Andresen
387c8e3c5b Merge pull request #673 from mndrix/less-time-data 
Store fewer time samples
 2011-12-20 08:55:55 -08:00
Gavin Andresen
26ce92b352 Use std::numeric_limits<> for typesafe INT_MAX/etc 2011-12-19 19:10:34 -05:00
Gavin Andresen
f8ded588a2 Implement BIP 14 : separate protocol version from client version 2011-12-19 10:24:23 -05:00
Michael Hendricks
1c4aab926e Retain only the most recent time samples 
Remembering all time samples makes nTimeOffset slow to respond to
system clock corrections.  For instance, I start my node with a system
clock that's 30 minutes slow and run it for a few days.  During that
time, I accumulate 10,000 offset samples with a median of 1800
seconds.  Now I correct my system clock.  Without this change, my node
must collect another 10,000 samples before nTimeOffset is correct
again.  With this change, I must only accumulate 100 samples to
correct the offset.

Storing unlimited time samples also allows an attacker with many IP
addresses (ex, a large botnet) to perform a memory exhaustion attack
against Bitcoin nodes.  The attacker sends a version message from each
IP to his target, consuming more of the target's memory each time.
Time samples are small, so this attack might be impractical under the
old code, but it's impossible with the new code.
 2011-12-01 17:28:14 -07:00
Michael Hendricks
5e1ddc4210 Only log time samples in debug mode 
The full list of time samples is rarely useful outside of debugging.
The node's time offset, however is useful for discovering local clock
drift, so it's displayed in all logging modes.
 2011-12-01 17:28:14 -07:00
Gavin Andresen
6853e627f1 Fix build on windows and mac 
Replaced all occurrences of #if* __WXMSW__ with WIN32,
and all occurrences of __WXMAC_OSX__ with MAC_OSX, and made
sure those are defined appropriately in the makefile and bitcoin-qt.pro.
 2011-10-07 11:02:21 -04:00
Wladimir J. van der Laan
20cff2ade4 remove possibility of 63 bit overflow in ParseMoney 2011-10-01 19:04:24 -04:00
Wladimir J. van der Laan
2f7f2a5fca remove possibility of 63 bit overflow in ParseMoney 
- also, add unit tests for various functions in util.cpp/util.h
 2011-10-01 17:29:46 +02:00
Pieter Wuille
4b603f1cd6 Inline base64 encoder/decoder 
This replaces the openssl-based base64 encoder and decoder with a more
efficient internal one. Tested against the rfc4648 test vectors.

Decoder is based on JoelKatz' version.
 2011-09-27 19:47:35 +02:00
JoelKatz
4e67a6216b Faster Base64 decoder. 2011-09-27 19:47:34 +02:00
Gavin Andresen
565c4771b6 Remove wxWidgets 
Makefiles now build bitcoind only.
qmake/make in top-level directory is used to build Bitcoin QT
Deleted almost all #ifdef GUI from the code (left one possibly controversial one)
Deleted xpm/ files.
 2011-09-26 10:04:04 -04:00
Gavin Andresen
17e2c24645 Merge pull request #517 from gavinandresen/DoSprevention 
Denial-of-service prevention
 2011-09-26 06:06:16 -07:00
Gavin Andresen
54d02f158d SetMockTime() for cleaner unit testing 2011-09-21 12:01:56 -04:00
Wladimir J. van der Laan
0a70a3f4d8 Merge branch 'master' of https://github.com/bitcoin/bitcoin 2011-09-03 09:09:34 +02:00
Gavin Andresen
c591cc50eb If compiled -DDEBUG_LOCKORDER and run with -debug, print out every mutex lock/unlock (helpful for debugging something-is-holding-a-mutex-too-long problems) 2011-09-02 12:01:42 -04:00
Wladimir J. van der Laan
7a15d4ff67 Merge branch 'master' of https://github.com/bitcoin/bitcoin 
Conflicts:
	src/main.cpp
 2011-09-02 17:35:30 +02:00
Gavin Andresen
b0243da77c Highlight mis-matching locks 2011-08-31 12:53:57 -04:00
Wladimir J. van der Laan
adce862c27 Merge branch 'master' of https://github.com/bitcoin/bitcoin 2011-08-22 14:43:37 +02:00
Gavin Andresen
865ed8a1e5 Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks 2011-08-17 10:22:28 -04:00
Wladimir J. van der Laan
b90c9ecb13 Merge branch 'master' of https://github.com/bitcoin/bitcoin 2011-08-16 10:28:24 +02:00
Matt Corallo
b2120e223a Unify copyright notices. 
To a variation on:
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2011 The Bitcoin developers
 2011-08-09 13:32:52 +02:00
Wladimir J. van der Laan
d421117620 Merge branch 'master' of https://github.com/bitcoin/bitcoin 2011-07-15 16:42:44 +02:00
Giel van Schijndel
f85c097449 fix warnings: using the result of an assignment as a condition without parentheses [-Wparentheses] 
Don't unnecessarily assign to variables within the *boolean* expression
of a conditional.

Signed-off-by: Giel van Schijndel <me@mortis.eu>
 2011-07-13 05:07:44 +02:00