Gavin's TEST network as -testnet switch, misc fixes

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@168 1a98c847-1fd6-4fd8-948a-caf3550aa51b
2010-10-19 17:16:51 +00:00
parent 2fad3d34b7
commit 5cbf75324d
14 changed files with 155 additions and 82 deletions
--- a/net.cpp
+++ b/net.cpp
@@ -937,7 +937,7 @@ void ThreadOpenConnections2(void* parg)
            // Add seed nodes if IRC isn't working
            static bool fSeedUsed;
            bool fTOR = (fUseProxy && addrProxy.port == htons(9050));
-            if (mapAddresses.empty() && (GetTime() - nStart > 60 || fTOR))
+            if (mapAddresses.empty() && (GetTime() - nStart > 60 || fTOR) && !fTestNet)
            {
                for (int i = 0; i < ARRAYLEN(pnSeed); i++)
                {