Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
74533859
Commit
74533859
authored
Aug 24, 2015
by
woogerboy21
Browse files
Merge pull request #1417 from woogerboy21/send_clientver
Extend the login protocol to send the client version (as optional)
parents
324ddda4
364df4da
Changes
2
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/remoteclient.cpp
View file @
74533859
...
...
@@ -12,6 +12,7 @@
#include
"pb/event_server_identification.pb.h"
#include
"settingscache.h"
#include
"main.h"
#include
"version_string.h"
static
const
unsigned
int
protocolVersion
=
14
;
...
...
@@ -112,6 +113,7 @@ void RemoteClient::doLogin()
cmdLogin
.
set_user_name
(
userName
.
toStdString
());
cmdLogin
.
set_password
(
password
.
toStdString
());
cmdLogin
.
set_clientid
(
settingsCache
->
getClientID
().
toStdString
());
cmdLogin
.
set_clientver
(
VERSION_STRING
);
PendingCommand
*
pend
=
prepareSessionCommand
(
cmdLogin
);
connect
(
pend
,
SIGNAL
(
finished
(
Response
,
CommandContainer
,
QVariant
)),
this
,
SLOT
(
loginResponse
(
Response
)));
sendCommand
(
pend
);
...
...
common/pb/session_commands.proto
View file @
74533859
...
...
@@ -44,6 +44,7 @@ message Command_Login {
optional
string
user_name
=
1
;
optional
string
password
=
2
;
optional
string
clientid
=
3
;
optional
string
clientver
=
4
;
}
message
Command_Message
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment