X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclientsyncer.cpp;h=1af95b8f791ffe64b64f24658eb07a87a01b1842;hb=906391224228274450914361efd104630827e580;hp=3b68b5c07a2c179ce59f4406a79b861ed44973a5;hpb=e06ce3bfa98752cb9e87586477dfaf31e7e1ab0a;p=quassel.git
diff --git a/src/client/clientsyncer.cpp b/src/client/clientsyncer.cpp
index 3b68b5c0..1af95b8f 100644
--- a/src/client/clientsyncer.cpp
+++ b/src/client/clientsyncer.cpp
@@ -33,12 +33,10 @@
#include "util.h"
ClientSyncer::ClientSyncer(QObject *parent)
- : QObject(parent)
+ : QObject(parent),
+ _socket(0),
+ _blockSize(0)
{
- socket = 0;
- blockSize = 0;
-
- connect(Client::signalProxy(), SIGNAL(disconnected()), this, SLOT(coreSocketDisconnected()));
}
ClientSyncer::~ClientSyncer() {
@@ -46,7 +44,7 @@ ClientSyncer::~ClientSyncer() {
void ClientSyncer::coreHasData() {
QVariant item;
- while(SignalProxy::readDataFromDevice(socket, blockSize, item)) {
+ while(SignalProxy::readDataFromDevice(_socket, _blockSize, item)) {
emit recvPartialItem(1,1);
QVariantMap msg = item.toMap();
if(!msg.contains("MsgType")) {
@@ -81,71 +79,55 @@ void ClientSyncer::coreHasData() {
return;
}
}
- if(blockSize > 0) {
- emit recvPartialItem(socket->bytesAvailable(), blockSize);
+ if(_blockSize > 0) {
+ emit recvPartialItem(_socket->bytesAvailable(), _blockSize);
}
}
void ClientSyncer::coreSocketError(QAbstractSocket::SocketError) {
- qDebug() << "coreSocketError" << socket << socket->errorString();
- emit connectionError(socket->errorString());
- socket->deleteLater();
+ qDebug() << "coreSocketError" << _socket << _socket->errorString();
+ emit connectionError(_socket->errorString());
+ resetConnection();
}
void ClientSyncer::disconnectFromCore() {
- if(socket) socket->close();
+ resetConnection();
}
void ClientSyncer::connectToCore(const QVariantMap &conn) {
- // TODO implement SSL
+ resetConnection();
coreConnectionInfo = conn;
- //if(isConnected()) {
- // emit coreConnectionError(tr("Already connected to Core!"));
- // return;
- // }
- if(socket != 0) {
- socket->deleteLater();
- socket = 0;
- }
+
if(conn["Host"].toString().isEmpty()) {
- emit connectionError(tr("Internal connections not yet supported."));
- return; // FIXME implement internal connections
- //clientMode = LocalCore;
- socket = new QBuffer(this);
- connect(socket, SIGNAL(readyRead()), this, SLOT(coreHasData()));
- socket->open(QIODevice::ReadWrite);
- //QVariant state = connectToLocalCore(coreConnectionInfo["User"].toString(), coreConnectionInfo["Password"].toString());
- //syncToCore(state);
- coreSocketConnected();
- } else {
- //clientMode = RemoteCore;
- //emit coreConnectionMsg(tr("Connecting..."));
- Q_ASSERT(!socket);
+ emit connectionError(tr("No Host to connect to specified."));
+ return;
+ }
+ Q_ASSERT(!_socket);
#ifdef HAVE_SSL
- QSslSocket *sock = new QSslSocket(Client::instance());
- connect(sock, SIGNAL(encrypted()), this, SIGNAL(encrypted()));
+ QSslSocket *sock = new QSslSocket(Client::instance());
#else
- if(conn["useSsl"].toBool()) {
- emit connectionError(tr("This client is built without SSL Support!
Disable the usage of SSL in the account settings."));
- return;
- }
- QTcpSocket *sock = new QTcpSocket(Client::instance());
+ if(conn["useSsl"].toBool()) {
+ emit connectionError(tr("This client is built without SSL Support!
Disable the usage of SSL in the account settings."));
+ return;
+ }
+ QTcpSocket *sock = new QTcpSocket(Client::instance());
#endif
+
#ifndef QT_NO_NETWORKPROXY
- if(conn.contains("useProxy") && conn["useProxy"].toBool()) {
- QNetworkProxy proxy((QNetworkProxy::ProxyType)conn["proxyType"].toInt(), conn["proxyHost"].toString(), conn["proxyPort"].toUInt(), conn["proxyUser"].toString(), conn["proxyPassword"].toString());
- sock->setProxy(proxy);
- }
-#endif
- socket = sock;
- connect(sock, SIGNAL(readyRead()), this, SLOT(coreHasData()));
- connect(sock, SIGNAL(connected()), this, SLOT(coreSocketConnected()));
- connect(sock, SIGNAL(disconnected()), this, SLOT(coreSocketDisconnected()));
- connect(sock, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(coreSocketError(QAbstractSocket::SocketError)));
- connect(sock, SIGNAL(stateChanged(QAbstractSocket::SocketState)), this, SIGNAL(socketStateChanged(QAbstractSocket::SocketState)));
- sock->connectToHost(conn["Host"].toString(), conn["Port"].toUInt());
+ if(conn.contains("useProxy") && conn["useProxy"].toBool()) {
+ QNetworkProxy proxy((QNetworkProxy::ProxyType)conn["proxyType"].toInt(), conn["proxyHost"].toString(), conn["proxyPort"].toUInt(), conn["proxyUser"].toString(), conn["proxyPassword"].toString());
+ sock->setProxy(proxy);
}
+#endif
+
+ _socket = sock;
+ connect(sock, SIGNAL(readyRead()), this, SLOT(coreHasData()));
+ connect(sock, SIGNAL(connected()), this, SLOT(coreSocketConnected()));
+ connect(sock, SIGNAL(disconnected()), this, SLOT(coreSocketDisconnected()));
+ connect(sock, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(coreSocketError(QAbstractSocket::SocketError)));
+ connect(sock, SIGNAL(stateChanged(QAbstractSocket::SocketState)), this, SIGNAL(socketStateChanged(QAbstractSocket::SocketState)));
+ sock->connectToHost(conn["Host"].toString(), conn["Port"].toUInt());
}
void ClientSyncer::coreSocketConnected() {
@@ -165,7 +147,7 @@ void ClientSyncer::coreSocketConnected() {
clientInit["UseCompression"] = false;
#endif
- SignalProxy::writeDataToDevice(socket, clientInit);
+ SignalProxy::writeDataToDevice(_socket, clientInit);
}
void ClientSyncer::useInternalCore() {
@@ -202,14 +184,8 @@ void ClientSyncer::useInternalCore() {
void ClientSyncer::coreSocketDisconnected() {
emit socketDisconnected();
- Client::instance()->disconnectFromCore();
-
- // FIXME handle disconnects gracefully in here as well!
-
- coreConnectionInfo.clear();
- netsToSync.clear();
- blockSize = 0;
- //restartPhaseNull();
+ resetConnection();
+ // FIXME handle disconnects gracefully
}
void ClientSyncer::clientInitAck(const QVariantMap &msg) {
@@ -221,11 +197,11 @@ void ClientSyncer::clientInitAck(const QVariantMap &msg) {
disconnectFromCore();
return;
}
- emit connectionMsg(msg["CoreInfo"].toString());
+ emit connectionMsg(coreInfoString(msg));
#ifndef QT_NO_COMPRESS
if(msg["SupportsCompression"].toBool()) {
- socket->setProperty("UseCompression", true);
+ _socket->setProperty("UseCompression", true);
}
#endif
@@ -233,7 +209,7 @@ void ClientSyncer::clientInitAck(const QVariantMap &msg) {
#ifdef HAVE_SSL
if(coreConnectionInfo["useSsl"].toBool()) {
if(msg["SupportSsl"].toBool()) {
- QSslSocket *sslSocket = qobject_cast(socket);
+ QSslSocket *sslSocket = qobject_cast(_socket);
Q_ASSERT(sslSocket);
connect(sslSocket, SIGNAL(encrypted()), this, SLOT(sslSocketEncrypted()));
connect(sslSocket, SIGNAL(sslErrors(const QList &)), this, SLOT(sslErrors(const QList &)));
@@ -265,7 +241,7 @@ void ClientSyncer::doCoreSetup(const QVariant &setupData) {
QVariantMap setup;
setup["MsgType"] = "CoreSetupData";
setup["SetupData"] = setupData;
- SignalProxy::writeDataToDevice(socket, setup);
+ SignalProxy::writeDataToDevice(_socket, setup);
}
void ClientSyncer::loginToCore(const QString &user, const QString &passwd) {
@@ -274,7 +250,7 @@ void ClientSyncer::loginToCore(const QString &user, const QString &passwd) {
clientLogin["MsgType"] = "ClientLogin";
clientLogin["User"] = user;
clientLogin["Password"] = passwd;
- SignalProxy::writeDataToDevice(socket, clientLogin);
+ SignalProxy::writeDataToDevice(_socket, clientLogin);
}
void ClientSyncer::internalSessionStateReceived(const QVariant &packedState) {
@@ -287,8 +263,14 @@ void ClientSyncer::internalSessionStateReceived(const QVariant &packedState) {
void ClientSyncer::sessionStateReceived(const QVariantMap &state) {
emit sessionProgress(1, 1);
disconnect(this, SIGNAL(recvPartialItem(quint32, quint32)), this, SIGNAL(sessionProgress(quint32, quint32)));
- disconnect(socket, 0, this, 0); // rest of communication happens through SignalProxy
- Client::instance()->setConnectedToCore(coreConnectionInfo["AccountId"].value(), socket);
+
+ // rest of communication happens through SignalProxy...
+ disconnect(_socket, 0, this, 0);
+ // ... but we still want to be notified about errors...
+ connect(_socket, SIGNAL(disconnected()), this, SLOT(coreSocketDisconnected()));
+ connect(_socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(coreSocketError(QAbstractSocket::SocketError)));
+
+ Client::instance()->setConnectedToCore(coreConnectionInfo["AccountId"].value(), _socket);
syncToCore(state);
}
@@ -348,9 +330,46 @@ void ClientSyncer::resetWarningsHandler() {
disconnect(this, SIGNAL(handleIgnoreWarnings(bool)), this, 0);
}
+void ClientSyncer::resetConnection() {
+ if(_socket) {
+ disconnect(_socket, 0, this, 0);
+ _socket->deleteLater();
+ _socket = 0;
+ }
+ _blockSize = 0;
+
+ coreConnectionInfo.clear();
+ _coreMsgBuffer.clear();
+
+ netsToSync.clear();
+ numNetsToSync = 0;
+}
+
+QString ClientSyncer::coreInfoString(const QVariantMap &coreData) {
+ // check if we use a new enough core
+ // FIXME: this can go away after v11 protocol bump
+ if(!coreData.contains("CoreStartTime"))
+ return coreData.value("CoreInfo").toString();
+
+ QDateTime startTime = coreData.value("CoreStartTime").toDateTime().toLocalTime();
+ int uptime = startTime.secsTo(QDateTime::currentDateTime());
+ int updays = uptime / 86400; uptime %= 86400;
+ int uphours = uptime / 3600; uptime %= 3600;
+ int upmins = uptime / 60; uptime %= 60;
+
+ QString reply = tr("Quassel Core Version %1
"
+ "Built: %2
"
+ "Up %3d%4h%5m (since %6)")
+ .arg(coreData.value("CoreVersion").toString())
+ .arg(coreData.value("CoreDate").toString())
+ .arg(updays).arg(uphours,2,10,QChar('0')).arg(upmins,2,10,QChar('0')).arg(startTime.toString(Qt::TextDate));
+
+ return reply;
+}
+
#ifdef HAVE_SSL
void ClientSyncer::ignoreSslWarnings(bool permanently) {
- QSslSocket *sock = qobject_cast(socket);
+ QSslSocket *sock = qobject_cast(_socket);
if(sock) {
// ensure that a proper state is displayed and no longer a warning
emit socketStateChanged(sock->state());
@@ -361,27 +380,44 @@ void ClientSyncer::ignoreSslWarnings(bool permanently) {
else
KnownHostsSettings().saveKnownHost(sock);
}
- emit connectionMsg(_coreMsgBuffer["CoreInfo"].toString());
+ emit connectionMsg(coreInfoString(_coreMsgBuffer));
connectionReady();
}
void ClientSyncer::sslSocketEncrypted() {
QSslSocket *socket = qobject_cast(sender());
- if(socket) {
- QByteArray digest = socket->peerCertificate().digest();
+ Q_ASSERT(socket);
+
+ // if there were sslErrors we already had extensive error handling
+ // no need to check for a digest change again.
+ if(!socket->sslErrors().isEmpty())
+ return;
+
+ QByteArray knownDigest = KnownHostsSettings().knownDigest(socket);
+ if(knownDigest == socket->peerCertificate().digest()) {
+ connectionReady();
+ return;
}
+
+ QStringList warnings;
+ if(!knownDigest.isEmpty()) {
+ warnings << tr("Cert Digest changed! was: %1").arg(QString(prettyDigest(knownDigest)));
+ }
+
+ setWarningsHandler(SLOT(ignoreSslWarnings(bool)));
+ emit connectionWarnings(warnings);
}
void ClientSyncer::sslErrors(const QList &errors) {
- QByteArray knownDigest;
QSslSocket *socket = qobject_cast(sender());
- if(socket) {
- socket->ignoreSslErrors();
- knownDigest = KnownHostsSettings().knownDigest(socket);
- if(knownDigest == socket->peerCertificate().digest()) {
- connectionReady();
- return;
- }
+ Q_ASSERT(socket);
+
+ socket->ignoreSslErrors();
+
+ QByteArray knownDigest = KnownHostsSettings().knownDigest(socket);
+ if(knownDigest == socket->peerCertificate().digest()) {
+ connectionReady();
+ return;
}
QStringList warnings;