From 06b25003473d6fcffe0cc1c8bdb725812aaff263 Mon Sep 17 00:00:00 2001
From: orignal <romakoshelkin@yandex.ru>
Date: Wed, 26 Mar 2014 15:06:27 -0400
Subject: [PATCH] async receive

---
 Streaming.cpp | 9 +++++++--
 Streaming.h   | 7 ++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Streaming.cpp b/Streaming.cpp
index d68f08c7..7af4d291 100644
--- a/Streaming.cpp
+++ b/Streaming.cpp
@@ -248,7 +248,12 @@ namespace stream
 				return 0;
 		}
 
-		// either non-empty or we have received empty
+		// either non-empty or we have received something
+		return ConcatenatePackets (buf, len);
+	}	
+
+	size_t Stream::ConcatenatePackets (uint8_t * buf, size_t len)
+	{
 		size_t pos = 0;
 		while (pos < len)
 		{
@@ -269,7 +274,7 @@ namespace stream
 				break;
 		}	
 		return pos; 
-	}	
+	}
 
 	bool Stream::SendPacket (Packet * packet)
 	{
diff --git a/Streaming.h b/Streaming.h
index 3de8f3e2..37195ebb 100644
--- a/Streaming.h
+++ b/Streaming.h
@@ -97,6 +97,7 @@ namespace stream
 
 			void SavePacket (Packet * packet);
 			void ProcessPacket (Packet * packet);
+			size_t ConcatenatePackets (uint8_t * buf, size_t len);
 
 			void UpdateCurrentRemoteLease ();
 			
@@ -207,13 +208,13 @@ namespace stream
 	template<typename Buffer, typename ReceiveHandler>
 	void Stream::HandleReceiveTimer (const boost::system::error_code& ecode, const Buffer& buffer, ReceiveHandler handler)
 	{
-		// TODO:
+		size_t received = ConcatenatePackets (boost::asio::buffer_cast<uint8_t *>(buffer), boost::asio::buffer_size(buffer));
 		if (ecode == boost::asio::error::operation_aborted)
 			// timeout not expired	
-			handler (boost::system::error_code (), 0);
+			handler (boost::system::error_code (), received);
 		else
 			// timeout expired
-			handler (boost::asio::error::make_error_code (boost::asio::error::timed_out), 0);
+			handler (boost::asio::error::make_error_code (boost::asio::error::timed_out), received);
 	}
 }		
 }