/***************************************************************************
- * 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 *
#include "corenetwork.h"
-
#include "core.h"
#include "coresession.h"
-#include "identity.h"
+#include "coreidentity.h"
#include "ircserverhandler.h"
#include "userinputhandler.h"
qWarning() << "Server list empty, ignoring connect request!";
return;
}
- Identity *identity = identityPtr();
+ CoreIdentity *identity = identityPtr();
if(!identity) {
qWarning() << "Invalid identity configures, ignoring connect request!";
return;
} 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;
}
}
#ifdef HAVE_SSL
socket.setProtocol((QSsl::SslProtocol)server.sslVersion);
- if(server.useSsl)
+ if(server.useSsl) {
+ CoreIdentity *identity = identityPtr();
+ if(identity) {
+ socket.setLocalCertificate(identity->sslCert());
+ socket.setPrivateKey(identity->sslKey());
+ }
socket.connectToHostEncrypted(server.host, server.port);
- else
+ } else {
socket.connectToHost(server.host, server.port);
+ }
#else
socket.connectToHost(server.host, server.port);
#endif
}
}
-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());
return;
#endif
- Identity *identity = identityPtr();
+ CoreIdentity *identity = identityPtr();
if(!identity) {
qCritical() << "Identity invalid!";
disconnectFromIrc();
void CoreNetwork::networkInitialized() {
setConnectionState(Network::Initialized);
setConnected(true);
+ _quitRequested = false;
if(useAutoReconnect()) {
// reset counter
}
// 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) {
Network::Server CoreNetwork::usedServer() const {
if(_lastUsedServerIndex < serverList().count())
return serverList()[_lastUsedServerIndex];
- else
- return Network::Server();
+
+ if(!serverList().isEmpty())
+ return serverList()[0];
+
+ return Network::Server();
}
void CoreNetwork::requestConnect() const {
setNetworkInfo(info);
Core::updateNetwork(coreSession()->user(), info);
- // update _lastUsedServerIndex;
+ // 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) {