Merge pull request PurpleI2P#996 from majestrate/stream-limits

Stream limits
the-holy-church · Nov 13, 2017 · 34d6eb5 · 34d6eb5
2 parents 3dc5542 + 5820425
commit 34d6eb5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/libi2pd/Streaming.cpp b/libi2pd/Streaming.cpp
@@ -882,7 +882,8 @@ namespace stream
 		m_PendingIncomingTimer (m_Owner->GetService ()),
 		m_ConnTrackTimer(m_Owner->GetService()),
 		m_ConnsPerMinute(DEFAULT_MAX_CONNS_PER_MIN),
-		m_LastBanClear(i2p::util::GetMillisecondsSinceEpoch())
+		m_LastBanClear(i2p::util::GetMillisecondsSinceEpoch()),
+		m_EnableDrop(false)
 	{
 	}
 
@@ -946,7 +947,7 @@ namespace stream
 				auto incomingStream = CreateNewIncomingStream ();
 				incomingStream->HandleNextPacket (packet); // SYN
 				auto ident = incomingStream->GetRemoteIdentity();
-				if(ident)
+				if(ident && m_EnableDrop)
 				{
 					auto ih = ident->GetIdentHash();
 					if(DropNewStream(ih))
@@ -1153,6 +1154,7 @@ namespace stream
 
 	void StreamingDestination::SetMaxConnsPerMinute(const uint32_t conns)
 	{
+		m_EnableDrop = conns > 0;
 		m_ConnsPerMinute = conns;
 		LogPrint(eLogDebug, "Streaming: Set max conns per minute per destination to ", conns);
 	}

diff --git a/libi2pd/Streaming.h b/libi2pd/Streaming.h
@@ -317,6 +317,7 @@ namespace stream
 			uint64_t m_LastBanClear;
 
 			i2p::util::MemoryPool<Packet> m_PacketsPool;
+			bool m_EnableDrop;
 
 		public:
-Original file line number
+Diff line change
@@ Expand Up / @@ -317,6 +317,7 @@ namespace stream @@
     			uint64_t m_LastBanClear;
     			i2p::util::MemoryPool<Packet> m_PacketsPool;
+    			bool m_EnableDrop;
     		public:
@@ Expand Down @@