Merge pull request #951 from TheBlueMatt/headerslimit

Limit getheaders to a hard 2000.

diff --combined src/main.cpp
index d795ca1,100cf75..ca75b9f
--- 1/src/main.cpp
--- 2/src/main.cpp
+++ b/src/main.cpp
@@@ -1278,9 -1278,12 +1278,9 @@@ bool CBlock::ConnectBlock(CTxDB& txdb, 
                          return false;
          }
  
 -    // To avoid being on the short end of a block-chain split,
 -    // don't do secondary validation of pay-to-script-hash transactions
 -    // until blocks with timestamps after paytoscripthashtime (see init.cpp for default).
 -    // This code can be removed once a super-majority of the network has upgraded.
 -    int64 nEvalSwitchTime = GetArg("-paytoscripthashtime", std::numeric_limits<int64_t>::max());
 -    bool fStrictPayToScriptHash = (pindex->nTime >= nEvalSwitchTime);
 +    // BIP16 didn't become active until Apr 1 2012 (Feb 15 on testnet)
 +    int64 nBIP16SwitchTime = fTestNet ? 1329264000 : 1333238400;
 +    bool fStrictPayToScriptHash = (pindex->nTime >= nBIP16SwitchTime);
  
      //// issue here: it doesn't know the version
      unsigned int nTxPos = pindex->nBlockPos + ::GetSerializeSize(CBlock(), SER_DISK) - 1 + GetSizeOfCompactSize(vtx.size());
@@@ -1379,9 -1382,6 +1379,9 @@@ bool static Reorganize(CTxDB& txdb, CBl
          vConnect.push_back(pindex);
      reverse(vConnect.begin(), vConnect.end());
  
 +    printf("REORGANIZE: Disconnect %i blocks; %s..%s\n", vDisconnect.size(), pfork->GetBlockHash().ToString().substr(0,20).c_str(), pindexBest->GetBlockHash().ToString().substr(0,20).c_str());
 +    printf("REORGANIZE: Connect %i blocks; %s..%s\n", vConnect.size(), pfork->GetBlockHash().ToString().substr(0,20).c_str(), pindexNew->GetBlockHash().ToString().substr(0,20).c_str());
 +
      // Disconnect shorter branch
      vector<CTransaction> vResurrect;
      BOOST_FOREACH(CBlockIndex* pindex, vDisconnect)
@@@ -1390,7 -1390,7 +1390,7 @@@
          if (!block.ReadFromDisk(pindex))
              return error("Reorganize() : ReadFromDisk for disconnect failed");
          if (!block.DisconnectBlock(txdb, pindex))
 -            return error("Reorganize() : DisconnectBlock failed");
 +            return error("Reorganize() : DisconnectBlock %s failed", pindex->GetBlockHash().ToString().substr(0,20).c_str());
  
          // Queue memory transactions to resurrect
          BOOST_FOREACH(const CTransaction& tx, block.vtx)
@@@ -1410,7 -1410,7 +1410,7 @@@
          {
              // Invalid block
              txdb.TxnAbort();
 -            return error("Reorganize() : ConnectBlock failed");
 +            return error("Reorganize() : ConnectBlock %s failed", pindex->GetBlockHash().ToString().substr(0,20).c_str());
          }
  
          // Queue memory transactions to delete
@@@ -1442,7 -1442,8 +1442,7 @@@
      BOOST_FOREACH(CTransaction& tx, vDelete)
          tx.RemoveFromMemoryPool();
  
 -    printf("REORGANIZE: Disconnected %i blocks; %s..%s\n", vDisconnect.size(), pfork->GetBlockHash().ToString().substr(0,20).c_str(), pindexBest->GetBlockHash().ToString().substr(0,20).c_str());
 -    printf("REORGANIZE: Connected %i blocks; %s..%s\n", vConnect.size(), pfork->GetBlockHash().ToString().substr(0,20).c_str(), pindexNew->GetBlockHash().ToString().substr(0,20).c_str());
 +    printf("REORGANIZE: done\n");
  
      return true;
  }
@@@ -1456,9 -1457,10 +1456,9 @@@ runCommand(std::string strCommand
          printf("runCommand error: system(%s) returned %d\n", strCommand.c_str(), nErr);
  }
  
 +// Called from inside SetBestChain: attaches a block to the new best chain being built
  bool CBlock::SetBestChainInner(CTxDB& txdb, CBlockIndex *pindexNew)
  {
 -    assert(pindexNew->pprev == pindexBest);
 -
      uint256 hash = GetHash();
  
      // Adding to current best branch
@@@ -1705,11 -1707,10 +1705,11 @@@ bool CBlock::AcceptBlock(
          return error("AcceptBlock() : AddToBlockIndex failed");
  
      // Relay inventory, but don't relay old inventory during initial block download
 +    int nBlockEstimate = Checkpoints::GetTotalBlocksEstimate();
      if (hashBestChain == hash)
          CRITICAL_BLOCK(cs_vNodes)
              BOOST_FOREACH(CNode* pnode, vNodes)
 -                if (nBestHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : 140700))
 +                if (nBestHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : nBlockEstimate))
                      pnode->PushInventory(CInv(MSG_BLOCK, hash));
  
      return true;
@@@ -2235,18 -2236,11 +2235,18 @@@ bool static ProcessMessage(CNode* pfrom
              }
  
              // Get recent addresses
 -            if (pfrom->nVersion >= 31402 || mapAddresses.size() < 1000)
 +            if (pfrom->nVersion >= 31402 || addrman.size() < 1000)
              {
                  pfrom->PushMessage("getaddr");
                  pfrom->fGetAddr = true;
              }
 +            addrman.Good(pfrom->addr);
 +        } else {
 +            if (((CNetAddr)pfrom->addr) == (CNetAddr)addrFrom)
 +            {
 +                addrman.Add(addrFrom, addrFrom);
 +                addrman.Good(addrFrom);
 +            }
          }
  
          // Ask the first connected node for block updates
@@@ -2292,7 -2286,7 +2292,7 @@@
          vRecv >> vAddr;
  
          // Don't want addr from older versions unless seeding
 -        if (pfrom->nVersion < 31402 && mapAddresses.size() > 1000)
 +        if (pfrom->nVersion < 31402 && addrman.size() > 1000)
              return true;
          if (vAddr.size() > 1000)
          {
@@@ -2301,6 -2295,8 +2301,6 @@@
          }
  
          // Store the new addresses
 -        CAddrDB addrDB;
 -        addrDB.TxnBegin();
          int64 nNow = GetAdjustedTime();
          int64 nSince = nNow - 10 * 60;
          BOOST_FOREACH(CAddress& addr, vAddr)
@@@ -2312,6 -2308,7 +2312,6 @@@
                  continue;
              if (addr.nTime <= 100000000 || addr.nTime > nNow + 10 * 60)
                  addr.nTime = nNow - 5 * 24 * 60 * 60;
 -            AddAddress(addr, 2 * 60 * 60, &addrDB);
              pfrom->AddAddressKnown(addr);
              if (addr.nTime > nSince && !pfrom->fGetAddr && vAddr.size() <= 10 && addr.IsRoutable())
              {
@@@ -2343,7 -2340,7 +2343,7 @@@
                  }
              }
          }
 -        addrDB.TxnCommit();  // Save addresses (it's ok if this fails)
 +        addrman.Add(vAddr, pfrom->addr, 2 * 60 * 60);
          if (vAddr.size() < 1000)
              pfrom->fGetAddr = false;
      }
@@@ -2360,10 -2357,8 +2360,10 @@@
          }
  
          CTxDB txdb("r");
 -        BOOST_FOREACH(const CInv& inv, vInv)
 +        for (int nInv = 0; nInv < vInv.size(); nInv++)
          {
 +            const CInv &inv = vInv[nInv];
 +
              if (fShutdown)
                  return true;
              pfrom->AddInventoryKnown(inv);
@@@ -2372,12 -2367,9 +2372,12 @@@
              if (fDebug)
                  printf("  got inventory: %s  %s\n", inv.ToString().c_str(), fAlreadyHave ? "have" : "new");
  
 -            if (!fAlreadyHave)
 +            // Always request the last block in an inv bundle (even if we already have it), as it is the
 +            // trigger for the other side to send further invs. If we are stuck on a (very long) side chain,
 +            // this is necessary to connect earlier received orphan blocks to the chain again.
 +            if (!fAlreadyHave || (inv.type == MSG_BLOCK && nInv==vInv.size()-1))
                  pfrom->AskFor(inv);
 -            else if (inv.type == MSG_BLOCK && mapOrphanBlocks.count(inv.hash))
 +            if (inv.type == MSG_BLOCK && mapOrphanBlocks.count(inv.hash))
                  pfrom->PushGetBlocks(pindexBest, GetOrphanRoot(mapOrphanBlocks[inv.hash]));
  
              // Track requests for our stuff
@@@ -2504,8 -2496,8 +2504,8 @@@
          }
  
          vector<CBlock> vHeaders;
-         int nLimit = 2000 + locator.GetDistanceBack();
-         printf("getheaders %d to %s limit %d\n", (pindex ? pindex->nHeight : -1), hashStop.ToString().substr(0,20).c_str(), nLimit);
+         int nLimit = 2000;
+         printf("getheaders %d to %s\n", (pindex ? pindex->nHeight : -1), hashStop.ToString().substr(0,20).c_str());
          for (; pindex; pindex = pindex->pnext)
          {
              vHeaders.push_back(pindex->GetBlockHeader());
@@@ -2594,10 -2586,25 +2594,10 @@@
  
      else if (strCommand == "getaddr")
      {
 -        // Nodes rebroadcast an addr every 24 hours
          pfrom->vAddrToSend.clear();
 -        int64 nSince = GetAdjustedTime() - 3 * 60 * 60; // in the last 3 hours
 -        CRITICAL_BLOCK(cs_mapAddresses)
 -        {
 -            unsigned int nCount = 0;
 -            BOOST_FOREACH(const PAIRTYPE(vector<unsigned char>, CAddress)& item, mapAddresses)
 -            {
 -                const CAddress& addr = item.second;
 -                if (addr.nTime > nSince)
 -                    nCount++;
 -            }
 -            BOOST_FOREACH(const PAIRTYPE(vector<unsigned char>, CAddress)& item, mapAddresses)
 -            {
 -                const CAddress& addr = item.second;
 -                if (addr.nTime > nSince && GetRand(nCount) < 2500)
 -                    pfrom->PushAddress(addr);
 -            }
 -        }
 +        vector<CAddress> vAddr = addrman.GetAddr();
 +        BOOST_FOREACH(const CAddress &addr, vAddr)
 +            pfrom->PushAddress(addr);
      }
  
  
@@@ -2839,6 -2846,35 +2839,6 @@@ bool SendMessages(CNode* pto, bool fSen
              nLastRebroadcast = GetTime();
          }
  
 -        // Clear out old addresses periodically so it's not too much work at once
 -        static int64 nLastClear;
 -        if (nLastClear == 0)
 -            nLastClear = GetTime();
 -        if (GetTime() - nLastClear > 10 * 60 && vNodes.size() >= 3)
 -        {
 -            nLastClear = GetTime();
 -            CRITICAL_BLOCK(cs_mapAddresses)
 -            {
 -                CAddrDB addrdb;
 -                int64 nSince = GetAdjustedTime() - 14 * 24 * 60 * 60;
 -                for (map<vector<unsigned char>, CAddress>::iterator mi = mapAddresses.begin();
 -                     mi != mapAddresses.end();)
 -                {
 -                    const CAddress& addr = (*mi).second;
 -                    if (addr.nTime < nSince)
 -                    {
 -                        if (mapAddresses.size() < 1000 || GetTime() > nLastClear + 20)
 -                            break;
 -                        addrdb.EraseAddress(addr);
 -                        mapAddresses.erase(mi++);
 -                    }
 -                    else
 -                        mi++;
 -                }
 -            }
 -        }
 -
 -
          //
          // Message: addr
          //