diff options
author | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2015-08-09 08:16:50 +0300 |
---|---|---|
committer | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2015-08-09 08:16:50 +0300 |
commit | 704bf55df5fae51bf0e8d86679ee7f34e22553d2 (patch) | |
tree | 68385079dec7204d8c646d4937e93d68cd4cbd42 /client-qt/udm-client-qt/client_session.h | |
parent | 5a4cbe950cd653385fc6e93aa860542b01bdf1bc (diff) |
client-qt:
socket wraper to work with both ssl and plain connection
server:
socket wraper to work with both ssl and plain connection
bit of config related changes
ssl support (untested)
Diffstat (limited to 'client-qt/udm-client-qt/client_session.h')
-rw-r--r-- | client-qt/udm-client-qt/client_session.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/client-qt/udm-client-qt/client_session.h b/client-qt/udm-client-qt/client_session.h index d50c972..4b7cfb3 100644 --- a/client-qt/udm-client-qt/client_session.h +++ b/client-qt/udm-client-qt/client_session.h @@ -35,6 +35,7 @@ using boost::asio::ip::tcp; class server_msg; +class socket_wraper; class client_session : public QObject { @@ -44,7 +45,7 @@ public: ~client_session(); // boost::asio::io_service &io_service(); - tcp::socket& socket(); +// tcp::socket& socket(); signals: void client_connected(bool success, QString error_text); //we are in threads, no links here @@ -65,8 +66,7 @@ private: bool ssl_enabled; char *recv_data_; boost::asio::io_service &io_service_; - tcp::socket *socket_; - boost::asio::ssl::stream<boost::asio::ip::tcp::socket> *socket_ssl_; + socket_wraper *socket_; QString pasword; QByteArray password_sha512; }; |