From 5c48d14a9ab31a31f7f17c715dcf5847251dd204 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Thu, 30 Jul 2015 04:33:06 +0300 Subject: server: implementing network io client-qt: implementing network io --- client-qt/udm-client-qt/client_session.cpp | 38 +++++++++ client-qt/udm-client-qt/client_session.h | 33 ++++++++ client-qt/udm-client-qt/udm-client-qt.pro | 12 ++- server/include/server.h | 24 +----- server/include/server_session.h | 52 ++++++++++++ server/src/main.cpp | 1 + server/src/server.cpp | 98 +---------------------- server/src/server_session.cpp | 124 +++++++++++++++++++++++++++++ server/udm-server.cbp | 5 ++ 9 files changed, 266 insertions(+), 121 deletions(-) create mode 100644 client-qt/udm-client-qt/client_session.cpp create mode 100644 client-qt/udm-client-qt/client_session.h create mode 100644 server/include/server_session.h create mode 100644 server/src/server_session.cpp diff --git a/client-qt/udm-client-qt/client_session.cpp b/client-qt/udm-client-qt/client_session.cpp new file mode 100644 index 0000000..ed22fad --- /dev/null +++ b/client-qt/udm-client-qt/client_session.cpp @@ -0,0 +1,38 @@ +#include "client_session.h" +#include +#include + +client_session::client_session(QObject *parent, boost::asio::io_service *io_service) : QObject(parent), io_service_(*io_service), socket_(*io_service) +{ + +} + + +tcp::socket& client_session::socket() +{ + return socket_; +} + +void client_session::connect(std::string &host, int port) +{ + //TODO: settings for connection timeout + boost::asio::ip::tcp::resolver r(io_service_); + boost::asio::ip::tcp::endpoint ep; + ep.port(port); + ep.address(boost::asio::ip::address::from_string(host)); + socket_.async_connect(ep, boost::bind(&client_session::connect_handler, this, boost::asio::placeholders::error)); +} + +void client_session::connect_handler(const boost::system::error_code &e) +{ + BOOST_LOG_TRIVIAL(debug)<<__FILE__<<":"<<__LINE__<<"\t"< +#include + + + +using boost::asio::ip::tcp; + +class client_session : public QObject +{ + Q_OBJECT +public: + explicit client_session(QObject *parent = 0, boost::asio::io_service *io_service = nullptr); + + tcp::socket& socket(); + +signals: + +public slots: + void connect(std::string &host, int port); +private: + void connect_handler(const boost::system::error_code &error); + char *recv_data_; + boost::asio::io_service &io_service_; + tcp::socket socket_; +}; + +#endif // CLIENT_SESSION_H diff --git a/client-qt/udm-client-qt/udm-client-qt.pro b/client-qt/udm-client-qt/udm-client-qt.pro index ce81c93..d1ad0cd 100644 --- a/client-qt/udm-client-qt/udm-client-qt.pro +++ b/client-qt/udm-client-qt/udm-client-qt.pro @@ -6,13 +6,19 @@ QT += core gui +QMAKE_CXXFLAGS += -std=c++11 +QMAKE_CFLAGS += -std=c++11 +DEFINES += BOOST_LOG_DYN_LINK + greaterThan(QT_MAJOR_VERSION, 4): QT += widgets TARGET = udm-client-qt TEMPLATE = app - +unix:LIBS += -lboost_system -lboost_thread -lboost_log -lpthread SOURCES += main.cpp\ - udm_main.cpp + udm_main.cpp \ + client_session.cpp -HEADERS += udm_main.h +HEADERS += udm_main.h \ + client_session.h diff --git a/server/include/server.h b/server/include/server.h index e672bc3..83d3b5b 100644 --- a/server/include/server.h +++ b/server/include/server.h @@ -24,28 +24,10 @@ #include -class client_msg; -class server_msg; +//TODO ssl + +class server_session; -class server_session -{ - public: - server_session(boost::asio::io_service &s); - void run(); - void send_message(server_msg *msg); - boost::asio::ip::tcp::socket& socket(); - virtual ~server_session(); - protected: - private: - void handle_read(const boost::system::error_code& error, size_t bytes_transferred); - void handle_write(const boost::system::error_code& error); - void handle_write_no_read(const boost::system::error_code& error); - void handle_command(client_msg *msg); - - const int buf_size = 512; - char *recv_data_; - boost::asio::ip::tcp::socket socket_; -}; class server { diff --git a/server/include/server_session.h b/server/include/server_session.h new file mode 100644 index 0000000..23c1fa6 --- /dev/null +++ b/server/include/server_session.h @@ -0,0 +1,52 @@ +/* + 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 . + +*/ + + +#ifndef SERVER_SESSION_H +#define SERVER_SESSION_H + +#include + +class client_msg; +class server_msg; + + +class server_session +{ + public: + server_session(boost::asio::io_service &s); + void run(); + void send_message(server_msg *msg); + boost::asio::ip::tcp::socket& socket(); + virtual ~server_session(); + protected: + private: + void handle_read(const boost::system::error_code& error, size_t bytes_transferred); + void handle_write(const boost::system::error_code& error); + void handle_write_no_read(const boost::system::error_code& error); + void handle_command(client_msg *msg); + + const int buf_size = 512; + char *recv_data_; + boost::asio::ip::tcp::socket socket_; +}; + + +#endif // SERVER_SESSION_H 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 #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 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 . + +*/ + + +#include +#include +#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 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 +} diff --git a/server/udm-server.cbp b/server/udm-server.cbp index 462f8e3..27c86bb 100644 --- a/server/udm-server.cbp +++ b/server/udm-server.cbp @@ -33,6 +33,7 @@ + @@ -42,6 +43,8 @@ + + @@ -57,12 +60,14 @@ + + -- cgit v1.2.3