server:

	implementing network io
client-qt:
	implementing network io

3 files changed, 126 insertions, 97 deletions

diff --git a/server/src/main.cpp b/server/src/main.cpp
index 7274da0..a876b42 100644
--- a/server/src/main.cpp
+++ b/server/src/main.cpp
@@ -162,6 +162,7 @@ int main(int argc, char *argv[])
 		}
 		boost::asio::io_service io_service_server;
 		try{
+			//TODO: server options (ssl, ...)
 			serv = new server(io_service_server, 6613);
 		}
 		catch(std::exception &e)
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))
diff --git a/server/src/server_session.cpp b/server/src/server_session.cpp
new file mode 100644
index 0000000..3fc3fb4
--- /dev/null
+++ b/server/src/server_session.cpp
@@ -0,0 +1,124 @@
+/*
+	Copyright © 2015 Gluzskiy Alexandr (sss)
+
+    This file is part of Unknown Download Manager (UDM).
+
+    UDM is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    UDM is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with UDM.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+
+#include <boost/bind.hpp>
+#include <boost/log/trivial.hpp>
+#include "server_session.h"
+#include "../../protocol/udm.pb.h"
+#include "utilities.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
+}