Get local host IP on Linux, Shutdown() a little cleaner -- linux-0.1.6-test1 waypointv0.1.6test1

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@37 1a98c847-1fd6-4fd8-948a-caf3550aa51b

1 files changed, 2 insertions, 2 deletions

diff --git a/main.cpp b/main.cpp
index fe213c099a..b957027f07 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1215,7 +1215,7 @@ bool CBlock::AcceptBlock()
         return error("AcceptBlock() : block's timestamp is too early");

 

     // Check that all transactions are finalized (starting around Dec 2009)

-    if (nBestHeight > 31000) // 25620 + 5320

+    if (nBestHeight > 31000)

         foreach(const CTransaction& tx, vtx)

             if (!tx.IsFinal(nTime))

                 return error("AcceptBlock() : contains a non-final transaction");

@@ -1802,7 +1802,7 @@ bool ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
         {

             if (fShutdown)

                 return true;

-            addr.nTime = GetAdjustedTime();

+            addr.nTime = GetAdjustedTime() - 2 * 60 * 60;

             if (pfrom->fGetAddr)

                 addr.nTime -= 5 * 24 * 60 * 60;

             AddAddress(addrdb, addr, false);