unix build merged in, bitmap resources from xpm instead of rc, better addr relay, better selection of addrs by time last seen for faster connect

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

1 files changed, 2 insertions, 14 deletions

diff --git a/irc.cpp b/irc.cpp
index f839dc5224..4d4ed0f414 100644
--- a/irc.cpp
+++ b/irc.cpp
@@ -4,10 +4,7 @@
 

 #include "headers.h"

 

-

-map<vector<unsigned char>, CAddress> mapIRCAddresses;

-CCriticalSection cs_mapIRCAddresses;

-

+int nGotIRCAddresses = 0;

 

 

 

@@ -259,16 +256,7 @@ void ThreadIRCSeed(void* parg)
                     CAddrDB addrdb;

                     if (AddAddress(addrdb, addr))

                         printf("IRC got new address\n");

-                    else

-                    {

-                        // make it try connecting again

-                        CRITICAL_BLOCK(cs_mapAddresses)

-                            if (mapAddresses.count(addr.GetKey()))

-                                mapAddresses[addr.GetKey()].nLastFailed = 0;

-                    }

-

-                    CRITICAL_BLOCK(cs_mapIRCAddresses)

-                        mapIRCAddresses.insert(make_pair(addr.GetKey(), addr));

+                    nGotIRCAddresses++;

                 }

                 else

                 {