Gavin Andresen
5fa83965f2
Merge branch 'patch-5' of https://github.com/xanatos/bitcoin
2012-06-28 15:25:48 -04:00
Gavin Andresen
1b71f82e38
Merge branch 'patch-3' of https://github.com/xanatos/bitcoin
2012-06-28 15:24:35 -04:00
Matt Corallo
460d878613
Fix build error.
2012-06-28 19:31:22 +02:00
Matt Corallo
4e97a9d9eb
Lock vnThreadsRunning[THREAD_RPCHANDLER].
2012-06-28 18:34:11 +02:00
Matt Corallo
7cf3d2ccb9
Use a rpc-specific queue to tell asio connections to shutdown.
2012-06-28 18:32:32 +02:00
Matt Corallo
18c4beb05b
Revert "*Always* send a shutdown signal to enable custom shutdown actions"
...
This reverts commit 896899e0d6
.
2012-06-28 15:52:45 +02:00
Jeff Garzik
e75acc006e
Merge pull request #1511 from jgarzik/quieten2
...
Quieten 'getdata' P2P message output
2012-06-27 09:06:59 -07:00
Pieter Wuille
abbb9a829c
Merge pull request #1347 from rebroad/FixAlreadyAskedFor
...
mapAlreadyAskedFor gets additions when AlreadyHave()
2012-06-27 08:06:57 -07:00
Pieter Wuille
6c88568fef
Merge pull request #973 from TheBlueMatt/diffsendbuffer
...
Stop processing messages on full send buffer and dont disconnect.
2012-06-27 07:49:28 -07:00
Pieter Wuille
4a52c187d3
Merge pull request #457 from muggenhor/async-ipv6-rpc
...
IPv6 RPC using asynchronously accepted connections
2012-06-27 07:48:38 -07:00
Matt Corallo
9d6cd04b3b
Stop processing messages on full send buffer and dont disconnect.
...
Also decrease default send/receive buffer sizes from 10 to 5 mb
as this patch makes it easy for a node to fill both instead of
only send.
2012-06-27 15:31:34 +02:00
Wladimir J. van der Laan
bcf0f41171
Merge pull request #1519 from Diapolo/GUI_locale_selection
...
GUI: change language selection format to "language - country (locale name)"
2012-06-27 03:37:33 -07:00
Wladimir J. van der Laan
a95a0ab569
Merge pull request #1516 from Diapolo/GUI_projectfile
...
small updates to Bitcoin-Qt project file
2012-06-27 03:35:41 -07:00
Philip Kaufmann
2943f60811
GUI: change language selection format
...
- display as "language - country (locale name)", when locale name consists of 2 parts
- display as "language (locale name)", when locale name consists of 1 part
2012-06-26 16:14:25 +02:00
Jeff Garzik
8a6ea5d687
Merge pull request #1520 from TheBlueMatt/debian
...
Update contrib/debian and remove system json_spirit patch.
2012-06-25 15:04:10 -07:00
Matt Corallo
3563824c60
Update contrib/debian and remove system json_spirit patch.
...
That patch has been broken for a long, long time (forever?) and
doesn't make sense.
2012-06-25 23:59:19 +02:00
Philip Kaufmann
82ec7d5542
small updates to Bitcoin-Qt project file
...
- add noui.cpp to SOURCES (to see / edit the file)
- re-word a comment and remove a space
2012-06-25 16:36:25 +02:00
Wladimir J. van der Laan
2849d0661d
Merge pull request #1501 from fanquake/master
...
QT to Qt
2012-06-25 06:49:59 -07:00
Gavin Andresen
1282c8653e
Checkpoint at block 185333 (and remove a couple of intermediate checkpoints)
2012-06-25 09:26:14 -04:00
Michael Ford
160eb23b0e
Add Bitcoin dev Copyright
2012-06-25 12:28:29 +08:00
Michael Ford
e4ebe82ee2
Update comments
2012-06-25 12:26:52 +08:00
Pieter Wuille
6cef700203
Merge pull request #1517 from Diapolo/fix_comment
...
fix a comment to correctly use -upgradewallet
2012-06-24 09:10:03 -07:00
Philip Kaufmann
a8c20ea946
fix a comment to correctly use -upgradewallet
2012-06-24 18:08:27 +02:00
Jeff Garzik
d887f54494
Document -debugnet option in command line help.
...
Fixes #1507
2012-06-24 10:38:02 -04:00
Giel van Schijndel
5b14622110
On Windows link with mswsock
, it being required (indirectly) by RPC code
...
Signed-off-by: Giel van Schijndel <me@mortis.eu>
2012-06-24 15:12:26 +02:00
Giel van Schijndel
ad25804feb
Cancel outstanding listen ops for RPC when shutting down
...
Use Boost's signal2 slot tracking mechanism to cancel any (still open)
listening sockets when receiving a shutdown signal.
Signed-off-by: Giel van Schijndel <me@mortis.eu>
2012-06-24 15:12:15 +02:00
Giel van Schijndel
415a87ef36
Merge branch 'master' into async-ipv6-rpc
2012-06-24 12:34:15 +02:00
Gregory Maxwell
817ee0d826
Merge pull request #1174 from sipa/torhs
...
Tor hidden service support
2012-06-23 19:21:13 -07:00
Gregory Maxwell
0ae2ac5431
Merge pull request #1503 from gmaxwell/testnet_tweaks
...
Remove some rule differences which aren't needed with testnet3.
2012-06-23 19:02:55 -07:00
Jeff Garzik
983e4bdef0
Quieten 'getdata' P2P message output
...
Output one message per getdata, not one message per 'inv' entry.
2012-06-23 21:38:33 -04:00
xanatos
3948eb0c54
Changed a comment about a QVariant type
2012-06-23 17:29:34 +03:00
Pieter Wuille
d789a3f140
Some documentation about tor
2012-06-23 01:11:38 +02:00
Pieter Wuille
863e995b79
Debug version messages
2012-06-23 01:11:38 +02:00
Pieter Wuille
54ce3bad64
Add -tor and related configuration
2012-06-23 01:11:38 +02:00
Pieter Wuille
d077dd2a6e
Rewrite CNetAddr::GetReachabilityFrom()
...
Add support for Tor/I2P networks, and make code more readable.
2012-06-23 01:11:38 +02:00
Pieter Wuille
70f7f00385
Node support for Tor hidden services
...
This commit adds support for .onion addresses (mapped into the IPv6
by using OnionCat's range and encoding), and the ability to connect
to them via a SOCKS5 proxy.
2012-06-23 01:11:32 +02:00
Jeff Garzik
d62a1947be
Merge pull request #1458 from jgarzik/tracenet
...
Introduce -tracenet option, thereby quieting some redundant debug messages
2012-06-22 10:13:31 -07:00
Jeff Garzik
d07eaba195
Introduce -debugnet option, thereby quieting some redundant debug messages
...
Prior to this change, each TX typically generated 3+ debug messages,
askfor tx 8644cc97480ba1537214 0
sending getdata: tx 8644cc97480ba1537214
askfor tx 8644cc97480ba1537214 1339640761000000
askfor tx 8644cc97480ba1537214 1339640881000000
CTxMemPool::accept() : accepted 8644cc9748 (poolsz 6857)
After this change, there is only one message for each valid TX received
CTxMemPool::accept() : accepted 22a73c5d8c (poolsz 42)
and two messages for each orphan tx received
ERROR: FetchInputs() : 673dc195aa mempool Tx prev not found 1e439346fc
stored orphan tx 673dc195aa (mapsz 19)
The -debugnet option, or its superset -debug, will restore the full debug
output.
2012-06-22 13:11:57 -04:00
Jeff Garzik
cb1fcde2f4
Merge pull request #1502 from jgarzik/getrawmempool
...
RPC: add 'getrawmempool', listing all transaction ids in memory pool
2012-06-22 09:59:19 -07:00
Gregory Maxwell
e6332751c6
Remove some rule differences which aren't needed with testnet3.
...
Bip16 and Bip30 had early activation dates for testnet, but
with the reset they might as well use the same dates as
the main network.
2012-06-22 11:50:52 -04:00
Jeff Garzik
25d5c19522
RPC: add 'getrawmempool', listing all transaction ids in memory pool
2012-06-22 11:43:34 -04:00
Gregory Maxwell
a3869547e5
Merge pull request #1495 from Diapolo/fix_CKey_mem_leak
...
fix a memory leak in key.cpp
2012-06-22 08:38:48 -07:00
Pieter Wuille
e0be8da392
Unit tests for base32 encode/decode
2012-06-22 17:19:28 +02:00
Pieter Wuille
c4c99ade65
Base32 encoding/decoding
2012-06-22 17:19:28 +02:00
xanatos
d89f06c1ae
Small fix to rpc_tests
2012-06-22 10:02:43 +03:00
Gregory Maxwell
a08e182698
Merge pull request #1490 from luke-jr/gd_ljr_key
...
gitian-downloader: Update luke-jr's key
2012-06-21 14:25:17 -07:00
Gavin Andresen
9700f212ad
Merge pull request #1496 from xanatos/patch-2
...
= instead of == in multisig_tests.cpp
2012-06-21 12:51:05 -07:00
xanatos
fdfdb5cd7d
= instead of == in multisig_tests.cpp
2012-06-21 21:37:49 +03:00
Philip Kaufmann
a3d12f445a
fix a memory leak in key.cpp
...
- add EC_KEY_free() in CKey::Reset() when pkey != NULL
- init pkey with NULL in CKey constructor
2012-06-21 14:43:13 +02:00
Michael Ford
b768a38b76
Update master
2012-06-21 09:36:20 +08:00