diff options
| author | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2015-08-21 04:05:55 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2015-08-21 04:05:55 +0300 |
| commit | c8029a36924fdad89b2455746bfd771da723287f (patch) | |
| tree | ecf981983d178176bd2e9619c7040c743c34d67d /server/src/server_session.cpp | |
| parent | c83c19a7d93ee77617c6e47bf0700346545b4611 (diff) | |
client-qt:
correct network thread termination
downloads model skeleton
filters model skeleton
empty download info tabwindow
main window layout
initial server data requests (settings, modules, downloads)
protocol:
renamed most of ui_* messages to download_ui* as it more precise
reworked ui related proto part
added download related messages (should be sufficient for now)
some work on event subscription part
bit of work on module related messages
added more top level messages (most of defined messages may be used now)
Diffstat (limited to 'server/src/server_session.cpp')
| -rw-r--r-- | server/src/server_session.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server/src/server_session.cpp b/server/src/server_session.cpp index d8c4f07..25e7820 100644 --- a/server/src/server_session.cpp +++ b/server/src/server_session.cpp @@ -130,11 +130,11 @@ void server_session::handle_command(client_msg *msg) m.mutable_auth_reply()->set_status(true); else { - switch(msg->auth_info().hash_type()) + switch(msg->auth_request().hash_type()) { case PASSWD_HASH_TYPE::HASH_NONE: { - if(msg->auth_info().password() != server_password) + if(msg->auth_request().password() != server_password) { m.mutable_auth_reply()->set_status(false); m.mutable_auth_reply()->set_error_description("wrong password"); @@ -157,7 +157,7 @@ void server_session::handle_command(client_msg *msg) { unsigned char hash[64]; SHA512((unsigned char*)server_password.c_str(), server_password.length(), hash); - if(msg->auth_info().password() != std::string((const char*)hash)) + if(msg->auth_request().password() != std::string((const char*)hash)) { m.mutable_auth_reply()->set_status(false); m.mutable_auth_reply()->set_error_description("wrong password"); |