From e03a46d8e20cc87d503467ab2ab4969205ea8a07 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@d8a302eb-03bc-478d-80e4-98257eca68ef>
Date: Thu, 7 Aug 2014 21:17:51 +0000
Subject: [PATCH] x

git-svn-id: svn://elaine/murooma/trunk@156 d8a302eb-03bc-478d-80e4-98257eca68ef
---
 blocking_tcp_echo_server.cpp |  2 +-
 client.cpp                   | 16 +++++-----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/blocking_tcp_echo_server.cpp b/blocking_tcp_echo_server.cpp
index 307d3bd5..f3b25514 100644
--- a/blocking_tcp_echo_server.cpp
+++ b/blocking_tcp_echo_server.cpp
@@ -65,7 +65,7 @@ public:
 				size_t written = 0;
 				do
 				{
-					written += boost::asio::write(*socket_, boost::asio::buffer(chunk.get() + written, sizeof(WireChunk) - written), error);
+					written += boost::asio::write(*socket_, boost::asio::buffer(chunk.get() + written, sizeof(WireChunk) - written));//, error);
 				}
 				while (written < sizeof(WireChunk));
 
diff --git a/client.cpp b/client.cpp
index 8f8bc5ea..a6925d3e 100644
--- a/client.cpp
+++ b/client.cpp
@@ -48,31 +48,25 @@ void player()
 cout << "connect\n";
 				tcp::socket s(io_service);
 				s.connect(*iterator);
-				boost::system::error_code error;
-
-					WireChunk* wireChunk = new WireChunk();
+				void* wireChunk = (void*)malloc(sizeof(WireChunk));
 				while (true)
 				{
 					size_t toRead = sizeof(WireChunk);
 					size_t len = 0;
 					do 
 					{
-						len += s.read_some(boost::asio::buffer(wireChunk + len, toRead), error);
+						len += s.read_some(boost::asio::buffer((char*)wireChunk + len, toRead));
 						toRead = sizeof(WireChunk) - len;
-						cout << "len: " << len << "\ttoRead: " << toRead << "\n";
-						if (error == boost::asio::error::eof)
-							break;
+//						cout << "len: " << len << "\ttoRead: " << toRead << "\n";
 					}
 					while (toRead > 0);
-
-					cout << "new chunk\n";
-					stream->addChunk(new Chunk(wireChunk));
+					stream->addChunk(new Chunk((WireChunk*)wireChunk));
 				}
 			}
 			catch (std::exception& e)
 			{
 				std::cerr << "Exception: " << e.what() << "\n";
-				usleep(100*1000);
+				usleep(500*1000);
 			}
 		}
 	}