From bdd75e11714d0d15f2d261f86b62e50558073dc7 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Wed, 20 May 2020 14:59:18 -0400
Subject: [PATCH] build client tunnels through router with version >= 0.9.36

---
 libi2pd/NetDb.cpp      |  3 ++-
 libi2pd/NetDb.hpp      |  2 ++
 libi2pd/RouterInfo.cpp | 20 ++++++++++++++++++--
 libi2pd/RouterInfo.h   |  3 +++
 libi2pd/version.h      |  2 ++
 5 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/libi2pd/NetDb.cpp b/libi2pd/NetDb.cpp
index 3466cf2b..86bf160e 100644
--- a/libi2pd/NetDb.cpp
+++ b/libi2pd/NetDb.cpp
@@ -1121,7 +1121,8 @@ namespace data
 			{
 				return !router->IsHidden () && router != compatibleWith &&
 					router->IsCompatible (*compatibleWith) &&
-					(router->GetCaps () & RouterInfo::eHighBandwidth);
+					(router->GetCaps () & RouterInfo::eHighBandwidth) &&
+					router->GetVersion () >= NETDB_MIN_HIGHBANDWIDTH_VERSION;
 			});
 	}
 
diff --git a/libi2pd/NetDb.hpp b/libi2pd/NetDb.hpp
index d9e10504..6e251ecb 100644
--- a/libi2pd/NetDb.hpp
+++ b/libi2pd/NetDb.hpp
@@ -21,6 +21,7 @@
 #include "Reseed.h"
 #include "NetDbRequests.h"
 #include "Family.h"
+#include "version.h"
 
 namespace i2p
 {
@@ -32,6 +33,7 @@ namespace data
 	const int NETDB_MIN_EXPIRATION_TIMEOUT = 90*60; // 1.5 hours
 	const int NETDB_MAX_EXPIRATION_TIMEOUT = 27*60*60; // 27 hours
 	const int NETDB_PUBLISH_INTERVAL = 60*40;
+	const int NETDB_MIN_HIGHBANDWIDTH_VERSION = MAKE_VERSION_NUMBER(0,9,36); // 0.9.36
 
 	/** function for visiting a leaseset stored in a floodfill */
 	typedef std::function<void(const IdentHash, std::shared_ptr<LeaseSet>)> LeaseSetVisitor;
diff --git a/libi2pd/RouterInfo.cpp b/libi2pd/RouterInfo.cpp
index 37c2af7e..9b3b7e89 100644
--- a/libi2pd/RouterInfo.cpp
+++ b/libi2pd/RouterInfo.cpp
@@ -27,7 +27,7 @@ namespace data
 
 	RouterInfo::RouterInfo (const std::string& fullPath):
 		m_FullPath (fullPath), m_IsUpdated (false), m_IsUnreachable (false),
-		m_SupportedTransports (0), m_Caps (0)
+		m_SupportedTransports (0), m_Caps (0), m_Version (0)
 	{
 		m_Addresses = boost::make_shared<Addresses>(); // create empty list
 		m_Buffer = new uint8_t[MAX_RI_BUFFER_SIZE];
@@ -35,7 +35,8 @@ namespace data
 	}
 
 	RouterInfo::RouterInfo (const uint8_t * buf, int len):
-		m_IsUpdated (true), m_IsUnreachable (false), m_SupportedTransports (0), m_Caps (0)
+		m_IsUpdated (true), m_IsUnreachable (false), m_SupportedTransports (0), 
+		m_Caps (0), m_Version (0)
 	{
 		m_Addresses = boost::make_shared<Addresses>(); // create empty list
 		if (len <= MAX_RI_BUFFER_SIZE)
@@ -340,6 +341,21 @@ namespace data
 			// extract caps
 			if (!strcmp (key, "caps"))
 				ExtractCaps (value);
+			// extract version
+			else if (!strcmp (key, ROUTER_INFO_PROPERTY_VERSION))
+			{
+				m_Version = 0;
+				char * ch = value;
+				while (*ch)
+				{
+					if (*ch >= '0' && *ch <= '9')
+					{	
+						m_Version *= 10; 
+						m_Version += (*ch - '0');
+					}		
+					ch++;
+				}	
+			}	
 			// check netId
 			else if (!strcmp (key, ROUTER_INFO_PROPERTY_NETID) && atoi (value) != i2p::context.GetNetID ())
 			{
diff --git a/libi2pd/RouterInfo.h b/libi2pd/RouterInfo.h
index b23625e0..f8598b1e 100644
--- a/libi2pd/RouterInfo.h
+++ b/libi2pd/RouterInfo.h
@@ -19,6 +19,7 @@ namespace data
 	const char ROUTER_INFO_PROPERTY_LEASESETS[] = "netdb.knownLeaseSets";
 	const char ROUTER_INFO_PROPERTY_ROUTERS[] = "netdb.knownRouters";
 	const char ROUTER_INFO_PROPERTY_NETID[] = "netId";
+	const char ROUTER_INFO_PROPERTY_VERSION[] = "router.version";
 	const char ROUTER_INFO_PROPERTY_FAMILY[] = "family";
 	const char ROUTER_INFO_PROPERTY_FAMILY_SIG[] = "family.sig";
 
@@ -142,6 +143,7 @@ namespace data
 			void SetRouterIdentity (std::shared_ptr<const IdentityEx> identity);
 			std::string GetIdentHashBase64 () const { return GetIdentHash ().ToBase64 (); };
 			uint64_t GetTimestamp () const { return m_Timestamp; };
+			int GetVersion () const { return m_Version; };
 			Addresses& GetAddresses () { return *m_Addresses; }; // should be called for local RI only, otherwise must return shared_ptr
 			std::shared_ptr<const Address> GetNTCPAddress (bool v4only = true) const;
 			std::shared_ptr<const Address> GetNTCP2Address (bool publishedOnly,  bool v4only = true) const;
@@ -235,6 +237,7 @@ namespace data
 			std::map<std::string, std::string> m_Properties;
 			bool m_IsUpdated, m_IsUnreachable;
 			uint8_t m_SupportedTransports, m_Caps;
+			int m_Version;
 			mutable std::shared_ptr<RouterProfile> m_Profile;
 	};
 }
diff --git a/libi2pd/version.h b/libi2pd/version.h
index 4ad1a546..fa8f9a0f 100644
--- a/libi2pd/version.h
+++ b/libi2pd/version.h
@@ -5,6 +5,7 @@
 
 #define STRINGIZE(x) #x
 #define MAKE_VERSION(a,b,c) STRINGIZE(a) "." STRINGIZE(b) "." STRINGIZE(c)
+#define MAKE_VERSION_NUMBER(a,b,c) ((a*100+b)*100+c)
 
 #define I2PD_VERSION_MAJOR 2
 #define I2PD_VERSION_MINOR 31
@@ -24,5 +25,6 @@
 #define I2P_VERSION_MICRO 45
 #define I2P_VERSION_PATCH 0
 #define I2P_VERSION MAKE_VERSION(I2P_VERSION_MAJOR, I2P_VERSION_MINOR, I2P_VERSION_MICRO)
+#define I2P_VERSION_NUMBER MAKE_VERSION_NUMBER(I2P_VERSION_MAJOR, I2P_VERSION_MINOR, I2P_VERSION_MICRO)
 
 #endif