Fix IDB downloading the same blocks twice when there's only one peer (#…

…19)
mit-dci · Mar 31, 2018 · 8ac201a · 8ac201a
1 parent d575e99
commit 8ac201a
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/kernel/network.cpp b/src/kernel/network.cpp
@@ -286,7 +286,7 @@ void CryptoKernel::Network::networkFunc() {
             connectedMutex.lock();
 
             for(std::map<std::string, std::unique_ptr<PeerInfo>>::iterator it = connected.begin();
-                    it != connected.end() && running; it++) {
+                    it != connected.end() && running; ) {
                 if(it->second->info["height"].asUInt64() > currentHeight) {
                     std::list<CryptoKernel::Blockchain::block> blocks;
 
@@ -304,6 +304,7 @@ void CryptoKernel::Network::networkFunc() {
                                 log->printf(LOG_LEVEL_WARN,
                                             "Network(): Failed to contact " + it->first + " " + e.what() +
                                             " while downloading blocks");
+                                it++;
                                 break;
                             }
 
@@ -313,6 +314,7 @@ void CryptoKernel::Network::networkFunc() {
                                 if(currentHeight == 1) {
                                     // This peer has a different genesis block to us
                                     changeScore(it->first, 250);
+                                    it++;
                                     break;
                                 } else {
                                     currentHeight = std::max(1, (int)currentHeight - nBlocks);
@@ -340,6 +342,7 @@ void CryptoKernel::Network::networkFunc() {
                             log->printf(LOG_LEVEL_WARN,
                                         "Network(): Failed to contact " + it->first + " " + e.what() +
                                         " while downloading blocks");
+                            it++;
                             break;
                         }
 
@@ -350,13 +353,13 @@ void CryptoKernel::Network::networkFunc() {
                         blockProcessor->join();
                         blockProcessor.reset();
 
-                        currentHeight = blockchain->getBlockDB("tip").getHeight();
-                        this->currentHeight = currentHeight;
-
                         if(failure) {
                             blocks.clear();
+                            currentHeight = blockchain->getBlockDB("tip").getHeight();
+                            this->currentHeight = currentHeight;
                             startHeight = currentHeight;
                             bestHeight = currentHeight;
+                            it++;
                             break;
                         }
 
@@ -381,6 +384,8 @@ void CryptoKernel::Network::networkFunc() {
                             }
                         }
                     }, it->first));
+                } else {
+                    it++;
                 }
             }