diff options
| author | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2015-08-31 20:45:06 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2015-08-31 20:45:06 +0300 |
| commit | 4b4002115d6c7b5c5113d1e2e6e9025565e1c9bb (patch) | |
| tree | 4e4ecc6d26052bb5f50acd0c1a9260aceb5479fd /server/src/server.cpp | |
| parent | 12eba4d75931c5e48dac70b1a7dbad7861d059df (diff) | |
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
Diffstat (limited to 'server/src/server.cpp')
| -rw-r--r-- | server/src/server.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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<std::string, client*> &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<std::string, client*> &clients_, std::map<int, download_internal_s> &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<bool>("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<bool>("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 |