Merge branch 'master' of https://github.com/bitcoin/bitcoin
This commit is contained in:
commit
0961c2fc0d
19 changed files with 1344 additions and 977 deletions
|
@ -23,7 +23,7 @@ or are controversial.
|
|||
The master branch is regularly built and tested, but is not guaranteed
|
||||
to be completely stable. Tags are regularly created to indicate new
|
||||
official, stable release versions of Bitcoin. If you would like to
|
||||
help test the Bitcoin core, please contact QA@Bitcoin.org.
|
||||
help test the Bitcoin core, please contact QA@BitcoinTesting.org.
|
||||
|
||||
Feature branches are created when there are major new features being
|
||||
worked on by several people.
|
||||
|
|
30
contrib/gitian-downloader/bitcoin-download-config
Normal file
30
contrib/gitian-downloader/bitcoin-download-config
Normal file
|
@ -0,0 +1,30 @@
|
|||
---
|
||||
name: bitcoin
|
||||
urls:
|
||||
- http://bitcoin.org/bitcoin-latest-linux-gitian.zip
|
||||
rss:
|
||||
- url: http://sourceforge.net/api/file/index/project-id/244765/mtime/desc/limit/100/rss
|
||||
xpath: //item/link/text()
|
||||
pattern: bitcoin-\d+.\d+.\d+-linux-gitian.zip
|
||||
signers:
|
||||
0A82509767C7D4A5D14DA2301AE1D35043E08E54:
|
||||
weight: 40
|
||||
name: BlueMatt
|
||||
key: bluematt
|
||||
BF6273FAEF7CC0BA1F562E50989F6B3048A116B5:
|
||||
weight: 40
|
||||
name: Devrandom
|
||||
key: devrandom
|
||||
D762373D24904A3E42F33B08B9A408E71DAAC974:
|
||||
weight: 40
|
||||
name: Sipa
|
||||
key: sipa
|
||||
77E72E69DA7EE0A148C06B21B34821D4944DE5F7:
|
||||
weight: 40
|
||||
name: tcatm
|
||||
key: tcatm
|
||||
01CDF4627A3B88AAE4A571C87588242FBE38D3A8:
|
||||
weight: 40
|
||||
name: "Gavin Andresen"
|
||||
key: gavinandresen
|
||||
minimum_weight: 120
|
BIN
contrib/gitian-downloader/bluematt-key.pgp
Normal file
BIN
contrib/gitian-downloader/bluematt-key.pgp
Normal file
Binary file not shown.
BIN
contrib/gitian-downloader/devrandom-key.pgp
Normal file
BIN
contrib/gitian-downloader/devrandom-key.pgp
Normal file
Binary file not shown.
BIN
contrib/gitian-downloader/gavinandresen-key.pgp
Normal file
BIN
contrib/gitian-downloader/gavinandresen-key.pgp
Normal file
Binary file not shown.
BIN
contrib/gitian-downloader/sipa-key.pgp
Normal file
BIN
contrib/gitian-downloader/sipa-key.pgp
Normal file
Binary file not shown.
BIN
contrib/gitian-downloader/tcatm-key.pgp
Normal file
BIN
contrib/gitian-downloader/tcatm-key.pgp
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -1751,9 +1751,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
|
|||
{
|
||||
static map<unsigned int, vector<unsigned char> > mapReuseKey;
|
||||
RandAddSeedPerfmon();
|
||||
if (fDebug)
|
||||
if (fDebug) {
|
||||
printf("%s ", DateTimeStrFormat("%x %H:%M:%S", GetTime()).c_str());
|
||||
printf("received: %s (%d bytes)\n", strCommand.c_str(), vRecv.size());
|
||||
printf("received: %s (%d bytes)\n", strCommand.c_str(), vRecv.size());
|
||||
}
|
||||
if (mapArgs.count("-dropmessagestest") && GetRand(atoi(mapArgs["-dropmessagestest"])) == 0)
|
||||
{
|
||||
printf("dropmessagestest DROPPING RECV MESSAGE\n");
|
||||
|
@ -1945,7 +1946,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
|
|||
pfrom->AddInventoryKnown(inv);
|
||||
|
||||
bool fAlreadyHave = AlreadyHave(txdb, inv);
|
||||
printf(" got inventory: %s %s\n", inv.ToString().c_str(), fAlreadyHave ? "have" : "new");
|
||||
if (fDebug)
|
||||
printf(" got inventory: %s %s\n", inv.ToString().c_str(), fAlreadyHave ? "have" : "new");
|
||||
|
||||
if (!fAlreadyHave)
|
||||
pfrom->AskFor(inv);
|
||||
|
|
|
@ -1713,7 +1713,7 @@ void StartNode(void* parg)
|
|||
printf("Error: CreateThread(ThreadIRCSeed) failed\n");
|
||||
|
||||
// Send and receive from sockets, accept connections
|
||||
CreateThread(ThreadSocketHandler, NULL, true);
|
||||
CreateThread(ThreadSocketHandler, NULL);
|
||||
|
||||
// Initiate outbound connections
|
||||
if (!CreateThread(ThreadOpenConnections, NULL))
|
||||
|
|
14
src/net.h
14
src/net.h
|
@ -282,9 +282,10 @@ public:
|
|||
nHeaderStart = vSend.size();
|
||||
vSend << CMessageHeader(pszCommand, 0);
|
||||
nMessageStart = vSend.size();
|
||||
if (fDebug)
|
||||
if (fDebug) {
|
||||
printf("%s ", DateTimeStrFormat("%x %H:%M:%S", GetTime()).c_str());
|
||||
printf("sending: %s ", pszCommand);
|
||||
printf("sending: %s ", pszCommand);
|
||||
}
|
||||
}
|
||||
|
||||
void AbortMessage()
|
||||
|
@ -295,7 +296,9 @@ public:
|
|||
nHeaderStart = -1;
|
||||
nMessageStart = -1;
|
||||
cs_vSend.Leave();
|
||||
printf("(aborted)\n");
|
||||
|
||||
if (fDebug)
|
||||
printf("(aborted)\n");
|
||||
}
|
||||
|
||||
void EndMessage()
|
||||
|
@ -324,8 +327,9 @@ public:
|
|||
memcpy((char*)&vSend[nHeaderStart] + offsetof(CMessageHeader, nChecksum), &nChecksum, sizeof(nChecksum));
|
||||
}
|
||||
|
||||
printf("(%d bytes) ", nSize);
|
||||
printf("\n");
|
||||
if (fDebug) {
|
||||
printf("(%d bytes)\n", nSize);
|
||||
}
|
||||
|
||||
nHeaderStart = -1;
|
||||
nMessageStart = -1;
|
||||
|
|
Loading…
Reference in a new issue