show family name in webiface

This commit is contained in:
weekendi2p 2016-04-26 21:48:42 +02:00
parent 85840872ab
commit 26de037e94
3 changed files with 14 additions and 0 deletions

View file

@ -405,6 +405,7 @@ namespace util
void HTTPConnection::FillContent (std::stringstream& s) void HTTPConnection::FillContent (std::stringstream& s)
{ {
s << "<b>Family:</b> " << i2p::context.GetFamilyString() << "<br>\r\n";
s << "<b>Uptime:</b> " << boost::posix_time::to_simple_string ( s << "<b>Uptime:</b> " << boost::posix_time::to_simple_string (
boost::posix_time::time_duration (boost::posix_time::seconds ( boost::posix_time::time_duration (boost::posix_time::seconds (
i2p::context.GetUptime ()))) << "<br>\r\n"; i2p::context.GetUptime ()))) << "<br>\r\n";

View file

@ -149,18 +149,29 @@ 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)
{ {
std::string signature; std::string signature;
if (family.length () > 0) if (family.length () > 0)
{
m_FamilyString = family;
signature = i2p::data::CreateFamilySignature (family, GetIdentHash ()); signature = i2p::data::CreateFamilySignature (family, GetIdentHash ());
}
if (signature.length () > 0) if (signature.length () > 0)
{ {
m_FamilyString = "<none>";
m_RouterInfo.SetProperty (i2p::data::ROUTER_INFO_PROPERTY_FAMILY, family); m_RouterInfo.SetProperty (i2p::data::ROUTER_INFO_PROPERTY_FAMILY, family);
m_RouterInfo.SetProperty (i2p::data::ROUTER_INFO_PROPERTY_FAMILY_SIG, signature); m_RouterInfo.SetProperty (i2p::data::ROUTER_INFO_PROPERTY_FAMILY_SIG, signature);
} }
else else
{ {
m_FamilyString = "<???>";
m_RouterInfo.DeleteProperty (i2p::data::ROUTER_INFO_PROPERTY_FAMILY); m_RouterInfo.DeleteProperty (i2p::data::ROUTER_INFO_PROPERTY_FAMILY);
m_RouterInfo.DeleteProperty (i2p::data::ROUTER_INFO_PROPERTY_FAMILY_SIG); m_RouterInfo.DeleteProperty (i2p::data::ROUTER_INFO_PROPERTY_FAMILY_SIG);
} }

View file

@ -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 { return m_FamilyString; };
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;