Don't crash after displaying a connection error popup
[quassel.git] / src / client / coreconnection.cpp
index 9c8889c..d077e24 100644 (file)
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009 by the Quassel Project                             *
+ *   Copyright (C) 2005-2013 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "coreconnection.h"
 
-#ifndef QT_NO_NETWORKPROXY
-#  include <QNetworkProxy>
-#endif
-
 #include "client.h"
+#include "clientauthhandler.h"
 #include "clientsettings.h"
 #include "coreaccountmodel.h"
 #include "identity.h"
+#include "internalpeer.h"
 #include "network.h"
 #include "networkmodel.h"
 #include "quassel.h"
 #include "signalproxy.h"
 #include "util.h"
 
-CoreConnection::CoreConnection(CoreAccountModel *model, QObject *parent)
-  : QObject(parent),
-  _model(model),
-  _blockSize(0),
-  _progressMinimum(0),
-  _progressMaximum(-1),
-  _progressValue(-1)
+#include "protocols/legacy/legacypeer.h"
+
+CoreConnection::CoreConnection(QObject *parent)
+    : QObject(parent),
+    _authHandler(0),
+    _state(Disconnected),
+    _wantReconnect(false),
+    _wasReconnect(false),
+    _progressMinimum(0),
+    _progressMaximum(-1),
+    _progressValue(-1),
+    _resetting(false)
+{
+    qRegisterMetaType<ConnectionState>("CoreConnection::ConnectionState");
+}
+
+
+void CoreConnection::init()
+{
+    Client::signalProxy()->setHeartBeatInterval(30);
+    connect(Client::signalProxy(), SIGNAL(lagUpdated(int)), SIGNAL(lagUpdated(int)));
+
+    _reconnectTimer.setSingleShot(true);
+    connect(&_reconnectTimer, SIGNAL(timeout()), SLOT(reconnectTimeout()));
+
+#ifdef HAVE_KDE
+    connect(Solid::Networking::notifier(), SIGNAL(statusChanged(Solid::Networking::Status)),
+        SLOT(solidNetworkStatusChanged(Solid::Networking::Status)));
+#endif
+
+    CoreConnectionSettings s;
+    s.initAndNotify("PingTimeoutInterval", this, SLOT(pingTimeoutIntervalChanged(QVariant)), 60);
+    s.initAndNotify("ReconnectInterval", this, SLOT(reconnectIntervalChanged(QVariant)), 60);
+    s.notify("NetworkDetectionMode", this, SLOT(networkDetectionModeChanged(QVariant)));
+    networkDetectionModeChanged(s.networkDetectionMode());
+}
+
+
+CoreAccountModel *CoreConnection::accountModel() const
+{
+    return Client::coreAccountModel();
+}
+
+
+void CoreConnection::setProgressText(const QString &text)
+{
+    if (_progressText != text) {
+        _progressText = text;
+        emit progressTextChanged(text);
+    }
+}
+
+
+void CoreConnection::setProgressValue(int value)
 {
-  qRegisterMetaType<ConnectionState>("CoreConnection::ConnectionState");
+    if (_progressValue != value) {
+        _progressValue = value;
+        emit progressValueChanged(value);
+    }
+}
+
 
+void CoreConnection::setProgressMinimum(int minimum)
+{
+    if (_progressMinimum != minimum) {
+        _progressMinimum = minimum;
+        emit progressRangeChanged(minimum, _progressMaximum);
+    }
 }
 
-void CoreConnection::init() {
-  connect(Client::signalProxy(), SIGNAL(disconnected()), SLOT(coreSocketDisconnected()));
-}
 
-void CoreConnection::setProgressText(const QString &text) {
-  if(_progressText != text) {
-    _progressText = text;
-    emit progressTextChanged(text);
-  }
+void CoreConnection::setProgressMaximum(int maximum)
+{
+    if (_progressMaximum != maximum) {
+        _progressMaximum = maximum;
+        emit progressRangeChanged(_progressMinimum, maximum);
+    }
 }
 
-void CoreConnection::setProgressValue(int value) {
-  if(_progressValue != value) {
-    _progressValue = value;
-    emit progressValueChanged(value);
-  }
+
+void CoreConnection::updateProgress(int value, int max)
+{
+    if (max != _progressMaximum) {
+        _progressMaximum = max;
+        emit progressRangeChanged(_progressMinimum, _progressMaximum);
+    }
+    setProgressValue(value);
 }
 
-void CoreConnection::setProgressMinimum(int minimum) {
-  if(_progressMinimum != minimum) {
-    _progressMinimum = minimum;
-    emit progressRangeChanged(minimum, _progressMaximum);
-  }
+
+void CoreConnection::reconnectTimeout()
+{
+    if (!_peer) {
+        CoreConnectionSettings s;
+        if (_wantReconnect && s.autoReconnect()) {
+#ifdef HAVE_KDE
+            // If using Solid, we don't want to reconnect if we're offline
+            if (s.networkDetectionMode() == CoreConnectionSettings::UseSolid) {
+                if (Solid::Networking::status() != Solid::Networking::Connected
+                    && Solid::Networking::status() != Solid::Networking::Unknown) {
+                    return;
+                }
+            }
+#endif /* HAVE_KDE */
+
+            reconnectToCore();
+        }
+    }
 }
 
-void CoreConnection::setProgressMaximum(int maximum) {
-  if(_progressMaximum != maximum) {
-    _progressMaximum = maximum;
-    emit progressRangeChanged(_progressMinimum, maximum);
-  }
+
+void CoreConnection::networkDetectionModeChanged(const QVariant &vmode)
+{
+    CoreConnectionSettings s;
+    CoreConnectionSettings::NetworkDetectionMode mode = (CoreConnectionSettings::NetworkDetectionMode)vmode.toInt();
+    if (mode == CoreConnectionSettings::UsePingTimeout)
+        Client::signalProxy()->setMaxHeartBeatCount(s.pingTimeoutInterval() / 30);
+    else {
+        Client::signalProxy()->setMaxHeartBeatCount(-1);
+    }
 }
 
-void CoreConnection::updateProgress(int value, int max) {
-  if(max != _progressMaximum) {
-    _progressMaximum = max;
-    emit progressRangeChanged(_progressMinimum, _progressMaximum);
-  }
-  setProgressValue(value);
+
+void CoreConnection::pingTimeoutIntervalChanged(const QVariant &interval)
+{
+    CoreConnectionSettings s;
+    if (s.networkDetectionMode() == CoreConnectionSettings::UsePingTimeout)
+        Client::signalProxy()->setMaxHeartBeatCount(interval.toInt() / 30);  // interval is 30 seconds
 }
 
-void CoreConnection::resetConnection() {
-  if(_socket) {
-    disconnect(_socket, 0, this, 0);
-    _socket->deleteLater();
-    _socket = 0;
-  }
-  _blockSize = 0;
 
-  _coreMsgBuffer.clear();
+void CoreConnection::reconnectIntervalChanged(const QVariant &interval)
+{
+    _reconnectTimer.setInterval(interval.toInt() * 1000);
+}
+
 
-  _netsToSync.clear();
-  _numNetsToSync = 0;
+#ifdef HAVE_KDE
 
-  setProgressMaximum(-1); // disable
-  emit connectionMsg(tr("Disconnected from core."));
+void CoreConnection::solidNetworkStatusChanged(Solid::Networking::Status status)
+{
+    CoreConnectionSettings s;
+    if (s.networkDetectionMode() != CoreConnectionSettings::UseSolid)
+        return;
+
+    switch (status) {
+    case Solid::Networking::Unknown:
+    case Solid::Networking::Connected:
+        //qDebug() << "Solid: Network status changed to connected or unknown";
+        if (state() == Disconnected) {
+            if (_wantReconnect && s.autoReconnect()) {
+                reconnectToCore();
+            }
+        }
+        break;
+    case Solid::Networking::Disconnecting:
+    case Solid::Networking::Unconnected:
+        if (state() != Disconnected && !isLocalConnection())
+            disconnectFromCore(tr("Network is down"), true);
+        break;
+    default:
+        break;
+    }
 }
 
-void CoreConnection::socketStateChanged(QAbstractSocket::SocketState socketState) {
-  QString text;
+#endif
+
+bool CoreConnection::isEncrypted() const
+{
+    return _peer && _peer->isSecure();
+}
 
-  switch(socketState) {
-  case QAbstractSocket::UnconnectedState:
-    text = tr("Disconnected.");
-    break;
-  case QAbstractSocket::HostLookupState:
-    text = tr("Looking up %1...").arg(currentAccount().hostName());
-    break;
-  case QAbstractSocket::ConnectingState:
-    text = tr("Connecting to %1...").arg(currentAccount().hostName());
-    break;
-  case QAbstractSocket::ConnectedState:
-    text = tr("Connected to %1.").arg(currentAccount().hostName());
-    break;
-  case QAbstractSocket::ClosingState:
-    text = tr("Disconnecting from %1...").arg(currentAccount().hostName());
-    break;
-  default:
-    break;
-  }
 
-  if(!text.isEmpty())
-    emit progressTextChanged(text);
+bool CoreConnection::isLocalConnection() const
+{
+    if (!isConnected())
+        return false;
+    if (currentAccount().isInternal())
+        return true;
+    if (_peer->isLocal())
+        return true;
 
-  setState(socketState);
+    return false;
 }
 
-void CoreConnection::setState(QAbstractSocket::SocketState socketState) {
-  ConnectionState state;
 
-  switch(socketState) {
-  case QAbstractSocket::UnconnectedState:
-    state = Disconnected;
-    break;
-  case QAbstractSocket::HostLookupState:
-  case QAbstractSocket::ConnectingState:
-    state = Connecting;
-    break;
-  case QAbstractSocket::ConnectedState:
-    state = Connected;
-    break;
-  default:
-    state = Disconnected;
-  }
+void CoreConnection::socketStateChanged(QAbstractSocket::SocketState socketState)
+{
+    QString text;
+
+    switch (socketState) {
+    case QAbstractSocket::UnconnectedState:
+        text = tr("Disconnected");
+        break;
+    case QAbstractSocket::HostLookupState:
+        text = tr("Looking up %1...").arg(currentAccount().hostName());
+        break;
+    case QAbstractSocket::ConnectingState:
+        text = tr("Connecting to %1...").arg(currentAccount().hostName());
+        break;
+    case QAbstractSocket::ConnectedState:
+        text = tr("Connected to %1").arg(currentAccount().hostName());
+        break;
+    case QAbstractSocket::ClosingState:
+        text = tr("Disconnecting from %1...").arg(currentAccount().hostName());
+        break;
+    default:
+        break;
+    }
+
+    if (!text.isEmpty())
+        emit progressTextChanged(text);
 
-  setState(state);
-}
+    setState(socketState);
+}
 
-void CoreConnection::setState(ConnectionState state) {
-  if(state != _state) {
-    _state = state;
-    emit stateChanged(state);
-  }
-}
-
-void CoreConnection::setWarningsHandler(const char *slot) {
-  resetWarningsHandler();
-  connect(this, SIGNAL(handleIgnoreWarnings(bool)), this, slot);
-}
-
-void CoreConnection::resetWarningsHandler() {
-  disconnect(this, SIGNAL(handleIgnoreWarnings(bool)), this, 0);
-}
 
-void CoreConnection::coreSocketError(QAbstractSocket::SocketError) {
-  qDebug() << "coreSocketError" << _socket << _socket->errorString();
-  emit connectionError(_socket->errorString());
-  resetConnection();
-}
-
-void CoreConnection::coreSocketDisconnected() {
-  setState(Disconnected);
-  emit disconnected();
-  resetConnection();
-  // FIXME handle disconnects gracefully
-}
-
-void CoreConnection::coreHasData() {
-  QVariant item;
-  while(SignalProxy::readDataFromDevice(_socket, _blockSize, item)) {
-    QVariantMap msg = item.toMap();
-    if(!msg.contains("MsgType")) {
-      // This core is way too old and does not even speak our init protocol...
-      emit connectionError(tr("The Quassel Core you try to connect to is too old! Please consider upgrading."));
-      disconnectFromCore();
-      return;
+void CoreConnection::setState(QAbstractSocket::SocketState socketState)
+{
+    ConnectionState state;
+
+    switch (socketState) {
+    case QAbstractSocket::UnconnectedState:
+        state = Disconnected;
+        break;
+    case QAbstractSocket::HostLookupState:
+    case QAbstractSocket::ConnectingState:
+    case QAbstractSocket::ConnectedState: // we'll set it to Connected in connectionReady()
+        state = Connecting;
+        break;
+    default:
+        state = Disconnected;
     }
-    if(msg["MsgType"] == "ClientInitAck") {
-      clientInitAck(msg);
-    } else if(msg["MsgType"] == "ClientInitReject") {
-      emit connectionError(msg["Error"].toString());
-      disconnectFromCore();
-      return;
-    } else if(msg["MsgType"] == "CoreSetupAck") {
-      //emit coreSetupSuccess();
-    } else if(msg["MsgType"] == "CoreSetupReject") {
-      //emit coreSetupFailed(msg["Error"].toString());
-    } else if(msg["MsgType"] == "ClientLoginReject") {
-      loginFailed(msg["Error"].toString());
-    } else if(msg["MsgType"] == "ClientLoginAck") {
-      loginSuccess();
-    } else if(msg["MsgType"] == "SessionInit") {
-      // that's it, let's hand over to the signal proxy
-      // if the socket is an orphan, the signalProxy adopts it.
-      // -> we don't need to care about it anymore
-      _socket->setParent(0);
-      Client::signalProxy()->addPeer(_socket);
-
-      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;
+
+    setState(state);
+}
+
+
+void CoreConnection::onConnectionReady()
+{
+    setState(Connected);
+}
+
+
+void CoreConnection::setState(ConnectionState state)
+{
+    if (state != _state) {
+        _state = state;
+        emit stateChanged(state);
+        if (state == Disconnected)
+            emit disconnected();
     }
-  }
-  if(_blockSize > 0) {
-    updateProgress(_socket->bytesAvailable(), _blockSize);
-  }
 }
 
-void CoreConnection::disconnectFromCore() {
-  if(isConnected()) {
-    Client::signalProxy()->removeAllPeers();
-    resetConnection();
-  }
+
+void CoreConnection::coreSocketError(QAbstractSocket::SocketError error, const QString &errorString)
+{
+    Q_UNUSED(error)
+
+    disconnectFromCore(errorString, true);
 }
 
-void CoreConnection::reconnectToCore() {
-  if(currentAccount().isValid())
-    connectToCore(currentAccount().accountId());
+
+void CoreConnection::coreSocketDisconnected()
+{
+    _wasReconnect = false;
+    resetConnection(_wantReconnect);
+    // FIXME handle disconnects gracefully
 }
 
-bool CoreConnection::connectToCore(AccountId accId) {
-  CoreAccountSettings s;
 
-  if(!accId.isValid()) {
-    // check our settings and figure out what to do
-    if(!s.autoConnectOnStartup())
-      return false;
-    if(s.autoConnectToFixedAccount())
-      accId = s.autoConnectAccount();
+void CoreConnection::disconnectFromCore()
+{
+    disconnectFromCore(QString(), false); // requested disconnect, so don't try to reconnect
+}
+
+
+void CoreConnection::disconnectFromCore(const QString &errorString, bool wantReconnect)
+{
+    if (wantReconnect)
+        _reconnectTimer.start();
     else
-      accId = s.lastAccount();
-    if(!accId.isValid())
-      return false;
-  }
-  _account = accountModel()->account(accId);
-  if(!_account.accountId().isValid()) {
-    return false;
-  }
+        _reconnectTimer.stop();
+
+    _wantReconnect = wantReconnect; // store if disconnect was requested
+    _wasReconnect = false;
+
+    if (_authHandler)
+        _authHandler->close();
+    else if(_peer)
+        _peer->close();
+
+    if (errorString.isEmpty())
+        emit connectionError(tr("Disconnected"));
+    else
+        emit connectionError(errorString);
+}
+
+
+void CoreConnection::resetConnection(bool wantReconnect)
+{
+    if (_resetting)
+        return;
+    _resetting = true;
+
+    _wantReconnect = wantReconnect;
+
+    if (_authHandler) {
+        disconnect(_authHandler, 0, this, 0);
+        _authHandler->close();
+        _authHandler->deleteLater();
+        _authHandler = 0;
+    }
+
+    if (_peer) {
+        disconnect(_peer, 0, this, 0);
+        // peer belongs to the sigproxy and thus gets deleted by it
+        _peer->close();
+        _peer = 0;
+    }
+
+    _netsToSync.clear();
+    _numNetsToSync = 0;
+
+    setProgressMaximum(-1); // disable
+    setState(Disconnected);
+    emit lagUpdated(-1);
+
+    emit connectionMsg(tr("Disconnected from core."));
+    emit encrypted(false);
+
+    // initiate if a reconnect if appropriate
+    CoreConnectionSettings s;
+    if (wantReconnect && s.autoReconnect()) {
+        _reconnectTimer.start();
+    }
 
-  s.setLastAccount(accId);
-  connectToCurrentAccount();
-  return true;
+    _resetting = false;
 }
 
-void CoreConnection::connectToCurrentAccount() {
-  resetConnection();
 
-  Q_ASSERT(!_socket);
+void CoreConnection::reconnectToCore()
+{
+    if (currentAccount().isValid()) {
+        _wasReconnect = true;
+        connectToCore(currentAccount().accountId());
+    }
+}
+
+
+bool CoreConnection::connectToCore(AccountId accId)
+{
+    if (isConnected())
+        return false;
+
+    CoreAccountSettings s;
+
+    // FIXME: Don't force connection to internal core in mono client
+    if (Quassel::runMode() == Quassel::Monolithic) {
+        _account = accountModel()->account(accountModel()->internalAccount());
+        Q_ASSERT(_account.isValid());
+    }
+    else {
+        if (!accId.isValid()) {
+            // check our settings and figure out what to do
+            if (!s.autoConnectOnStartup())
+                return false;
+            if (s.autoConnectToFixedAccount())
+                accId = s.autoConnectAccount();
+            else
+                accId = s.lastAccount();
+            if (!accId.isValid())
+                return false;
+        }
+        _account = accountModel()->account(accId);
+        if (!_account.accountId().isValid()) {
+            return false;
+        }
+        if (Quassel::runMode() != Quassel::Monolithic) {
+            if (_account.isInternal())
+                return false;
+        }
+    }
+
+    s.setLastAccount(accId);
+    connectToCurrentAccount();
+    return true;
+}
+
+
+void CoreConnection::connectToCurrentAccount()
+{
+    if (_authHandler) {
+        qWarning() << Q_FUNC_INFO << "Already connected!";
+        return;
+    }
+
+    resetConnection(false);
+
+    if (currentAccount().isInternal()) {
+        if (Quassel::runMode() != Quassel::Monolithic) {
+            qWarning() << "Cannot connect to internal core in client-only mode!";
+            return;
+        }
+        emit startInternalCore();
+
+        InternalPeer *peer = new InternalPeer();
+        _peer = peer;
+        Client::instance()->signalProxy()->addPeer(peer); // sigproxy will take ownership
+        emit connectToInternalCore(peer);
+
+        return;
+    }
+
+    _authHandler = new ClientAuthHandler(currentAccount(), this);
+
+    connect(_authHandler, SIGNAL(disconnected()), SLOT(coreSocketDisconnected()));
+    connect(_authHandler, SIGNAL(connectionReady()), SLOT(onConnectionReady()));
+    connect(_authHandler, SIGNAL(socketStateChanged(QAbstractSocket::SocketState)), SLOT(socketStateChanged(QAbstractSocket::SocketState)));
+    connect(_authHandler, SIGNAL(socketError(QAbstractSocket::SocketError,QString)), SLOT(coreSocketError(QAbstractSocket::SocketError,QString)));
+    connect(_authHandler, SIGNAL(transferProgress(int,int)), SLOT(updateProgress(int,int)));
+    connect(_authHandler, SIGNAL(requestDisconnect(QString,bool)), SLOT(disconnectFromCore(QString,bool)));
+
+    connect(_authHandler, SIGNAL(errorMessage(QString)), SIGNAL(connectionError(QString)));
+    connect(_authHandler, SIGNAL(errorPopup(QString)), SIGNAL(connectionErrorPopup(QString)), Qt::QueuedConnection);
+    connect(_authHandler, SIGNAL(statusMessage(QString)), SIGNAL(connectionMsg(QString)));
+    connect(_authHandler, SIGNAL(encrypted(bool)), SIGNAL(encrypted(bool)));
+    connect(_authHandler, SIGNAL(startCoreSetup(QVariantList)), SIGNAL(startCoreSetup(QVariantList)));
+    connect(_authHandler, SIGNAL(coreSetupFailed(QString)), SIGNAL(coreSetupFailed(QString)));
+    connect(_authHandler, SIGNAL(coreSetupSuccessful()), SIGNAL(coreSetupSuccess()));
+    connect(_authHandler, SIGNAL(userAuthenticationRequired(CoreAccount*,bool*,QString)), SIGNAL(userAuthenticationRequired(CoreAccount*,bool*,QString)));
+    connect(_authHandler, SIGNAL(handleNoSslInClient(bool*)), SIGNAL(handleNoSslInClient(bool*)));
+    connect(_authHandler, SIGNAL(handleNoSslInCore(bool*)), SIGNAL(handleNoSslInCore(bool*)));
 #ifdef HAVE_SSL
-  QSslSocket *sock = new QSslSocket(Client::instance());
-#else
-  if(_account.useSsl()) {
-    emit connectionError(tr("<b>This client is built without SSL Support!</b><br />Disable the usage of SSL in the account settings."));
-    return;
-  }
-  QTcpSocket *sock = new QTcpSocket(Client::instance());
+    connect(_authHandler, SIGNAL(handleSslErrors(const QSslSocket*,bool*,bool*)), SIGNAL(handleSslErrors(const QSslSocket*,bool*,bool*)));
 #endif
 
-#ifndef QT_NO_NETWORKPROXY
-  if(_account.useProxy()) {
-    QNetworkProxy proxy(_account.proxyType(), _account.proxyHostName(), _account.proxyPort(), _account.proxyUser(), _account.proxyPassword());
-    sock->setProxy(proxy);
-  }
-#endif
+    connect(_authHandler, SIGNAL(loginSuccessful(CoreAccount)), SLOT(onLoginSuccessful(CoreAccount)));
+    connect(_authHandler, SIGNAL(handshakeComplete(RemotePeer*,Protocol::SessionState)), SLOT(onHandshakeComplete(RemotePeer*,Protocol::SessionState)));
+
+    _authHandler->connectToCore();
+}
 
-  _socket = sock;
-  connect(sock, SIGNAL(readyRead()), SLOT(coreHasData()));
-  connect(sock, SIGNAL(connected()), SLOT(coreSocketConnected()));
-  connect(sock, SIGNAL(disconnected()), SLOT(coreSocketDisconnected()));
-  connect(sock, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(coreSocketError(QAbstractSocket::SocketError)));
-  connect(sock, SIGNAL(stateChanged(QAbstractSocket::SocketState)), SLOT(socketStateChanged(QAbstractSocket::SocketState)));
 
-  emit connectionMsg(tr("Connecting to %1...").arg(currentAccount().accountName()));
-  sock->connectToHost(_account.hostName(), _account.port());
+void CoreConnection::setupCore(const Protocol::SetupData &setupData)
+{
+    _authHandler->setupCore(setupData);
 }
 
-void CoreConnection::coreSocketConnected() {
-  // Phase One: Send client info and wait for core info
 
-  emit connectionMsg(tr("Synchronizing to core..."));
+void CoreConnection::loginToCore(const QString &user, const QString &password, bool remember)
+{
+    _authHandler->login(user, password, remember);
+}
 
-  QVariantMap clientInit;
-  clientInit["MsgType"] = "ClientInit";
-  clientInit["ClientVersion"] = Quassel::buildInfo().fancyVersionString;
-  clientInit["ClientDate"] = Quassel::buildInfo().buildDate;
-  clientInit["ProtocolVersion"] = Quassel::buildInfo().protocolVersion;
-  clientInit["UseSsl"] = _account.useSsl();
-#ifndef QT_NO_COMPRESS
-  clientInit["UseCompression"] = true;
-#else
-  clientInit["UseCompression"] = false;
-#endif
 
-  SignalProxy::writeDataToDevice(_socket, clientInit);
+void CoreConnection::onLoginSuccessful(const CoreAccount &account)
+{
+    updateProgress(0, 0);
+
+    // save current account data
+    accountModel()->createOrUpdateAccount(account);
+    accountModel()->save();
+
+    _reconnectTimer.stop();
+
+    setProgressText(tr("Receiving session state"));
+    setState(Synchronizing);
+    emit connectionMsg(tr("Synchronizing to %1...").arg(account.accountName()));
 }
 
-void CoreConnection::clientInitAck(const QVariantMap &msg) {
-  // Core has accepted our version info and sent its own. Let's see if we accept it as well...
-  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 core/client protocol v%1 to connect.").arg(Quassel::buildInfo().clientNeedsProtocol));
-    disconnectFromCore();
-    return;
-  }
 
-#ifndef QT_NO_COMPRESS
-  if(msg["SupportsCompression"].toBool()) {
-    _socket->setProperty("UseCompression", true);
-  }
-#endif
+void CoreConnection::onHandshakeComplete(RemotePeer *peer, const Protocol::SessionState &sessionState)
+{
+    updateProgress(100, 100);
 
-  _coreMsgBuffer = msg;
-#ifdef HAVE_SSL
-  if(currentAccount().useSsl()) {
-    if(msg["SupportSsl"].toBool()) {
-      QSslSocket *sslSocket = qobject_cast<QSslSocket *>(_socket);
-      Q_ASSERT(sslSocket);
-      connect(sslSocket, SIGNAL(encrypted()), this, SLOT(sslSocketEncrypted()));
-      connect(sslSocket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(sslErrors(const QList<QSslError> &)));
-
-      sslSocket->startClientEncryption();
-    } 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."));
-      disconnectFromCore();
+    disconnect(_authHandler, 0, this, 0);
+    _authHandler->deleteLater();
+    _authHandler = 0;
+
+    _peer = peer;
+    connect(peer, SIGNAL(disconnected()), SLOT(coreSocketDisconnected()));
+    connect(peer, SIGNAL(socketStateChanged(QAbstractSocket::SocketState)), SLOT(socketStateChanged(QAbstractSocket::SocketState)));
+    connect(peer, SIGNAL(socketError(QAbstractSocket::SocketError,QString)), SLOT(coreSocketError(QAbstractSocket::SocketError,QString)));
+
+    Client::signalProxy()->addPeer(_peer);  // sigproxy takes ownership of the peer!
+
+    syncToCore(sessionState);
+}
+
+
+void CoreConnection::internalSessionStateReceived(const Protocol::SessionState &sessionState)
+{
+    updateProgress(100, 100);
+
+    Client::setCoreFeatures(Quassel::features()); // mono connection...
+
+    setState(Synchronizing);
+    syncToCore(sessionState);
+}
+
+
+void CoreConnection::syncToCore(const Protocol::SessionState &sessionState)
+{
+    setProgressText(tr("Receiving network states"));
+    updateProgress(0, 100);
+
+    // create identities
+    foreach(const QVariant &vid, sessionState.identities) {
+        Client::instance()->coreIdentityCreated(vid.value<Identity>());
     }
-    return;
-  }
-#endif
-  // if we use SSL we wait for the next step until every SSL warning has been cleared
-  connectionReady();
 
+    // create buffers
+    // FIXME: get rid of this crap -- why?
+    NetworkModel *networkModel = Client::networkModel();
+    Q_ASSERT(networkModel);
+    foreach(const QVariant &vinfo, sessionState.bufferInfos)
+        networkModel->bufferUpdated(vinfo.value<BufferInfo>());  // create BufferItems
+
+    // prepare sync progress thingys...
+    // FIXME: Care about removal of networks
+    _numNetsToSync = sessionState.networkIds.count();
+    updateProgress(0, _numNetsToSync);
+
+    // create network objects
+    foreach(const QVariant &networkid, sessionState.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()), SLOT(networkInitDone()));
+        connect(net, SIGNAL(destroyed()), SLOT(networkInitDone()));
+        Client::addNetwork(net);
+    }
+    checkSyncState();
 }
 
-void CoreConnection::connectionReady() {
-  if(!_coreMsgBuffer["Configured"].toBool()) {
-    // start wizard
-    emit startCoreSetup(_coreMsgBuffer["StorageBackends"].toList());
-  } else if(_coreMsgBuffer["LoginEnabled"].toBool()) {
-    loginToCore();
-  }
-  _coreMsgBuffer.clear();
-  resetWarningsHandler();
+
+// this is also called for destroyed networks!
+void CoreConnection::networkInitDone()
+{
+    QObject *net = sender();
+    Q_ASSERT(net);
+    disconnect(net, 0, this, 0);
+    _netsToSync.remove(net);
+    updateProgress(_numNetsToSync - _netsToSync.count(), _numNetsToSync);
+    checkSyncState();
 }
 
-void CoreConnection::loginToCore() {
-  emit connectionMsg(tr("Logging in..."));
-  if(currentAccount().user().isEmpty() || currentAccount().password().isEmpty()) {
-    emit userAuthenticationRequired(&_account);  // *must* be a synchronous call
-    if(currentAccount().user().isEmpty() || currentAccount().password().isEmpty()) {
-      disconnectFromCore();
-      return;
+
+void CoreConnection::checkSyncState()
+{
+    if (_netsToSync.isEmpty() && state() >= Synchronizing) {
+        setState(Synchronized);
+        setProgressText(tr("Synchronized to %1").arg(currentAccount().accountName()));
+        setProgressMaximum(-1);
+        emit synchronized();
     }
-  }
-
-  QVariantMap clientLogin;
-  clientLogin["MsgType"] = "ClientLogin";
-  clientLogin["User"] = currentAccount().user();
-  clientLogin["Password"] = currentAccount().password();
-  SignalProxy::writeDataToDevice(_socket, clientLogin);
-}
-
-void CoreConnection::loginFailed(const QString &error) {
-  emit userAuthenticationRequired(&_account, error);  // *must* be a synchronous call
-  if(currentAccount().user().isEmpty() || currentAccount().password().isEmpty()) {
-    disconnectFromCore();
-    return;
-  }
-  loginToCore();
-}
-
-void CoreConnection::loginSuccess() {
-  updateProgress(0, 0);
-  setProgressText(tr("Receiving session state"));
-  setState(Synchronizing);
-  emit connectionMsg(tr("Synchronizing to %1...").arg(currentAccount().accountName()));
-}
-
-void CoreConnection::sessionStateReceived(const QVariantMap &state) {
-  updateProgress(100, 100);
-
-  // rest of communication happens through SignalProxy...
-  disconnect(_socket, SIGNAL(readyRead()), this, 0);
-  disconnect(_socket, SIGNAL(connected()), this, 0);
-
-  //Client::instance()->setConnectedToCore(currentAccount().accountId(), _socket);
-  syncToCore(state);
-}
-
-void CoreConnection::syncToCore(const QVariantMap &sessionState) {
-  setProgressText(tr("Receiving network states"));
-  updateProgress(0, 100);
-
-  // create identities
-  foreach(QVariant vid, sessionState["Identities"].toList()) {
-    Client::instance()->coreIdentityCreated(vid.value<Identity>());
-  }
-
-  // create buffers
-  // FIXME: get rid of this crap -- why?
-  QVariantList bufferinfos = sessionState["BufferInfos"].toList();
-  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
-  _numNetsToSync = networkids.count();
-  updateProgress(0, _numNetsToSync);
-
-  // 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()), SLOT(networkInitDone()));
-    connect(net, SIGNAL(destroyed()), SLOT(networkInitDone()));
-    Client::addNetwork(net);
-  }
-  checkSyncState();
-}
-
-void CoreConnection::networkInitDone() {
-  Network *net = qobject_cast<Network *>(sender());
-  Q_ASSERT(net);
-  disconnect(net, 0, this, 0);
-  _netsToSync.remove(net);
-  updateProgress(_numNetsToSync - _netsToSync.count(), _numNetsToSync);
-  checkSyncState();
-}
-
-void CoreConnection::checkSyncState() {
-  if(_netsToSync.isEmpty()) {
-    setState(Synchronized);
-    setProgressText(QString());
-    setProgressMaximum(-1);
-    emit synchronized();
-  }
 }