Browse Source

added SetFamilyString(); GetFamilyString() and shows family in webiface

pull/484/head
weekendi2p 9 years ago
parent
commit
a78caa2976
  1. 1
      HTTPServer.cpp
  2. 12
      RouterContext.cpp
  3. 2
      RouterContext.h

1
HTTPServer.cpp

@ -417,6 +417,7 @@ namespace util
default: s << "Unknown"; default: s << "Unknown";
} }
s << "<br>\r\n"; s << "<br>\r\n";
s << "<b>Family:</b> " << i2p::context.GetFamilyString() << "<br>\r\n";
s << "<b>Tunnel creation success rate:</b> " << i2p::tunnel::tunnels.GetTunnelCreationSuccessRate () << "%<br>\r\n"; s << "<b>Tunnel creation success rate:</b> " << i2p::tunnel::tunnels.GetTunnelCreationSuccessRate () << "%<br>\r\n";
s << "<b>Received:</b> "; s << "<b>Received:</b> ";
s << std::fixed << std::setprecision(2); s << std::fixed << std::setprecision(2);

12
RouterContext.cpp

@ -149,11 +149,23 @@ namespace i2p
UpdateRouterInfo (); UpdateRouterInfo ();
} }
std::string RouterContext::GetFamilyString () const
{
return m_FamilyString;
}
void RouterContext::SetFamily (const std::string& family) void RouterContext::SetFamily (const std::string& family)
{ {
m_FamilyString = family;
if (m_FamilyString.length() == 0)
m_FamilyString = "&lt;undefined&gt;";
std::string signature; std::string signature;
if (family.length () > 0) if (family.length () > 0)
{
signature = i2p::data::CreateFamilySignature (family, GetIdentHash ()); signature = i2p::data::CreateFamilySignature (family, GetIdentHash ());
}
if (signature.length () > 0) if (signature.length () > 0)
{ {
m_RouterInfo.SetProperty (i2p::data::ROUTER_INFO_PROPERTY_FAMILY, family); m_RouterInfo.SetProperty (i2p::data::ROUTER_INFO_PROPERTY_FAMILY, family);

2
RouterContext.h

@ -59,6 +59,7 @@ namespace i2p
bool IsFloodfill () const { return m_IsFloodfill; }; bool IsFloodfill () const { return m_IsFloodfill; };
void SetFloodfill (bool floodfill); void SetFloodfill (bool floodfill);
void SetFamily (const std::string& family); void SetFamily (const std::string& family);
std::string GetFamilyString () const;
void SetBandwidth (int limit); /* in kilobytes */ void SetBandwidth (int limit); /* in kilobytes */
void SetBandwidth (char L); /* by letter */ void SetBandwidth (char L); /* by letter */
bool AcceptsTunnels () const { return m_AcceptsTunnels; }; bool AcceptsTunnels () const { return m_AcceptsTunnels; };
@ -100,6 +101,7 @@ namespace i2p
i2p::data::PrivateKeys m_Keys; i2p::data::PrivateKeys m_Keys;
uint64_t m_LastUpdateTime; uint64_t m_LastUpdateTime;
bool m_AcceptsTunnels, m_IsFloodfill; bool m_AcceptsTunnels, m_IsFloodfill;
std::string m_FamilyString;
uint64_t m_StartupTime; // in seconds since epoch uint64_t m_StartupTime; // in seconds since epoch
uint32_t m_BandwidthLimit; // allowed bandwidth uint32_t m_BandwidthLimit; // allowed bandwidth
RouterStatus m_Status; RouterStatus m_Status;

Loading…
Cancel
Save