projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Attempt to link against openldap on Windows, too
[quassel.git]
/
src
/
common
/
protocols
/
datastream
/
datastreampeer.cpp
diff --git
a/src/common/protocols/datastream/datastreampeer.cpp
b/src/common/protocols/datastream/datastreampeer.cpp
index
b2e4443
..
acf7a42
100644
(file)
--- a/
src/common/protocols/datastream/datastreampeer.cpp
+++ b/
src/common/protocols/datastream/datastreampeer.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
4
by the Quassel Project *
+ * Copyright (C) 2005-201
6
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-19,12
+19,11
@@
***************************************************************************/
#include <QtEndian>
***************************************************************************/
#include <QtEndian>
-
+#include <QDataStream>
#include <QHostAddress>
#include <QTcpSocket>
#include "datastreampeer.h"
#include <QHostAddress>
#include <QTcpSocket>
#include "datastreampeer.h"
-#include "quassel.h"
using namespace Protocol;
using namespace Protocol;
@@
-117,7
+116,7
@@
void DataStreamPeer::handleHandshakeMessage(const QVariantList &mapData)
}
if (msgType == "ClientInit") {
}
if (msgType == "ClientInit") {
- handle(RegisterClient(m["ClientVersion"].toString(), false)); // UseSsl obsolete
+ handle(RegisterClient(m["ClientVersion"].toString(),
m["ClientDate"].toString(),
false)); // UseSsl obsolete
}
else if (msgType == "ClientInitReject") {
}
else if (msgType == "ClientInitReject") {
@@
-125,12
+124,12
@@
void DataStreamPeer::handleHandshakeMessage(const QVariantList &mapData)
}
else if (msgType == "ClientInitAck") {
}
else if (msgType == "ClientInitAck") {
- handle(ClientRegistered(m["CoreFeatures"].toUInt(), m["Configured"].toBool(), m["StorageBackends"].toList(), false,
QDateTime())); // SupportsSsl and coreStartTime
obsolete
+ handle(ClientRegistered(m["CoreFeatures"].toUInt(), m["Configured"].toBool(), m["StorageBackends"].toList(), false,
m["AuthBackends"].toList())); // SupportsSsl
obsolete
}
else if (msgType == "CoreSetupData") {
QVariantMap map = m["SetupData"].toMap();
}
else if (msgType == "CoreSetupData") {
QVariantMap map = m["SetupData"].toMap();
- handle(SetupData(map["AdminUser"].toString(), map["AdminPasswd"].toString(), map["Backend"].toString(), map["ConnectionProperties"].toMap()));
+ handle(SetupData(map["AdminUser"].toString(), map["AdminPasswd"].toString(), map["Backend"].toString(), map["ConnectionProperties"].toMap()
, map["AuthBackend"].toString(), map["AuthProperties"].toMap()
));
}
else if (msgType == "CoreSetupReject") {
}
else if (msgType == "CoreSetupReject") {
@@
-168,7
+167,7
@@
void DataStreamPeer::dispatch(const RegisterClient &msg) {
QVariantMap m;
m["MsgType"] = "ClientInit";
m["ClientVersion"] = msg.clientVersion;
QVariantMap m;
m["MsgType"] = "ClientInit";
m["ClientVersion"] = msg.clientVersion;
- m["ClientDate"] =
Quassel::buildInfo()
.buildDate;
+ m["ClientDate"] =
msg
.buildDate;
writeMessage(m);
}
writeMessage(m);
}
@@
-188,6
+187,7
@@
void DataStreamPeer::dispatch(const ClientRegistered &msg) {
m["MsgType"] = "ClientInitAck";
m["CoreFeatures"] = msg.coreFeatures;
m["StorageBackends"] = msg.backendInfo;
m["MsgType"] = "ClientInitAck";
m["CoreFeatures"] = msg.coreFeatures;
m["StorageBackends"] = msg.backendInfo;
+ m["AuthBackends"] = msg.authBackendInfo;
m["LoginEnabled"] = m["Configured"] = msg.coreConfigured;
writeMessage(m);
m["LoginEnabled"] = m["Configured"] = msg.coreConfigured;
writeMessage(m);
@@
-202,6
+202,11
@@
void DataStreamPeer::dispatch(const SetupData &msg)
map["Backend"] = msg.backend;
map["ConnectionProperties"] = msg.setupData;
map["Backend"] = msg.backend;
map["ConnectionProperties"] = msg.setupData;
+ // Auth backend properties.
+ // XXX: make these optional using core features.
+ map["AuthBackend"] = msg.authenticator;
+ map["AuthProperties"] = msg.authSetupData;
+
QVariantMap m;
m["MsgType"] = "CoreSetupData";
m["SetupData"] = map;
QVariantMap m;
m["MsgType"] = "CoreSetupData";
m["SetupData"] = map;