Merge branch 'signbugs' of https://github.com/wizeman/bitcoin

Resolved minor conflict in main.cpp
2012-06-18 10:48:40 -04:00
parent 5204ca87e2 31ac53fbdc
commit 550c73f4c8
6 changed files with 148 additions and 9 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2475,7 +2475,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
                    static uint256 hashSalt;
                    if (hashSalt == 0)
                        hashSalt = GetRandHash();
-                    int64 hashAddr = addr.GetHash();
+                    uint64 hashAddr = addr.GetHash();
                    uint256 hashRand = hashSalt ^ (hashAddr<<32) ^ ((GetTime()+hashAddr)/(24*60*60));
                    hashRand = Hash(BEGIN(hashRand), END(hashRand));
                    multimap<uint256, CNode*> mapMix;