From cbfe8b8232dcaccc24728f50f365939f27dc576c Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Tue, 30 Dec 2014 22:37:14 -0500
Subject: [PATCH] invoke accepter after receiving remote identity

---
 Streaming.cpp | 21 ++++++++++++++-------
 Streaming.h   |  1 +
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Streaming.cpp b/Streaming.cpp
index 3aa5f835..eb6add1c 100644
--- a/Streaming.cpp
+++ b/Streaming.cpp
@@ -162,7 +162,10 @@ namespace stream
 			optionData += m_RemoteIdentity.FromBuffer (optionData, packet->GetOptionSize ());
 			LogPrint (eLogInfo, "From identity ", m_RemoteIdentity.GetIdentHash ().ToBase64 ());		
 			if (!m_RemoteLeaseSet)
+			{	
 				LogPrint (eLogDebug, "Incoming stream from ", m_RemoteIdentity.GetIdentHash ().ToBase64 ());
+				m_LocalDestination.StreamAccepted (shared_from_this ());
+			}	
 		}	
 
 		if (flags & PACKET_FLAG_MAX_PACKET_SIZE_INCLUDED)
@@ -642,6 +645,17 @@ namespace stream
 		}	
 	}	
 
+	void StreamingDestination::StreamAccepted (std::shared_ptr<Stream> stream)
+	{
+		if (m_Acceptor != nullptr)
+			m_Acceptor (stream);
+		else
+		{
+			LogPrint ("Acceptor for incoming stream is not set");
+			DeleteStream (stream);
+		}	
+	}	
+		
 	void StreamingDestination::HandleNextPacket (Packet * packet)
 	{
 		uint32_t sendStreamID = packet->GetSendStreamID ();
@@ -660,13 +674,6 @@ namespace stream
 		{
 			auto incomingStream = CreateNewIncomingStream ();
 			incomingStream->HandleNextPacket (packet);
-			if (m_Acceptor != nullptr)
-				m_Acceptor (incomingStream);
-			else
-			{
-				LogPrint ("Acceptor for incoming stream is not set");
-				DeleteStream (incomingStream);
-			}
 		}	
 	}	
 
diff --git a/Streaming.h b/Streaming.h
index 69ef124d..f049540e 100644
--- a/Streaming.h
+++ b/Streaming.h
@@ -170,6 +170,7 @@ namespace stream
 			void SetAcceptor (const Acceptor& acceptor) { m_Acceptor = acceptor; };
 			void ResetAcceptor () { m_Acceptor = nullptr; };
 			bool IsAcceptorSet () const { return m_Acceptor != nullptr; };	
+			void StreamAccepted (std::shared_ptr<Stream> stream);
 			i2p::client::ClientDestination& GetOwner () { return m_Owner; };
 
 			void HandleDataMessagePayload (const uint8_t * buf, size_t len);