diff options
| author | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2015-08-16 14:05:27 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2015-08-16 14:05:27 +0300 |
| commit | 3627d42af059a52d2095efc783550fe589d68bcb (patch) | |
| tree | 0ae26f664591260fa4e7754c2af9e4e45419e48a /server/src/server.cpp | |
| parent | 04edaab436dae1747270d7d10c0586a2a4c222bf (diff) | |
server:
some initial work on authentification part
client-qt:
some initial work on authentification part
Diffstat (limited to 'server/src/server.cpp')
| -rw-r--r-- | server/src/server.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/server/src/server.cpp b/server/src/server.cpp index 818cc10..8c2c965 100644 --- a/server/src/server.cpp +++ b/server/src/server.cpp @@ -24,16 +24,14 @@ #include "server.h" #include "server_session.h" #include "utilities.h" -#include "config.h" #include "../../protocol/udm.pb.h" #include "socket_wraper.h" -extern runtime_config_s runtime_config; -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)) +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_) { if(runtime_config.config_file.get<bool>("server.enable_encryption", false)) { @@ -50,7 +48,7 @@ server::server(boost::asio::io_service& io_service, short port) : io_service_(io void server::start_accept() { - server_session* new_session = new server_session(io_service_); + server_session* new_session = new server_session(io_service_, runtime_config, clients); 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 |