#include "clientsyncer.h"
+#ifndef QT_NO_NETWORKPROXY
+# include <QNetworkProxy>
+#endif
+
#include "client.h"
-#include "global.h"
#include "identity.h"
#include "ircuser.h"
#include "ircchannel.h"
#include "network.h"
+#include "networkmodel.h"
+#include "quassel.h"
#include "signalproxy.h"
-
-ClientSyncer::ClientSyncer(QObject *parent) : QObject(parent) {
+ClientSyncer::ClientSyncer(QObject *parent)
+ : QObject(parent)
+{
socket = 0;
blockSize = 0;
connect(Client::signalProxy(), SIGNAL(disconnected()), this, SLOT(coreSocketDisconnected()));
-
}
ClientSyncer::~ClientSyncer() {
-
-
}
void ClientSyncer::coreHasData() {
emit loginSuccess();
} else if(msg["MsgType"] == "SessionInit") {
sessionStateReceived(msg["SessionState"].toMap());
+ break; // this is definitively the last message we process here!
} else {
emit connectionError(tr("<b>Invalid data received from core!</b><br>Disconnecting."));
disconnectFromCore();
return;
}
- /*
- if (!msg["StartWizard"].toBool()) {
- recvCoreState(msg["Reply"]);
- } else {
- qWarning("Core not configured!");
- qDebug() << "Available storage providers: " << msg["StorageProviders"].toStringList();
- emit showConfigWizard(msg);
- }
- blockSize = 0;
- return;
- }
- */
}
if(blockSize > 0) {
emit recvPartialItem(socket->bytesAvailable(), blockSize);
}
void ClientSyncer::coreSocketError(QAbstractSocket::SocketError) {
+ qDebug() << "coreSocketError" << socket << socket->errorString();
emit connectionError(socket->errorString());
socket->deleteLater();
}
//clientMode = RemoteCore;
//emit coreConnectionMsg(tr("Connecting..."));
Q_ASSERT(!socket);
+
+#ifdef HAVE_SSL
+ QSslSocket *sock = new QSslSocket(Client::instance());
+#else
+ if(conn["useSsl"].toBool()) {
+ emit connectionError(tr("<b>This client is built without SSL Support!</b><br />Disable the usage of SSL in the account settings."));
+ emit encrypted(false);
+ 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()));
//emit coreConnectionMsg(tr("Synchronizing to core..."));
QVariantMap clientInit;
clientInit["MsgType"] = "ClientInit";
- clientInit["ClientVersion"] = Global::quasselVersion;
- clientInit["ClientDate"] = Global::quasselDate;
- clientInit["ClientBuild"] = Global::quasselBuild; // this is a minimum, since we probably won't update for every commit
- clientInit["UseSsl"] = false; // FIXME implement SSL
+ clientInit["ClientVersion"] = Quassel::buildInfo().fancyVersionString;
+ clientInit["ClientDate"] = Quassel::buildInfo().buildDate;
+ clientInit["ProtocolVersion"] = Quassel::buildInfo().protocolVersion;
+ clientInit["UseSsl"] = coreConnectionInfo["useSsl"];
+#ifndef QT_NO_COMPRESS
+ clientInit["UseCompression"] = true;
+#else
+ clientInit["UseCompression"] = false;
+#endif
+
SignalProxy::writeDataToDevice(socket, clientInit);
}
+void ClientSyncer::useInternalCore() {
+ emit startInternalCore();
+ emit connectToInternalCore(Client::instance()->signalProxy());
+}
+
void ClientSyncer::coreSocketDisconnected() {
emit socketDisconnected();
Client::instance()->disconnectFromCore();
coreConnectionInfo.clear();
netsToSync.clear();
- channelsToSync.clear();
- usersToSync.clear();
blockSize = 0;
//restartPhaseNull();
}
void ClientSyncer::clientInitAck(const QVariantMap &msg) {
// Core has accepted our version info and sent its own. Let's see if we accept it as well...
- if(msg["CoreBuild"].toUInt() < Global::coreBuildNeeded) {
+ uint ver = msg["ProtocolVersion"].toUInt();
+ if(ver < Quassel::buildInfo().clientNeedsProtocol) {
emit connectionError(tr("<b>The Quassel Core you are trying to connect to is too old!</b><br>"
- "Need at least a Core Version %1 (Build >= %2) to connect.").arg(Global::quasselVersion).arg(Global::coreBuildNeeded));
+ "Need at least core/client protocol v%1 to connect.").arg(Quassel::buildInfo().clientNeedsProtocol));
disconnectFromCore();
return;
}
emit connectionMsg(msg["CoreInfo"].toString());
+
+#ifdef HAVE_SSL
+ if(coreConnectionInfo["useSsl"].toBool()) {
+ if(msg["SupportSsl"].toBool()) {
+ QSslSocket *sslSocket = qobject_cast<QSslSocket *>(socket);
+ Q_ASSERT(sslSocket);
+ connect(sslSocket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(sslErrors(const QList<QSslError> &)));
+ sslSocket->startClientEncryption();
+ emit encrypted(true);
+ Client::instance()->setSecuredConnection();
+ } else {
+ emit connectionError(tr("<b>The Quassel Core you are trying to connect to does not support SSL!</b><br />If you want to connect anyways, disable the usage of SSL in the account settings."));
+ emit encrypted(false);
+ disconnectFromCore();
+ return;
+ }
+ }
+#endif
+
+#ifndef QT_NO_COMPRESS
+ if(msg["SupportsCompression"].toBool()) {
+ socket->setProperty("UseCompression", true);
+ }
+#endif
+
if(!msg["Configured"].toBool()) {
// start wizard
emit startCoreSetup(msg["StorageBackends"].toList());
SignalProxy::writeDataToDevice(socket, clientLogin);
}
+void ClientSyncer::internalSessionStateReceived(const QVariant &packedState) {
+ QVariantMap state = packedState.toMap();
+ emit sessionProgress(1, 1);
+ Client::instance()->setConnectedToInternalCore();
+ syncToCore(state);
+}
+
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::signalProxy()->addPeer(socket);
Client::instance()->setConnectedToCore(socket, coreConnectionInfo["AccountId"].value<AccountId>());
syncToCore(state);
}
void ClientSyncer::syncToCore(const QVariantMap &sessionState) {
-
// create identities
foreach(QVariant vid, sessionState["Identities"].toList()) {
Client::instance()->coreIdentityCreated(vid.value<Identity>());
// create buffers
// FIXME: get rid of this crap
QVariantList bufferinfos = sessionState["BufferInfos"].toList();
- foreach(QVariant vinfo, bufferinfos) Client::buffer(vinfo.value<BufferInfo>()); // create Buffers and BufferItems
+ NetworkModel *networkModel = Client::networkModel();
+ Q_ASSERT(networkModel);
+ foreach(QVariant vinfo, bufferinfos)
+ networkModel->bufferUpdated(vinfo.value<BufferInfo>()); // create BufferItems
QVariantList networkids = sessionState["NetworkIds"].toList();
- // prepare sync progress thingys... FIXME: Care about removal of networks
+ // prepare sync progress thingys...
+ // FIXME: Care about removal of networks
numNetsToSync = networkids.count();
- numChannelsToSync = 0; //sessionState["IrcChannelCount"].toUInt();
- numUsersToSync = 0; // sessionState["IrcUserCount"].toUInt(); qDebug() << numUsersToSync;
emit networksProgress(0, numNetsToSync);
- emit channelsProgress(0, numChannelsToSync);
- emit ircUsersProgress(0, numUsersToSync);
// create network objects
foreach(QVariant networkid, networkids) {
NetworkId netid = networkid.value<NetworkId>();
+ if(Client::network(netid))
+ continue;
Network *net = new Network(netid, Client::instance());
netsToSync.insert(net);
connect(net, SIGNAL(initDone()), this, SLOT(networkInitDone()));
- connect(net, SIGNAL(ircUserInitDone(IrcUser *)), this, SLOT(ircUserInitDone(IrcUser *)));
- connect(net, SIGNAL(ircUserAdded(IrcUser *)), this, SLOT(ircUserAdded(IrcUser *)));
- connect(net, SIGNAL(ircUserRemoved(QObject *)), this, SLOT(ircUserRemoved(QObject *)));
- connect(net, SIGNAL(ircChannelInitDone(IrcChannel *)), this, SLOT(ircChannelInitDone(IrcChannel *)));
- connect(net, SIGNAL(ircChannelAdded(IrcChannel *)), this, SLOT(ircChannelAdded(IrcChannel *)));
- connect(net, SIGNAL(ircChannelRemoved(QObject *)), this, SLOT(ircChannelRemoved(QObject *)));
Client::addNetwork(net);
}
checkSyncState();
checkSyncState();
}
-void ClientSyncer::ircChannelInitDone(IrcChannel *chan) {
- channelsToSync.remove(chan);
- emit channelsProgress(numChannelsToSync - channelsToSync.count(), numChannelsToSync);
- checkSyncState();
-}
-
-void ClientSyncer::ircChannelAdded(IrcChannel *chan) {
- if(!chan->isInitialized()) {
- channelsToSync.insert(chan);
- numChannelsToSync++;
- emit channelsProgress(numChannelsToSync - channelsToSync.count(), numChannelsToSync);
- checkSyncState();
- }
-}
-
-void ClientSyncer::ircChannelRemoved(QObject *chan) {
- if(channelsToSync.contains(chan)) {
- numChannelsToSync--;
- channelsToSync.remove(chan);
- emit channelsProgress(numChannelsToSync - channelsToSync.count(), numChannelsToSync);
- checkSyncState();
- }
-}
-
-void ClientSyncer::ircUserInitDone(IrcUser *user) {
- usersToSync.remove(user);
- emit ircUsersProgress(numUsersToSync - usersToSync.count(), numUsersToSync);
- checkSyncState();
-}
-
-void ClientSyncer::ircUserAdded(IrcUser *user) {
- if(!user->isInitialized()) {
- usersToSync.insert(user);
- numUsersToSync++;
- emit ircUsersProgress(numUsersToSync - usersToSync.count(), numUsersToSync);
- checkSyncState();
- }
-}
-
-void ClientSyncer::ircUserRemoved(QObject *user) {
- if(usersToSync.contains(user)) {
- numUsersToSync--;
- usersToSync.remove(user);
- emit ircUsersProgress(numUsersToSync - usersToSync.count(), numUsersToSync);
- checkSyncState();
- }
-}
-
void ClientSyncer::checkSyncState() {
- if(usersToSync.count() + channelsToSync.count() + netsToSync.count() == 0) {
- // done syncing!
- /*
- qDebug() << "done";
- foreach(Network *net, _networks.values()) {
- //disconnect(net, 0, this, SLOT(networkInitDone()));
- //disconnect(net, 0, this, SLOT(ircUserInitDone(IrcUser *)));
- //disconnect(net, 0, this, SLOT(ircUserAdded(IrcUser *)));
- //disconnect(net, 0, this, SLOT(ircUserRemoved(QObject *)));
- //disconnect(net, 0, this, SLOT(ircChannelInitDone(IrcChannel *)));
- //disconnect(net, 0, this, SLOT(ircChannelAdded(IrcChannel *)));
- //disconnect(net, 0, this, SLOT(ircChannelRemoved(QObject *)));
- qDebug() << "disconnecting";
- disconnect(net, SIGNAL(initDone()), this, SLOT(networkInitDone()));
- disconnect(net, SIGNAL(ircUserInitDone(IrcUser *)), this, SLOT(ircUserInitDone(IrcUser *)));
- disconnect(net, SIGNAL(ircUserAdded(IrcUser *)), this, SLOT(ircUserAdded(IrcUser *)));
- disconnect(net, SIGNAL(ircUserRemoved(QObject *)), this, SLOT(ircUserRemoved(QObject *)));
- disconnect(net, SIGNAL(ircChannelInitDone(IrcChannel *)), this, SLOT(ircChannelInitDone(IrcChannel *)));
- disconnect(net, SIGNAL(ircChannelAdded(IrcChannel *)), this, SLOT(ircChannelAdded(IrcChannel *)));
- disconnect(net, SIGNAL(ircChannelRemoved(QObject *)), this, SLOT(ircChannelRemoved(QObject *)));
- }
- */
-
+ if(netsToSync.isEmpty()) {
Client::instance()->setSyncedToCore();
emit syncFinished();
- //emit connected();
- //emit connectionStateChanged(true);
-
}
}
+#ifdef HAVE_SSL
+void ClientSyncer::sslErrors(const QList<QSslError> &errors) {
+ qDebug() << "SSL Errors:";
+ foreach(QSslError err, errors)
+ qDebug() << " " << err;
+
+ QSslSocket *socket = qobject_cast<QSslSocket *>(sender());
+ if(socket)
+ socket->ignoreSslErrors();
+}
+#endif
projects / quassel.git / blobdiff