Mercurial > hg > bitcoin
changeset 70:ddd4d4412606 draft
more addr message error checking
-- version 0.2.11
git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@83 1a98c847-1fd6-4fd8-948a-caf3550aa51b
| author | s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b> |
|---|---|
| date | Tue, 15 Jun 2010 18:26:32 +0000 |
| parents | 35eb98d96b55 |
| children | 8e64ac1aab17 |
| files | main.cpp net.cpp net.h serialize.h |
| diffstat | 4 files changed, 23 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/main.cpp +++ b/main.cpp @@ -1926,7 +1926,9 @@ { vector<CAddress> vAddr; vRecv >> vAddr; - if (vAddr.size() > 50000) // lower this to 1000 later + if (pfrom->nVersion < 200) // don't want addresses from 0.1.5 + return true; + if (vAddr.size() > 1000) return error("message addr size() = %d", vAddr.size()); // Store the new addresses @@ -2311,6 +2313,7 @@ if (pto->setAddrKnown.insert(addr).second) { vAddr.push_back(addr); + // receiver rejects addr messages larger than 1000 if (vAddr.size() >= 1000) { pto->PushMessage("addr", vAddr);
--- a/net.cpp +++ b/net.cpp @@ -968,9 +968,9 @@ if (addrLocalHost.IsRoutable() && !fUseProxy) { // Advertise our address - vector<CAddress> vAddrToSend; - vAddrToSend.push_back(addrLocalHost); - pnode->PushMessage("addr", vAddrToSend); + vector<CAddress> vAddr; + vAddr.push_back(addrLocalHost); + pnode->PushMessage("addr", vAddr); } // Get as many addresses as we can
--- a/net.h +++ b/net.h @@ -289,16 +289,24 @@ bool IsRoutable() const { - return !(GetByte(3) == 10 || - (GetByte(3) == 192 && GetByte(2) == 168) || - GetByte(3) == 127 || - GetByte(3) == 0 || - ip == 0 || - ip == INADDR_NONE); + return IsValid() && + !(GetByte(3) == 10 || + (GetByte(3) == 192 && GetByte(2) == 168) || + GetByte(3) == 127 || + GetByte(3) == 0); } bool IsValid() const { + // Clean up 3-byte shifted addresses caused by garbage in size field + // of addr messages from versions before 0.2.9 checksum. + // Two consecutive addr messages look like this: + // header20 vectorlen3 addr26 addr26 addr26 header20 vectorlen3 addr26 addr26 addr26... + // so if the first length field is garbled, it reads the second batch + // of addr misaligned by 3 bytes. + if (memcmp(pchReserved, pchIPv4+3, sizeof(pchIPv4)-3) == 0) + return false; + return (ip != 0 && ip != INADDR_NONE && port != htons(USHRT_MAX)); } @@ -619,7 +627,7 @@ // Known checking here is only to save space from duplicates. // SendMessages will filter it again for knowns that were added // after addresses were pushed. - if (!setAddrKnown.count(addr)) + if (addr.IsValid() && !setAddrKnown.count(addr)) vAddrToSend.push_back(addr); }