libi2pd/HTTP.cpp

@@ -103,7 +103,6 @@ namespace http
 
 	bool URL::parse(std::string_view url) 
 	{
-		if (url.empty ()) return false;
 		std::size_t pos_p = 0; /* < current parse position */
 		std::size_t pos_c = 0; /* < work position */
 		if(url.at(0) != '/' || pos_p > 0) 

libi2pd/SSU2Session.cpp

@@ -412,24 +412,16 @@ namespace transport
 					" is semi-full (size = ", m_SendQueue.size (), ", lag = ", queueLag / 1000, ", rtt = ", (int)m_RTT, ")");
 			}
 		}
-		if (isSemiFull)
-		{	
-			for (auto it: msgs)
-			{
-				if (it->onDrop)
-					it->Drop (); // drop earlier because we can handle it
-				else
-				{
-					it->SetEnqueueTime (mts);
-					m_SendQueue.push_back (std::move (it));
-				}
-			}
-		}	
-		else
+		for (auto it: msgs)
 		{
-			for (auto& it: msgs) it->SetEnqueueTime (mts);
-			m_SendQueue.splice (m_SendQueue.end (), msgs);
-		}	
+			if (isSemiFull && it->onDrop)
+				it->Drop (); // drop earlier because we can handle it
+			else
+			{
+				it->SetEnqueueTime (mts);
+				m_SendQueue.push_back (std::move (it));
+			}
+		}
 		if (IsEstablished ())
 		{	
 			SendQueue ();

libi2pd_client/AddressBook.cpp

@@ -305,7 +305,7 @@ namespace client
 		identHash = hash;
 	}
 
-	AddressBook::AddressBook (): m_Storage(nullptr), m_IsLoaded (false),
+	AddressBook::AddressBook (): m_Storage(nullptr), m_IsLoaded (false), m_IsDownloading (false),
 		m_NumRetries (0), m_DefaultSubscription (nullptr), m_SubscriptionsUpdateTimer (nullptr),
 		m_IsEnabled (true)
 	{
@@ -344,28 +344,20 @@ namespace client
 			delete m_SubscriptionsUpdateTimer;
 			m_SubscriptionsUpdateTimer = nullptr;
 		}
-		bool isDownloading = m_Downloading.valid ();
-		if (isDownloading)
+		if (m_IsDownloading)
 		{
-			if (m_Downloading.wait_for(std::chrono::seconds(0)) == std::future_status::ready)
-				isDownloading = false;
-			else	
-			{	
-				LogPrint (eLogInfo, "Addressbook: Subscriptions are downloading, abort");
-				for (int i = 0; i < 30; i++)
+			LogPrint (eLogInfo, "Addressbook: Subscriptions are downloading, abort");
+			for (int i = 0; i < 30; i++)
+			{
+				if (!m_IsDownloading)
 				{
-					if (m_Downloading.wait_for(std::chrono::seconds(1)) == std::future_status::ready) // wait for 1 seconds
-					{
-						isDownloading = false;
-						LogPrint (eLogInfo, "Addressbook: Subscriptions download complete");
-						break;
-					}
+					LogPrint (eLogInfo, "Addressbook: Subscriptions download complete");
+					break;
 				}
-			}	
-			if (!isDownloading)
-				m_Downloading.get ();
-			else
-				LogPrint (eLogError, "Addressbook: Subscription download timeout");
+				std::this_thread::sleep_for (std::chrono::seconds (1)); // wait for 1 seconds
+			}
+			LogPrint (eLogError, "Addressbook: Subscription download timeout");
+			m_IsDownloading = false;
 		}
 		if (m_Storage)
 		{
@@ -590,15 +582,16 @@ namespace client
 			}
 			else
 			{
-				LogPrint (eLogInfo, "Addressbook: Loading subscriptions from config");
+				LogPrint (eLogInfo, "Addressbook: Loading subscriptions from config file");
 				// using config file items
 				std::string subscriptionURLs; i2p::config::GetOption("addressbook.subscriptions", subscriptionURLs);
 				std::vector<std::string> subsList;
 				boost::split(subsList, subscriptionURLs, boost::is_any_of(","), boost::token_compress_on);
 
 				for (const auto& s: subsList)
-					if (!s.empty ())
-						m_Subscriptions.push_back (std::make_shared<AddressBookSubscription> (*this, s));
+				{
+					m_Subscriptions.push_back (std::make_shared<AddressBookSubscription> (*this, s));
+				}
 				LogPrint (eLogInfo, "Addressbook: ", m_Subscriptions.size (), " subscriptions urls loaded");
 			}
 		}
@@ -652,6 +645,7 @@ namespace client
 
 	void AddressBook::DownloadComplete (bool success, const i2p::data::IdentHash& subscription, const std::string& etag, const std::string& lastModified)
 	{
+		m_IsDownloading = false;
 		m_NumRetries++;
 		int nextUpdateTimeout = m_NumRetries*CONTINIOUS_SUBSCRIPTION_RETRY_TIMEOUT;
 		if (m_NumRetries > CONTINIOUS_SUBSCRIPTION_MAX_NUM_RETRIES || nextUpdateTimeout > CONTINIOUS_SUBSCRIPTION_UPDATE_TIMEOUT)
@@ -706,13 +700,7 @@ namespace client
 				LogPrint(eLogWarning, "Addressbook: Missing local destination, skip subscription update");
 				return;
 			}
-			bool isDownloading = m_Downloading.valid ();
-			if (isDownloading && m_Downloading.wait_for(std::chrono::seconds(0)) == std::future_status::ready) // still active?
-			{
-				m_Downloading.get ();
-				isDownloading = false;
-			}	
-			if (!isDownloading && dest->IsReady ())
+			if (!m_IsDownloading && dest->IsReady ())
 			{
 				if (!m_IsLoaded)
 				{
@@ -721,15 +709,17 @@ namespace client
 					std::string defaultSubURL; i2p::config::GetOption("addressbook.defaulturl", defaultSubURL);
 					if (!m_DefaultSubscription)
 						m_DefaultSubscription = std::make_shared<AddressBookSubscription>(*this, defaultSubURL);
-					m_Downloading = std::async (std::launch::async,
-						std::bind (&AddressBookSubscription::CheckUpdates, m_DefaultSubscription));
+					m_IsDownloading = true;
+					std::thread load_hosts(std::bind (&AddressBookSubscription::CheckUpdates, m_DefaultSubscription));
+					load_hosts.detach(); // TODO: use join
 				}
 				else if (!m_Subscriptions.empty ())
 				{
 					// pick random subscription
 					auto ind = rand () % m_Subscriptions.size();
-					m_Downloading = std::async (std::launch::async,
-						std::bind (&AddressBookSubscription::CheckUpdates, m_Subscriptions[ind]));
+					m_IsDownloading = true;
+					std::thread load_hosts(std::bind (&AddressBookSubscription::CheckUpdates, m_Subscriptions[ind]));
+					load_hosts.detach(); // TODO: use join
 				}
 			}
 			else
@@ -833,7 +823,7 @@ namespace client
 		}
 	}
 
-	AddressBookSubscription::AddressBookSubscription (AddressBook& book, std::string_view link):
+	AddressBookSubscription::AddressBookSubscription (AddressBook& book, const std::string& link):
 		m_Book (book), m_Link (link)
 	{
 	}

libi2pd_client/AddressBook.h

@@ -11,12 +11,10 @@
 
 #include <string.h>
 #include <string>
-#include <string_view>
 #include <map>
 #include <vector>
 #include <iostream>
 #include <mutex>
-#include <future>
 #include <memory>
 #include <boost/asio.hpp>
 #include "Base.h"
@@ -126,8 +124,7 @@ namespace client
 			std::mutex m_LookupsMutex;
 			std::map<uint32_t, std::string> m_Lookups; // nonce -> address
 			AddressBookStorage * m_Storage;
-			volatile bool m_IsLoaded;
-			std::future<void> m_Downloading;
+			volatile bool m_IsLoaded, m_IsDownloading;
 			int m_NumRetries;
 			std::vector<std::shared_ptr<AddressBookSubscription> > m_Subscriptions;
 			std::shared_ptr<AddressBookSubscription> m_DefaultSubscription; // in case if we don't know any addresses yet
@@ -139,7 +136,7 @@ namespace client
 	{
 		public:
 
-			AddressBookSubscription (AddressBook& book, std::string_view link);
+			AddressBookSubscription (AddressBook& book, const std::string& link);
 			void CheckUpdates ();
 
 		private: