Merge pull request #2017 from Vort/show_bw_caps

show bandwidth caps for hops

daemon/HTTPServer.cpp

@@ -417,6 +417,15 @@ namespace http {
 		}
 	}
 
+	static void ShowHop(std::stringstream& s, const i2p::data::IdentityEx& ident)
+	{
+		auto identHash = ident.GetIdentHash();
+		auto router = i2p::data::netdb.FindRouter(identHash);
+		s << i2p::data::GetIdentHashAbbreviation(identHash);
+		if (router)
+			s << "<small style=\"color:gray\"> " << router->GetBandwidthCap() << "</small>";
+	}
+
 	static void ShowLeaseSetDestination (std::stringstream& s, std::shared_ptr<const i2p::client::LeaseSetDestination> dest, uint32_t token)
 	{
 		s << "<b>Base32:</b><br>\r\n<textarea readonly cols=\"80\" rows=\"1\">";
@@ -482,7 +491,9 @@ namespace http {
 					it->VisitTunnelHops(
 						[&s](std::shared_ptr<const i2p::data::IdentityEx> hopIdent)
 						{
-							s << "&#8658; " << i2p::data::GetIdentHashAbbreviation (hopIdent->GetIdentHash ()) << " ";
+							s << "&#8658; ";
+							ShowHop(s, *hopIdent);
+							s << " ";
 						}
 					);
 				}
@@ -503,7 +514,9 @@ namespace http {
 					it->VisitTunnelHops(
 						[&s](std::shared_ptr<const i2p::data::IdentityEx> hopIdent)
 						{
-							s << " " << i2p::data::GetIdentHashAbbreviation (hopIdent->GetIdentHash ()) << " &#8658;";
+							s << " ";
+							ShowHop(s, *hopIdent);
+							s << " &#8658;";
 						}
 					);
 				}
@@ -699,7 +712,9 @@ namespace http {
 				it->VisitTunnelHops(
 					[&s](std::shared_ptr<const i2p::data::IdentityEx> hopIdent)
 					{
-						s << "&#8658; " << i2p::data::GetIdentHashAbbreviation (hopIdent->GetIdentHash ()) << " ";
+						s << "&#8658; ";
+						ShowHop(s, *hopIdent);
+						s << " ";
 					}
 				);
 			}
@@ -720,7 +735,9 @@ namespace http {
 				it->VisitTunnelHops(
 					[&s](std::shared_ptr<const i2p::data::IdentityEx> hopIdent)
 					{
-						s << " " << i2p::data::GetIdentHashAbbreviation (hopIdent->GetIdentHash ()) << " &#8658;";
+						s << " ";
+						ShowHop(s, *hopIdent);
+						s << " &#8658;";
 					}
 				);
 			}

libi2pd/RouterInfo.cpp

@@ -534,13 +534,20 @@ namespace data
 				case CAPS_FLAG_FLOODFILL:
 					m_Caps |= Caps::eFloodfill;
 				break;
+				case CAPS_FLAG_LOW_BANDWIDTH1:
+				case CAPS_FLAG_LOW_BANDWIDTH2:
+				case CAPS_FLAG_LOW_BANDWIDTH3:
+					m_BandwidthCap = *cap;
+				break;
 				case CAPS_FLAG_HIGH_BANDWIDTH1:
 				case CAPS_FLAG_HIGH_BANDWIDTH2:
 					m_Caps |= Caps::eHighBandwidth;
+					m_BandwidthCap = *cap;
 				break;
 				case CAPS_FLAG_EXTRA_BANDWIDTH1:
 				case CAPS_FLAG_EXTRA_BANDWIDTH2:
 					m_Caps |= Caps::eExtraBandwidth | Caps::eHighBandwidth;
+					m_BandwidthCap = *cap;
 				break;
 				case CAPS_FLAG_HIDDEN:
 					m_Caps |= Caps::eHidden;

libi2pd/RouterInfo.h

@@ -271,6 +271,7 @@ namespace data
 			bool IsHighCongestion (bool highBandwidth) const;
 
 			uint8_t GetCaps () const { return m_Caps; };
+			char GetBandwidthCap() const { return m_BandwidthCap; };
 			void SetCaps (uint8_t caps) { m_Caps = caps; };
 
 			Congestion GetCongestion () const { return m_Congestion; };
@@ -345,6 +346,7 @@ namespace data
 			bool m_IsUpdated, m_IsUnreachable, m_IsFloodfill;
 			CompatibleTransports m_SupportedTransports, m_ReachableTransports, m_PublishedTransports;
 			uint8_t m_Caps;
+			char m_BandwidthCap;
 			int m_Version;
 			Congestion m_Congestion;
 			mutable std::shared_ptr<RouterProfile> m_Profile;