From a78caa2976d3d96f8ac2defb7622c48e456e0630 Mon Sep 17 00:00:00 2001
From: weekendi2p <weekendi2p@i2pmail.org>
Date: Wed, 27 Apr 2016 00:31:33 +0200
Subject: [PATCH 1/3] added SetFamilyString(); GetFamilyString() and shows
 family in webiface

---
 HTTPServer.cpp    |  1 +
 RouterContext.cpp | 12 ++++++++++++
 RouterContext.h   |  2 ++
 3 files changed, 15 insertions(+)

diff --git a/HTTPServer.cpp b/HTTPServer.cpp
index 6c2c6112..08b67e22 100644
--- a/HTTPServer.cpp
+++ b/HTTPServer.cpp
@@ -417,6 +417,7 @@ namespace util
 			default: s << "Unknown";
 		} 
 		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>Received:</b> ";
 		s << std::fixed << std::setprecision(2);
diff --git a/RouterContext.cpp b/RouterContext.cpp
index f35d8426..4cdf13fe 100644
--- a/RouterContext.cpp
+++ b/RouterContext.cpp
@@ -149,11 +149,23 @@ namespace i2p
 		UpdateRouterInfo ();
 	}
 
+	std::string RouterContext::GetFamilyString () const
+	{
+		return m_FamilyString;
+	}
+
 	void RouterContext::SetFamily (const std::string& family)
 	{
+
+		m_FamilyString = family;
+		if (m_FamilyString.length() == 0)
+			m_FamilyString = "&lt;undefined&gt;";
+
 		std::string signature;
 		if (family.length () > 0)
+		{
 			signature = i2p::data::CreateFamilySignature (family, GetIdentHash ());
+		}
 		if (signature.length () > 0)
 		{
 			m_RouterInfo.SetProperty (i2p::data::ROUTER_INFO_PROPERTY_FAMILY, family);
diff --git a/RouterContext.h b/RouterContext.h
index 9766c66e..1b0f7ed2 100644
--- a/RouterContext.h
+++ b/RouterContext.h
@@ -59,6 +59,7 @@ namespace i2p
 			bool IsFloodfill () const { return m_IsFloodfill; };	
 			void SetFloodfill (bool floodfill);	
 			void SetFamily (const std::string& family);
+			std::string GetFamilyString () const;
 			void SetBandwidth (int limit); /* in kilobytes */
 			void SetBandwidth (char L); /* by letter */
 			bool AcceptsTunnels () const { return m_AcceptsTunnels; };
@@ -100,6 +101,7 @@ namespace i2p
 			i2p::data::PrivateKeys m_Keys; 
 			uint64_t m_LastUpdateTime;
 			bool m_AcceptsTunnels, m_IsFloodfill;
+			std::string m_FamilyString;
 			uint64_t m_StartupTime; // in seconds since epoch
 			uint32_t m_BandwidthLimit; // allowed bandwidth
 			RouterStatus m_Status;

From 61e8becd38e2b1af4948fa56333f8ee82d66040b Mon Sep 17 00:00:00 2001
From: weekendi2p <weekendi2p@i2pmail.org>
Date: Wed, 27 Apr 2016 00:48:23 +0200
Subject: [PATCH 2/3] wrong file version

---
 Daemon.cpp        |  1 +
 RouterContext.cpp | 14 ++++++++------
 RouterContext.h   |  1 +
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Daemon.cpp b/Daemon.cpp
index 81bbcdd5..2a32ff04 100644
--- a/Daemon.cpp
+++ b/Daemon.cpp
@@ -189,6 +189,7 @@ namespace i2p
 
 			std::string family; i2p::config::GetOption("family", family);
 			i2p::context.SetFamily (family);
+			i2p::context.SetFamilyString (family);
 			if (family.length () > 0)
 				LogPrint(eLogInfo, "Daemon: family set to ", family);	
 			
diff --git a/RouterContext.cpp b/RouterContext.cpp
index 4cdf13fe..bc1f3fc1 100644
--- a/RouterContext.cpp
+++ b/RouterContext.cpp
@@ -149,6 +149,14 @@ namespace i2p
 		UpdateRouterInfo ();
 	}
 
+	void RouterContext::SetFamilyString (const std::string& family)
+	{
+		if (family.length() > 0)
+			m_FamilyString = family;
+		else
+			m_FamilyString = "&lt;undefined&gt;";
+	}
+
 	std::string RouterContext::GetFamilyString () const
 	{
 		return m_FamilyString;
@@ -157,15 +165,9 @@ namespace i2p
 	void RouterContext::SetFamily (const std::string& family)
 	{
 
-		m_FamilyString = family;
-		if (m_FamilyString.length() == 0)
-			m_FamilyString = "&lt;undefined&gt;";
-
 		std::string signature;
 		if (family.length () > 0)
-		{
 			signature = i2p::data::CreateFamilySignature (family, GetIdentHash ());
-		}
 		if (signature.length () > 0)
 		{
 			m_RouterInfo.SetProperty (i2p::data::ROUTER_INFO_PROPERTY_FAMILY, family);
diff --git a/RouterContext.h b/RouterContext.h
index 1b0f7ed2..def89383 100644
--- a/RouterContext.h
+++ b/RouterContext.h
@@ -59,6 +59,7 @@ namespace i2p
 			bool IsFloodfill () const { return m_IsFloodfill; };	
 			void SetFloodfill (bool floodfill);	
 			void SetFamily (const std::string& family);
+			void SetFamilyString (const std::string& family);
 			std::string GetFamilyString () const;
 			void SetBandwidth (int limit); /* in kilobytes */
 			void SetBandwidth (char L); /* by letter */

From ebee94fb11b436add295ae791cb1fe53c6e99d7d Mon Sep 17 00:00:00 2001
From: weekendi2p <weekendi2p@i2pmail.org>
Date: Wed, 27 Apr 2016 01:19:27 +0200
Subject: [PATCH 3/3] removed 1 blank line..

---
 RouterContext.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/RouterContext.cpp b/RouterContext.cpp
index bc1f3fc1..29891169 100644
--- a/RouterContext.cpp
+++ b/RouterContext.cpp
@@ -164,7 +164,6 @@ namespace i2p
 
 	void RouterContext::SetFamily (const std::string& family)
 	{
-
 		std::string signature;
 		if (family.length () > 0)
 			signature = i2p::data::CreateFamilySignature (family, GetIdentHash ());