Merge branch 'addrman' of https://github.com/sipa/bitcoin

2012-03-22 09:19:01 -04:00
parent 0e894be626 5fee401fe1
commit a6b4a11385
17 changed files with 1180 additions and 249 deletions
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -513,7 +513,7 @@ bool AppInit2(int argc, char* argv[])
            CAddress addr(CService(strAddr, GetDefaultPort(), fAllowDNS));
            addr.nTime = 0; // so it won't relay unless successfully connected
            if (addr.IsValid())
-                AddAddress(addr);
+                addrman.Add(addr, CNetAddr("127.0.0.1"));
        }
    }