1 files changed, 1 insertions, 97 deletions
diff --git a/server/src/server.cpp b/server/src/server.cpp
index 7f2b20d..2436fda 100644
--- a/server/src/server.cpp
+++ b/server/src/server.cpp
@@ -22,107 +22,11 @@
 
 #include <boost/bind.hpp>
 #include "server.h"
+#include "server_session.h"
 #include "utilities.h"
 
 #include "../../protocol/udm.pb.h"
 
-server_session::server_session(boost::asio::io_service &s) : socket_(s)
-{
-}
-boost::asio::ip::tcp::socket& server_session::socket()
-{
-    return socket_;
-}
-
-
-void server_session::run()
-{
-    recv_data_ = new char[4];
-    boost::asio::async_read(socket_, boost::asio::buffer(recv_data_, 4), boost::bind(&server_session::handle_read, this, boost::asio::placeholders::error, boost::asio::placeholders::bytes_transferred));
-
-}
-
-void server_session::handle_read(const boost::system::error_code& error, size_t bytes_transferred)
-{
-    if (!error)
-    {
-        std::string s;
-//        bool parsed = false;
-        unsigned size =  ntohl(*(int32_t*)recv_data_);
-        delete [] recv_data_;
-        char *buf = new char[size];
-        boost::system::error_code ec;
-        socket_.read_some(boost::asio::buffer(buf, size), ec);
-        if(ec)
-		{
-
-		}
-        //TODO: check for error
-        s.append(buf, size);
-        delete [] buf;
-        if(size != s.length())
-        {
-            delete this;
-            return;
-        }
-        //TODO:
-        client_msg msg;
-        if(msg.ParseFromString(s))
-        {
-            //parsed = true;
-            handle_command(&msg);
-            recv_data_ = new char[4];
-            boost::asio::async_read(socket_, boost::asio::buffer(recv_data_, 4), boost::bind(&server_session::handle_read, this, boost::asio::placeholders::error, boost::asio::placeholders::bytes_transferred));
-        }
-//        if(!parsed)
-		else
-        {
-//        	BOOST_LOG_TRIVIAL(error)<<"failed to parse client message";
-            delete this; //close connection
-            return;
-        }
-    }
-    else
-    {
-        delete this;
-    }
-}
-
-void server_session::handle_command(client_msg *msg)
-{
-	switch(msg->type())
-	{
-	default:
-		break;
-	}
-}
-
-void server_session::send_message(server_msg *msg)
-{
-	int size = 0;
-	std::shared_ptr<char*> ptr = pack_msg(msg, &size);
-	boost::asio::async_write(socket_, boost::asio::buffer(*ptr, size), boost::bind(&server_session::handle_write, this, boost::asio::placeholders::error));
-}
-
-void server_session::handle_write(const boost::system::error_code& error)
-{
-    if(!error)
-    {
-        //TODO:
-    }
-    else
-    {
-    	//TODO: handle error
-    }
-//    recv_data_ = new char[4];
-//    boost::asio::async_read(socket_, boost::asio::buffer(recv_data_, 4), boost::bind(&server_session::handle_read, this, boost::asio::placeholders::error, boost::asio::placeholders::bytes_transferred));
-}
-
-
-server_session::~server_session()
-{
-	//dtor
-}
 
 
 server::server(boost::asio::io_service& io_service, short port) : io_service_(io_service), acceptor_(io_service, boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v4(), port))