X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcorenetwork.cpp;h=a40b54641f75770e62fb06a67a52efe2a2991543;hp=a5c40e622e14f4f9df5ca001b357e092bc25f265;hb=710edfe368ed1db79cc274164523d14afc1b2c9d;hpb=a5dfcc8ecf8b81025d24b3c5c816169e3e030ea4 diff --git a/src/core/corenetwork.cpp b/src/core/corenetwork.cpp index a5c40e62..a40b5464 100644 --- a/src/core/corenetwork.cpp +++ b/src/core/corenetwork.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -20,10 +20,9 @@ #include "corenetwork.h" - #include "core.h" #include "coresession.h" -#include "identity.h" +#include "coreidentity.h" #include "ircserverhandler.h" #include "userinputhandler.h" @@ -69,16 +68,14 @@ CoreNetwork::CoreNetwork(const NetworkId &networkid, CoreSession *session) connect(this, SIGNAL(connectRequested()), this, SLOT(connectToIrc())); + connect(&socket, SIGNAL(connected()), this, SLOT(socketInitialized())); connect(&socket, SIGNAL(disconnected()), this, SLOT(socketDisconnected())); connect(&socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(socketError(QAbstractSocket::SocketError))); connect(&socket, SIGNAL(stateChanged(QAbstractSocket::SocketState)), this, SLOT(socketStateChanged(QAbstractSocket::SocketState))); connect(&socket, SIGNAL(readyRead()), this, SLOT(socketHasData())); #ifdef HAVE_SSL - connect(&socket, SIGNAL(connected()), this, SLOT(sslSocketConnected())); connect(&socket, SIGNAL(encrypted()), this, SLOT(socketInitialized())); connect(&socket, SIGNAL(sslErrors(const QList &)), this, SLOT(sslErrors(const QList &))); -#else - connect(&socket, SIGNAL(connected()), this, SLOT(socketInitialized())); #endif } @@ -135,7 +132,7 @@ void CoreNetwork::connectToIrc(bool reconnecting) { qWarning() << "Server list empty, ignoring connect request!"; return; } - Identity *identity = identityPtr(); + CoreIdentity *identity = identityPtr(); if(!identity) { qWarning() << "Invalid identity configures, ignoring connect request!"; return; @@ -146,7 +143,7 @@ void CoreNetwork::connectToIrc(bool reconnecting) { } else if(_previousConnectionAttemptFailed) { // cycle to next server if previous connection attempt failed displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Connection failed. Cycling to next Server")); - if(++_lastUsedServerIndex == serverList().size()) { + if(++_lastUsedServerIndex >= serverList().size()) { _lastUsedServerIndex = 0; } } @@ -155,7 +152,29 @@ void CoreNetwork::connectToIrc(bool reconnecting) { Server server = usedServer(); displayStatusMsg(tr("Connecting to %1:%2...").arg(server.host).arg(server.port)); displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Connecting to %1:%2...").arg(server.host).arg(server.port)); + + if(server.useProxy) { + QNetworkProxy proxy((QNetworkProxy::ProxyType)server.proxyType, server.proxyHost, server.proxyPort, server.proxyUser, server.proxyPass); + socket.setProxy(proxy); + } else { + socket.setProxy(QNetworkProxy::NoProxy); + } + +#ifdef HAVE_SSL + socket.setProtocol((QSsl::SslProtocol)server.sslVersion); + if(server.useSsl) { + CoreIdentity *identity = identityPtr(); + if(identity) { + socket.setLocalCertificate(identity->sslCert()); + socket.setPrivateKey(identity->sslKey()); + } + socket.connectToHostEncrypted(server.host, server.port); + } else { + socket.connectToHost(server.host, server.port); + } +#else socket.connectToHost(server.host, server.port); +#endif } void CoreNetwork::disconnectFromIrc(bool requested, const QString &reason) { @@ -253,7 +272,10 @@ void CoreNetwork::socketHasData() { } } -void CoreNetwork::socketError(QAbstractSocket::SocketError) { +void CoreNetwork::socketError(QAbstractSocket::SocketError error) { + if(_quitRequested && error == QAbstractSocket::RemoteHostClosedError) + return; + _previousConnectionAttemptFailed = true; qWarning() << qPrintable(tr("Could not connect to %1 (%2)").arg(networkName(), socket.errorString())); emit connectionError(socket.errorString()); @@ -264,17 +286,14 @@ void CoreNetwork::socketError(QAbstractSocket::SocketError) { } } +void CoreNetwork::socketInitialized() { + Server server = usedServer(); #ifdef HAVE_SSL -void CoreNetwork::sslSocketConnected() { - if(!usedServer().useSsl) - socketInitialized(); - else - socket.startClientEncryption(); -} + if(server.useSsl && !socket.isEncrypted()) + return; #endif -void CoreNetwork::socketInitialized() { - Identity *identity = identityPtr(); + CoreIdentity *identity = identityPtr(); if(!identity) { qCritical() << "Identity invalid!"; disconnectFromIrc(); @@ -287,9 +306,8 @@ void CoreNetwork::socketInitialized() { _tokenBucket = 5; // init with a full bucket _tokenBucketTimer.start(_messagesPerSecond * 1000); - QString passwd = usedServer().password; - if(!passwd.isEmpty()) { - putRawLine(serverEncode(QString("PASS %1").arg(passwd))); + if(!server.password.isEmpty()) { + putRawLine(serverEncode(QString("PASS %1").arg(server.password))); } putRawLine(serverEncode(QString("NICK :%1").arg(identity->nicks()[0]))); putRawLine(serverEncode(QString("USER %1 8 * :%2").arg(identity->ident(), identity->realName()))); @@ -351,6 +369,7 @@ void CoreNetwork::socketStateChanged(QAbstractSocket::SocketState socketState) { void CoreNetwork::networkInitialized() { setConnectionState(Network::Initialized); setConnected(true); + _quitRequested = false; if(useAutoReconnect()) { // reset counter @@ -385,19 +404,21 @@ void CoreNetwork::sendPerform() { } // rejoin channels we've been in - QStringList channels, keys; - foreach(QString chan, persistentChannels()) { - QString key = channelKey(chan); - if(!key.isEmpty()) { - channels.prepend(chan); - keys.prepend(key); - } else { - channels.append(chan); + if(rejoinChannels()) { + QStringList channels, keys; + foreach(QString chan, coreSession()->persistentChannels(networkId()).keys()) { + QString key = channelKey(chan); + if(!key.isEmpty()) { + channels.prepend(chan); + keys.prepend(key); + } else { + channels.append(chan); + } } + QString joinString = QString("%1 %2").arg(channels.join(",")).arg(keys.join(",")).trimmed(); + if(!joinString.isEmpty()) + userInputHandler()->handleJoin(statusBuf, joinString); } - QString joinString = QString("%1 %2").arg(channels.join(",")).arg(keys.join(",")).trimmed(); - if(!joinString.isEmpty()) - userInputHandler()->handleJoin(statusBuf, joinString); } void CoreNetwork::setUseAutoReconnect(bool use) { @@ -464,18 +485,7 @@ void CoreNetwork::startAutoWhoCycle() { void CoreNetwork::sslErrors(const QList &sslErrors) { Q_UNUSED(sslErrors) socket.ignoreSslErrors(); - /* TODO errorhandling - QVariantMap errmsg; - QVariantList errnums; - foreach(QSslError err, errors) errnums << err.error(); - errmsg["SslErrors"] = errnums; - errmsg["SslCert"] = socket.peerCertificate().toPem(); - errmsg["PeerAddress"] = socket.peerAddress().toString(); - errmsg["PeerPort"] = socket.peerPort(); - errmsg["PeerName"] = socket.peerName(); - emit sslErrors(errmsg); - disconnectFromIrc(); - */ + // TODO errorhandling } #endif // HAVE_SSL @@ -495,6 +505,16 @@ void CoreNetwork::writeToSocket(const QByteArray &data) { _tokenBucket--; } +Network::Server CoreNetwork::usedServer() const { + if(_lastUsedServerIndex < serverList().count()) + return serverList()[_lastUsedServerIndex]; + + if(!serverList().isEmpty()) + return serverList()[0]; + + return Network::Server(); +} + void CoreNetwork::requestConnect() const { if(connectionState() != Disconnected) { qWarning() << "Requesting connect while already being connected!"; @@ -512,6 +532,18 @@ void CoreNetwork::requestDisconnect() const { } void CoreNetwork::requestSetNetworkInfo(const NetworkInfo &info) { + Network::Server currentServer = usedServer(); setNetworkInfo(info); Core::updateNetwork(coreSession()->user(), info); + + // the order of the servers might have changed, + // so we try to find the previously used server + _lastUsedServerIndex = 0; + for(int i = 0; i < serverList().count(); i++) { + Network::Server server = serverList()[i]; + if(server.host == currentServer.host && server.port == currentServer.port) { + _lastUsedServerIndex = i; + break; + } + } }