From 8d98722b4652c846107aac705764b65e72dfbc1e Mon Sep 17 00:00:00 2001 From: orignal Date: Fri, 31 Jan 2014 07:32:34 -0500 Subject: [PATCH] fixed compilation error in gcc 4.6 --- NetDb.cpp | 6 +++--- NetDb.h | 2 +- Reseed.cpp | 14 ++++++++++++++ Reseed.h | 13 ------------- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/NetDb.cpp b/NetDb.cpp index 4d4ce103..5f76a8c1 100644 --- a/NetDb.cpp +++ b/NetDb.cpp @@ -45,7 +45,7 @@ namespace data NetDb netdb; - NetDb::NetDb (): m_IsRunning (false), m_Thread (0) + NetDb::NetDb (): m_IsRunning (false), m_ReseedRetries (0), m_Thread (0) { } @@ -223,7 +223,7 @@ namespace data if (reseed) { reseeder->reseedNow(); - m_reseedRetries++; + m_ReseedRetries++; } int numRouters = 0; boost::filesystem::directory_iterator end; @@ -244,7 +244,7 @@ namespace data } } LogPrint (numRouters, " routers loaded"); - if (numRouters < 100 && m_reseedRetries < 10) + if (numRouters < 100 && m_ReseedRetries < 10) Load(directory, true); // Reseed } diff --git a/NetDb.h b/NetDb.h index ddf50d06..432036dc 100644 --- a/NetDb.h +++ b/NetDb.h @@ -95,7 +95,7 @@ namespace data std::map m_RequestedDestinations; bool m_IsRunning; - int m_reseedRetries = 0; + int m_ReseedRetries; std::thread * m_Thread; i2p::util::Queue m_Queue; // of I2NPDatabaseStoreMsg }; diff --git a/Reseed.cpp b/Reseed.cpp index 1442b1b4..540caa15 100644 --- a/Reseed.cpp +++ b/Reseed.cpp @@ -10,6 +10,20 @@ namespace i2p { namespace data { + + static std::vector httpReseedHostList = { + "http://193.150.121.66/netDb/", + "http://netdb.i2p2.no/", + "http://reseed.i2p-projekt.de/", + "http://cowpuncher.drollette.com/netdb/", + "http://i2p.mooo.com/netDb/", + "http://reseed.info/", + "http://reseed.pkol.de/", + "http://uk.reseed.i2p2.no/", + "http://i2p-netdb.innovatio.no/", + "http://ieb9oopo.mooo.com" + }; + //TODO: Implement v2 reseeding. Lightweight zip library is needed. //TODO: Implement SU3, utils. Reseeder::Reseeder() diff --git a/Reseed.h b/Reseed.h index 96ce9c55..3b07d840 100644 --- a/Reseed.h +++ b/Reseed.h @@ -15,19 +15,6 @@ namespace data Reseeder(); ~Reseeder(); bool reseedNow(); - private: - std::vector httpReseedHostList = { - "http://193.150.121.66/netDb/", - "http://netdb.i2p2.no/", - "http://reseed.i2p-projekt.de/", - "http://cowpuncher.drollette.com/netdb/", - "http://i2p.mooo.com/netDb/", - "http://reseed.info/", - "http://reseed.pkol.de/", - "http://uk.reseed.i2p2.no/", - "http://i2p-netdb.innovatio.no/", - "http://ieb9oopo.mooo.com" - }; }; }