From b8032e7fbfd6cf2a91bf8fee0b970dd4ede767a7 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Sun, 2 Apr 2023 11:27:51 -0400
Subject: [PATCH] publish congestion cap G

---
 libi2pd/RouterContext.cpp | 9 ++++++++-
 libi2pd/RouterInfo.cpp    | 9 +--------
 libi2pd/RouterInfo.h      | 3 +--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/libi2pd/RouterContext.cpp b/libi2pd/RouterContext.cpp
index 20ac589b..de103910 100644
--- a/libi2pd/RouterContext.cpp
+++ b/libi2pd/RouterContext.cpp
@@ -1090,6 +1090,8 @@ namespace i2p
 			UpdateSSU2Keys ();
 			updated = true;
 		}
+		if (m_RouterInfo.UpdateCongestion (i2p::data::RouterInfo::eLowCongestion))
+			updated = true;
 		if (updated)
 			UpdateRouterInfo ();
 
@@ -1398,7 +1400,12 @@ namespace i2p
 	{
 		if (ecode != boost::asio::error::operation_aborted)
 		{
-			if (m_RouterInfo.SetHighCongestion (IsHighCongestion ()))
+			auto c = i2p::data::RouterInfo::eLowCongestion;
+			if (!AcceptsTunnels ()) 
+				c = i2p::data::RouterInfo::eRejectAll;
+			else if (IsHighCongestion ()) 
+				c = i2p::data::RouterInfo::eHighCongestion;
+			if (m_RouterInfo.UpdateCongestion (c))
 				UpdateRouterInfo ();
 			ScheduleCongestionUpdate ();
 		}	
diff --git a/libi2pd/RouterInfo.cpp b/libi2pd/RouterInfo.cpp
index 7462ef0e..3ae5abd9 100644
--- a/libi2pd/RouterInfo.cpp
+++ b/libi2pd/RouterInfo.cpp
@@ -1077,12 +1077,6 @@ namespace data
 		if (m_Congestion == eHighCongestion)
 			return 	(i2p::util::GetMillisecondsSinceEpoch () < m_Timestamp + HIGH_CONGESTION_INTERVAL*1000LL) ? true : false;
 		return false;
-	}	
-
-	LocalRouterInfo::LocalRouterInfo (const std::string& fullPath): 
-		RouterInfo (fullPath) 
-	{
-		SetHighCongestion (false); // drop congestion
 	}
 		
 	void LocalRouterInfo::CreateBuffer (const PrivateKeys& privateKeys)
@@ -1153,9 +1147,8 @@ namespace data
 		SetProperty ("caps", caps);
 	}
 
-	bool LocalRouterInfo::SetHighCongestion (bool highCongestion)
+	bool LocalRouterInfo::UpdateCongestion (Congestion c)
 	{
-		Congestion c = highCongestion ? eHighCongestion : eLowCongestion;
 		if (c != GetCongestion ())
 		{
 			SetCongestion (c);
diff --git a/libi2pd/RouterInfo.h b/libi2pd/RouterInfo.h
index ef145496..f258b018 100644
--- a/libi2pd/RouterInfo.h
+++ b/libi2pd/RouterInfo.h
@@ -330,10 +330,9 @@ namespace data
 		public:
 
 			LocalRouterInfo () = default;
-			LocalRouterInfo (const std::string& fullPath);
 			void CreateBuffer (const PrivateKeys& privateKeys);
 			void UpdateCaps (uint8_t caps);
-			bool SetHighCongestion (bool highCongestion); // returns true if updated
+			bool UpdateCongestion (Congestion c); // returns true if updated
 
 			void SetProperty (const std::string& key, const std::string& value) override;
 			void DeleteProperty (const std::string& key);