From 82d5bf2f8aa8dde3e3827298b67f7b9993f7012b Mon Sep 17 00:00:00 2001 From: orignal Date: Mon, 15 Dec 2014 12:38:35 -0500 Subject: [PATCH] load certificates before reseed --- NetDb.cpp | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/NetDb.cpp b/NetDb.cpp index 458e2a99..b5149b48 100644 --- a/NetDb.cpp +++ b/NetDb.cpp @@ -78,23 +78,27 @@ namespace data void NetDb::Start () { Load (m_NetDbPath); - // try SU3 first - int reseedRetries = 0; - while (m_RouterInfos.size () < 100 && reseedRetries < 10) - { + if (m_RouterInfos.size () < 100) // reseed if # of router less than 100 + { Reseeder reseeder; - reseeder.ReseedNowSU3(); - reseedRetries++; - } + reseeder.LoadCertificates (); // we need certificates for SU3 verification - // if still not enough download .dat files - reseedRetries = 0; - while (m_RouterInfos.size () < 100 && reseedRetries < 10) - { - Reseeder reseeder; - reseeder.reseedNow(); - reseedRetries++; - Load (m_NetDbPath); + // try SU3 first + int reseedRetries = 0; + while (m_RouterInfos.size () < 100 && reseedRetries < 10) + { + reseeder.ReseedNowSU3(); + reseedRetries++; + } + + // if still not enough download .dat files + reseedRetries = 0; + while (m_RouterInfos.size () < 100 && reseedRetries < 10) + { + reseeder.reseedNow(); + reseedRetries++; + Load (m_NetDbPath); + } } m_Thread = new std::thread (std::bind (&NetDb::Run, this)); }