save timestamp from epoch instead local time to profiles

libi2pd/Profiling.cpp

@@ -10,6 +10,7 @@
 #include <unordered_map>
 #include <list>
 #include <thread>
+#include <iomanip>
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/ini_parser.hpp>
 #include "Base.h"
@@ -27,14 +28,9 @@ namespace data
 	static std::unordered_map<i2p::data::IdentHash, std::shared_ptr<RouterProfile> > g_Profiles;
 	static std::mutex g_ProfilesMutex;
 
-	static boost::posix_time::ptime GetTime ()
-	{
-		return boost::posix_time::second_clock::local_time();
-	}
-
 	RouterProfile::RouterProfile ():
-		m_LastUpdateTime (GetTime ()), m_IsUpdated (false),
+		m_IsUpdated (false), m_LastDeclineTime (0), m_LastUnreachableTime (0),
-		m_LastDeclineTime (0), m_LastUnreachableTime (0),
+		m_LastUpdateTime (i2p::util::GetSecondsSinceEpoch ()), 
 		m_NumTunnelsAgreed (0), m_NumTunnelsDeclined (0), m_NumTunnelsNonReplied (0),
 		m_NumTimesTaken (0), m_NumTimesRejected (0), m_HasConnected (false),
 		m_IsDuplicated (false)
@@ -43,7 +39,7 @@ namespace data
 
 	void RouterProfile::UpdateTime ()
 	{
-		m_LastUpdateTime = GetTime ();
+		m_LastUpdateTime = i2p::util::GetSecondsSinceEpoch ();
 		m_IsUpdated = true;
 	}
 
@@ -62,7 +58,7 @@ namespace data
 			usage.put (PEER_PROFILE_USAGE_DUPLICATED, true);
 		// fill property tree
 		boost::property_tree::ptree pt;
-		pt.put (PEER_PROFILE_LAST_UPDATE_TIME, boost::posix_time::to_simple_string (m_LastUpdateTime));
+		pt.put (PEER_PROFILE_LAST_UPDATE_TIMESTAMP, m_LastUpdateTime);
 		if (m_LastUnreachableTime)
 			pt.put (PEER_PROFILE_LAST_UNREACHABLE_TIME, m_LastUnreachableTime);
 		pt.put_child (PEER_PROFILE_SECTION_PARTICIPATION, participation);
@@ -104,10 +100,22 @@ namespace data
 
 		try
 		{
-			auto t = pt.get (PEER_PROFILE_LAST_UPDATE_TIME, "");
+			auto ts = pt.get (PEER_PROFILE_LAST_UPDATE_TIMESTAMP, 0);
-			if (t.length () > 0)
+			if (ts)
-				m_LastUpdateTime = boost::posix_time::time_from_string (t);
+				m_LastUpdateTime = ts;
-			if ((GetTime () - m_LastUpdateTime).hours () < PEER_PROFILE_EXPIRATION_TIMEOUT)
+			else	
+			{	
+				// try old lastupdatetime 
+				auto ut = pt.get (PEER_PROFILE_LAST_UPDATE_TIME, "");
+				if (ut.length () > 0)
+				{	
+					std::istringstream ss (ut); std::tm t;
+					ss >> std::get_time(&t, "%Y-%b-%d %H:%M:%S");
+					if (!ss.fail())
+						m_LastUpdateTime = mktime (&t); // t is local time
+				}	
+			}	
+			if (i2p::util::GetSecondsSinceEpoch () - m_LastUpdateTime < PEER_PROFILE_EXPIRATION_TIMEOUT)
 			{
 				m_LastUnreachableTime = pt.get (PEER_PROFILE_LAST_UNREACHABLE_TIME, 0);
 				try
@@ -277,13 +285,13 @@ namespace data
 		
 	std::future<void> PersistProfiles ()
 	{
-		auto ts = GetTime ();
+		auto ts = i2p::util::GetSecondsSinceEpoch ();
 		std::list<std::pair<i2p::data::IdentHash, std::shared_ptr<RouterProfile> > > tmp;
 		{
 			std::unique_lock<std::mutex> l(g_ProfilesMutex);
 			for (auto it = g_Profiles.begin (); it != g_Profiles.end ();)
 			{
-				if ((ts - it->second->GetLastUpdateTime ()).total_seconds () > PEER_PROFILE_PERSIST_INTERVAL)
+				if (ts - it->second->GetLastUpdateTime () > PEER_PROFILE_PERSIST_INTERVAL)
 				{
 					if (it->second->IsUpdated ())
 						tmp.push_back (std::make_pair (it->first, it->second));
@@ -305,9 +313,9 @@ namespace data
 			std::unique_lock<std::mutex> l(g_ProfilesMutex);
 			std::swap (tmp, g_Profiles);
 		}
-		auto ts = GetTime ();
+		auto ts = i2p::util::GetSecondsSinceEpoch ();
 		for (auto& it: tmp)
-			if (it.second->IsUseful() && (it.second->IsUpdated () || (ts - it.second->GetLastUpdateTime ()).total_seconds () < PEER_PROFILE_EXPIRATION_TIMEOUT*3600))
+			if (it.second->IsUseful() && (it.second->IsUpdated () || ts - it.second->GetLastUpdateTime () < PEER_PROFILE_EXPIRATION_TIMEOUT))
 				it.second->Save (it.first);
 	}
 
@@ -325,7 +333,7 @@ namespace data
 				LogPrint(eLogWarning, "Profiling: Can't stat(): ", path);
 				continue;
 			}
-			if (now - st.st_mtime >= PEER_PROFILE_EXPIRATION_TIMEOUT*3600) 
+			if (now - st.st_mtime >= PEER_PROFILE_EXPIRATION_TIMEOUT) 
 			{
 				LogPrint(eLogDebug, "Profiling: Removing expired peer profile: ", path);
 				i2p::fs::Remove(path);
@@ -336,11 +344,11 @@ namespace data
 	std::future<void> DeleteObsoleteProfiles ()
 	{
 		{
-			auto ts = GetTime ();
+			auto ts = i2p::util::GetSecondsSinceEpoch ();
 			std::unique_lock<std::mutex> l(g_ProfilesMutex);
 			for (auto it = g_Profiles.begin (); it != g_Profiles.end ();)
 			{
-				if ((ts - it->second->GetLastUpdateTime ()).total_seconds () >= PEER_PROFILE_EXPIRATION_TIMEOUT*3600)
+				if (ts - it->second->GetLastUpdateTime () >= PEER_PROFILE_EXPIRATION_TIMEOUT)
 					it = g_Profiles.erase (it);
 				else
 					it++;

libi2pd/Profiling.h

@@ -11,7 +11,6 @@
 
 #include <memory>
 #include <future>
-#include <boost/date_time/posix_time/posix_time.hpp>
 #include "Identity.h"
 
 namespace i2p
@@ -22,7 +21,8 @@ namespace data
 	const char PEER_PROFILE_SECTION_PARTICIPATION[] = "participation";
 	const char PEER_PROFILE_SECTION_USAGE[] = "usage";
 	// params
-	const char PEER_PROFILE_LAST_UPDATE_TIME[] = "lastupdatetime";
+	const char PEER_PROFILE_LAST_UPDATE_TIME[] = "lastupdatetime"; // deprecated
+	const char PEER_PROFILE_LAST_UPDATE_TIMESTAMP[] = "lastupdatetimestamp";
 	const char PEER_PROFILE_LAST_UNREACHABLE_TIME[] = "lastunreachabletime";
 	const char PEER_PROFILE_PARTICIPATION_AGREED[] = "agreed";
 	const char PEER_PROFILE_PARTICIPATION_DECLINED[] = "declined";
@@ -32,7 +32,7 @@ namespace data
 	const char PEER_PROFILE_USAGE_CONNECTED[] = "connected";
 	const char PEER_PROFILE_USAGE_DUPLICATED[] = "duplicated";
 	
-	const int PEER_PROFILE_EXPIRATION_TIMEOUT = 36; // in hours (1.5 days)
+	const int PEER_PROFILE_EXPIRATION_TIMEOUT = 36*60*60; // in seconds (1.5 days)
 	const int PEER_PROFILE_AUTOCLEAN_TIMEOUT = 1500; // in seconds (25 minutes)
 	const int PEER_PROFILE_AUTOCLEAN_VARIANCE = 900; // in seconds (15 minutes)
 	const int PEER_PROFILE_OBSOLETE_PROFILES_CLEAN_TIMEOUT = 5400; // in seconds (1.5 hours)
@@ -62,7 +62,7 @@ namespace data
 			void Connected ();
 			void Duplicated ();
 
-			boost::posix_time::ptime GetLastUpdateTime () const { return m_LastUpdateTime; };
+			uint64_t GetLastUpdateTime () const { return m_LastUpdateTime; };
 			bool IsUpdated () const { return m_IsUpdated; };
 			
 			bool IsUseful() const;
@@ -79,9 +79,8 @@ namespace data
 
 		private:
 
-			boost::posix_time::ptime m_LastUpdateTime; // TODO: use std::chrono
 			bool m_IsUpdated;
-			uint64_t m_LastDeclineTime, m_LastUnreachableTime; // in seconds
+			uint64_t m_LastDeclineTime, m_LastUnreachableTime, m_LastUpdateTime; // in seconds
 			// participation
 			uint32_t m_NumTunnelsAgreed;
 			uint32_t m_NumTunnelsDeclined;

libi2pd/RouterInfo.cpp

@@ -12,6 +12,7 @@
 #include <fstream>
 #include <boost/lexical_cast.hpp>
 #include <boost/make_shared.hpp>
+#include <boost/algorithm/string.hpp> // for boost::to_lower
 #if (BOOST_VERSION >= 105300)
 #include <boost/atomic.hpp>
 #endif

libi2pd/Transports.cpp

@@ -6,6 +6,7 @@
 * See full license text in LICENSE file at top of project tree
 */
 
+#include <boost/algorithm/string.hpp> // for boost::to_lower
 #include "Log.h"
 #include "Crypto.h"
 #include "RouterContext.h"