From 4b4002115d6c7b5c5113d1e2e6e9025565e1c9bb Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Mon, 31 Aug 2015 20:45:06 +0300 Subject: protocol: download struct must have module_name field server: core: implemented SERVER_DOWNLOADS_LIST_REPLY (draft) added global downloads list client: using std::string instead of QString to avoid unnecessary conversions --- server/src/server.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'server/src/server.cpp') diff --git a/server/src/server.cpp b/server/src/server.cpp index 8c2c965..9eb44f4 100644 --- a/server/src/server.cpp +++ b/server/src/server.cpp @@ -31,7 +31,7 @@ -server::server(boost::asio::io_service& io_service,runtime_config_s &config, std::map &clients_, short port) : io_service_(io_service), acceptor_(io_service, boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v4(), port)), runtime_config(config), clients(clients_) +server::server(boost::asio::io_service& io_service,runtime_config_s &config, std::map &clients_, std::map &downloads_, short port) : io_service_(io_service), acceptor_(io_service, boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v4(), port)), runtime_config(config), clients(clients_), downloads(downloads_) { if(runtime_config.config_file.get("server.enable_encryption", false)) { @@ -48,7 +48,7 @@ server::server(boost::asio::io_service& io_service,runtime_config_s &config, std void server::start_accept() { - server_session* new_session = new server_session(io_service_, runtime_config, clients); + server_session* new_session = new server_session(io_service_, runtime_config, clients, downloads); if(runtime_config.config_file.get("server.enable_encryption", false)) acceptor_.async_accept(new_session->socket()->get_ssl_socket().lowest_layer(), boost::bind(&server::handle_accept, this, new_session, boost::asio::placeholders::error)); else -- cgit v1.2.3