/***************************************************************************
- * Copyright (C) 2005-09 by the Quassel Project *
+ * Copyright (C) 2005-2014 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 "corenetwork.h"
INIT_SYNCABLE_OBJECT(CoreNetwork)
CoreNetwork::CoreNetwork(const NetworkId &networkid, CoreSession *session)
- : Network(networkid, session),
+ : Network(networkid, session),
_coreSession(session),
_userInputHandler(new CoreUserInputHandler(this)),
_autoReconnectCount(0),
_lastPingTime(0),
_pingCount(0),
- _requestedUserModes('-')
-{
- _autoReconnectTimer.setSingleShot(true);
- _socketCloseTimer.setSingleShot(true);
- connect(&_socketCloseTimer, SIGNAL(timeout()), this, SLOT(socketCloseTimeout()));
-
- setPingInterval(networkConfig()->pingInterval());
- connect(&_pingTimer, SIGNAL(timeout()), this, SLOT(sendPing()));
-
- setAutoWhoDelay(networkConfig()->autoWhoDelay());
- setAutoWhoInterval(networkConfig()->autoWhoInterval());
-
- QHash<QString, QString> channels = coreSession()->persistentChannels(networkId());
- foreach(QString chan, channels.keys()) {
- _channelKeys[chan.toLower()] = channels[chan];
- }
-
- connect(networkConfig(), SIGNAL(pingTimeoutEnabledSet(bool)), SLOT(enablePingTimeout(bool)));
- connect(networkConfig(), SIGNAL(pingIntervalSet(int)), SLOT(setPingInterval(int)));
- connect(networkConfig(), SIGNAL(autoWhoEnabledSet(bool)), SLOT(setAutoWhoEnabled(bool)));
- connect(networkConfig(), SIGNAL(autoWhoIntervalSet(int)), SLOT(setAutoWhoInterval(int)));
- connect(networkConfig(), SIGNAL(autoWhoDelaySet(int)), SLOT(setAutoWhoDelay(int)));
-
- connect(&_autoReconnectTimer, SIGNAL(timeout()), this, SLOT(doAutoReconnect()));
- connect(&_autoWhoTimer, SIGNAL(timeout()), this, SLOT(sendAutoWho()));
- connect(&_autoWhoCycleTimer, SIGNAL(timeout()), this, SLOT(startAutoWhoCycle()));
- connect(&_tokenBucketTimer, SIGNAL(timeout()), this, SLOT(fillBucketAndProcessQueue()));
-
- connect(&socket, SIGNAL(connected()), Core::instance()->oidentdConfigGenerator(), SLOT(update()));
- 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()));
+ _sendPings(false),
+ _requestedUserModes('-')
+{
+ _autoReconnectTimer.setSingleShot(true);
+ connect(&_socketCloseTimer, SIGNAL(timeout()), this, SLOT(socketCloseTimeout()));
+
+ setPingInterval(networkConfig()->pingInterval());
+ connect(&_pingTimer, SIGNAL(timeout()), this, SLOT(sendPing()));
+
+ setAutoWhoDelay(networkConfig()->autoWhoDelay());
+ setAutoWhoInterval(networkConfig()->autoWhoInterval());
+
+ QHash<QString, QString> channels = coreSession()->persistentChannels(networkId());
+ foreach(QString chan, channels.keys()) {
+ _channelKeys[chan.toLower()] = channels[chan];
+ }
+
+ connect(networkConfig(), SIGNAL(pingTimeoutEnabledSet(bool)), SLOT(enablePingTimeout(bool)));
+ connect(networkConfig(), SIGNAL(pingIntervalSet(int)), SLOT(setPingInterval(int)));
+ connect(networkConfig(), SIGNAL(autoWhoEnabledSet(bool)), SLOT(setAutoWhoEnabled(bool)));
+ connect(networkConfig(), SIGNAL(autoWhoIntervalSet(int)), SLOT(setAutoWhoInterval(int)));
+ connect(networkConfig(), SIGNAL(autoWhoDelaySet(int)), SLOT(setAutoWhoDelay(int)));
+
+ connect(&_autoReconnectTimer, SIGNAL(timeout()), this, SLOT(doAutoReconnect()));
+ connect(&_autoWhoTimer, SIGNAL(timeout()), this, SLOT(sendAutoWho()));
+ connect(&_autoWhoCycleTimer, SIGNAL(timeout()), this, SLOT(startAutoWhoCycle()));
+ connect(&_tokenBucketTimer, SIGNAL(timeout()), this, SLOT(fillBucketAndProcessQueue()));
+
+ 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(encrypted()), this, SLOT(socketInitialized()));
- connect(&socket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(sslErrors(const QList<QSslError> &)));
+ connect(&socket, SIGNAL(encrypted()), this, SLOT(socketInitialized()));
+ connect(&socket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(sslErrors(const QList<QSslError> &)));
#endif
- connect(this, SIGNAL(newEvent(Event *)), coreSession()->eventManager(), SLOT(postEvent(Event *)));
+ connect(this, SIGNAL(newEvent(Event *)), coreSession()->eventManager(), SLOT(postEvent(Event *)));
+
+ if (Quassel::isOptionSet("oidentd")) {
+ connect(this, SIGNAL(socketInitialized(const CoreIdentity*, QHostAddress, quint16, QHostAddress, quint16)), Core::instance()->oidentdConfigGenerator(), SLOT(addSocket(const CoreIdentity*, QHostAddress, quint16, QHostAddress, quint16)), Qt::BlockingQueuedConnection);
+ connect(this, SIGNAL(socketDisconnected(const CoreIdentity*, QHostAddress, quint16, QHostAddress, quint16)), Core::instance()->oidentdConfigGenerator(), SLOT(removeSocket(const CoreIdentity*, QHostAddress, quint16, QHostAddress, quint16)));
+ }
}
-CoreNetwork::~CoreNetwork() {
- if(connectionState() != Disconnected && connectionState() != Network::Reconnecting)
- disconnectFromIrc(false); // clean up, but this does not count as requested disconnect!
- disconnect(&socket, 0, this, 0); // this keeps the socket from triggering events during clean up
- delete _userInputHandler;
+
+CoreNetwork::~CoreNetwork()
+{
+ if (connectionState() != Disconnected && connectionState() != Network::Reconnecting)
+ disconnectFromIrc(false); // clean up, but this does not count as requested disconnect!
+ disconnect(&socket, 0, this, 0); // this keeps the socket from triggering events during clean up
+ delete _userInputHandler;
}
-QString CoreNetwork::channelDecode(const QString &bufferName, const QByteArray &string) const {
- if(!bufferName.isEmpty()) {
- IrcChannel *channel = ircChannel(bufferName);
- if(channel)
- return channel->decodeString(string);
- }
- return decodeString(string);
+
+QString CoreNetwork::channelDecode(const QString &bufferName, const QByteArray &string) const
+{
+ if (!bufferName.isEmpty()) {
+ IrcChannel *channel = ircChannel(bufferName);
+ if (channel)
+ return channel->decodeString(string);
+ }
+ return decodeString(string);
}
-QString CoreNetwork::userDecode(const QString &userNick, const QByteArray &string) const {
- IrcUser *user = ircUser(userNick);
- if(user)
- return user->decodeString(string);
- return decodeString(string);
+
+QString CoreNetwork::userDecode(const QString &userNick, const QByteArray &string) const
+{
+ IrcUser *user = ircUser(userNick);
+ if (user)
+ return user->decodeString(string);
+ return decodeString(string);
}
-QByteArray CoreNetwork::channelEncode(const QString &bufferName, const QString &string) const {
- if(!bufferName.isEmpty()) {
- IrcChannel *channel = ircChannel(bufferName);
- if(channel)
- return channel->encodeString(string);
- }
- return encodeString(string);
+
+QByteArray CoreNetwork::channelEncode(const QString &bufferName, const QString &string) const
+{
+ if (!bufferName.isEmpty()) {
+ IrcChannel *channel = ircChannel(bufferName);
+ if (channel)
+ return channel->encodeString(string);
+ }
+ return encodeString(string);
}
-QByteArray CoreNetwork::userEncode(const QString &userNick, const QString &string) const {
- IrcUser *user = ircUser(userNick);
- if(user)
- return user->encodeString(string);
- return encodeString(string);
+
+QByteArray CoreNetwork::userEncode(const QString &userNick, const QString &string) const
+{
+ IrcUser *user = ircUser(userNick);
+ if (user)
+ return user->encodeString(string);
+ return encodeString(string);
}
-void CoreNetwork::connectToIrc(bool reconnecting) {
- if(!reconnecting && useAutoReconnect() && _autoReconnectCount == 0) {
- _autoReconnectTimer.setInterval(autoReconnectInterval() * 1000);
- if(unlimitedReconnectRetries())
- _autoReconnectCount = -1;
- else
- _autoReconnectCount = autoReconnectRetries();
- }
- if(serverList().isEmpty()) {
- qWarning() << "Server list empty, ignoring connect request!";
- return;
- }
- CoreIdentity *identity = identityPtr();
- if(!identity) {
- qWarning() << "Invalid identity configures, ignoring connect request!";
- return;
- }
-
- // cleaning up old quit reason
- _quitReason.clear();
-
- // use a random server?
- if(useRandomServer()) {
- _lastUsedServerIndex = qrand() % serverList().size();
- } 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()) {
- _lastUsedServerIndex = 0;
- }
- }
- _previousConnectionAttemptFailed = false;
-
- 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) {
+void CoreNetwork::connectToIrc(bool reconnecting)
+{
+ if (!reconnecting && useAutoReconnect() && _autoReconnectCount == 0) {
+ _autoReconnectTimer.setInterval(autoReconnectInterval() * 1000);
+ if (unlimitedReconnectRetries())
+ _autoReconnectCount = -1;
+ else
+ _autoReconnectCount = autoReconnectRetries();
+ }
+ if (serverList().isEmpty()) {
+ qWarning() << "Server list empty, ignoring connect request!";
+ return;
+ }
CoreIdentity *identity = identityPtr();
- if(identity) {
- socket.setLocalCertificate(identity->sslCert());
- socket.setPrivateKey(identity->sslKey());
+ if (!identity) {
+ qWarning() << "Invalid identity configures, ignoring connect request!";
+ return;
+ }
+
+ // cleaning up old quit reason
+ _quitReason.clear();
+
+ // use a random server?
+ if (useRandomServer()) {
+ _lastUsedServerIndex = qrand() % serverList().size();
+ }
+ 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()) {
+ _lastUsedServerIndex = 0;
+ }
+ }
+ _previousConnectionAttemptFailed = false;
+
+ 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);
+ }
+
+ enablePingTimeout();
+
+#ifdef HAVE_SSL
+ 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);
}
- socket.connectToHostEncrypted(server.host, server.port);
- } else {
- socket.connectToHost(server.host, server.port);
- }
#else
- socket.connectToHost(server.host, server.port);
+ socket.connectToHost(server.host, server.port);
#endif
}
-void CoreNetwork::disconnectFromIrc(bool requested, const QString &reason, bool withReconnect) {
- _quitRequested = requested; // see socketDisconnected();
- if(!withReconnect) {
- _autoReconnectTimer.stop();
- _autoReconnectCount = 0; // prohibiting auto reconnect
- }
- disablePingTimeout();
- _msgQueue.clear();
- IrcUser *me_ = me();
- if(me_) {
- QString awayMsg;
- if(me_->isAway())
- awayMsg = me_->awayMessage();
- Core::setAwayMessage(userId(), networkId(), awayMsg);
- }
+void CoreNetwork::disconnectFromIrc(bool requested, const QString &reason, bool withReconnect)
+{
+ _quitRequested = requested; // see socketDisconnected();
+ if (!withReconnect) {
+ _autoReconnectTimer.stop();
+ _autoReconnectCount = 0; // prohibiting auto reconnect
+ }
+ disablePingTimeout();
+ _msgQueue.clear();
+
+ IrcUser *me_ = me();
+ if (me_) {
+ QString awayMsg;
+ if (me_->isAway())
+ awayMsg = me_->awayMessage();
+ Core::setAwayMessage(userId(), networkId(), awayMsg);
+ }
- if(reason.isEmpty() && identityPtr())
- _quitReason = identityPtr()->quitReason();
- else
- _quitReason = reason;
+ if (reason.isEmpty() && identityPtr())
+ _quitReason = identityPtr()->quitReason();
+ else
+ _quitReason = reason;
- displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Disconnecting. (%1)").arg((!requested && !withReconnect) ? tr("Core Shutdown") : _quitReason));
- switch(socket.state()) {
- case QAbstractSocket::ConnectedState:
- userInputHandler()->issueQuit(_quitReason);
- if(requested || withReconnect) {
- // the irc server has 10 seconds to close the socket
- _socketCloseTimer.start(10000);
- break;
+ displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Disconnecting. (%1)").arg((!requested && !withReconnect) ? tr("Core Shutdown") : _quitReason));
+ switch (socket.state()) {
+ case QAbstractSocket::ConnectedState:
+ userInputHandler()->issueQuit(_quitReason);
+ if (requested || withReconnect) {
+ // the irc server has 10 seconds to close the socket
+ _socketCloseTimer.start(10000);
+ break;
+ }
+ default:
+ socket.close();
+ socketDisconnected();
}
- default:
- socket.close();
- socketDisconnected();
- }
}
-void CoreNetwork::userInput(BufferInfo buf, QString msg) {
- userInputHandler()->handleUserInput(buf, msg);
+
+void CoreNetwork::userInput(BufferInfo buf, QString msg)
+{
+ userInputHandler()->handleUserInput(buf, msg);
}
-void CoreNetwork::putRawLine(QByteArray s) {
- if(_tokenBucket > 0)
- writeToSocket(s);
- else
- _msgQueue.append(s);
+
+void CoreNetwork::putRawLine(QByteArray s)
+{
+ if (_tokenBucket > 0)
+ writeToSocket(s);
+ else
+ _msgQueue.append(s);
}
-void CoreNetwork::putCmd(const QString &cmd, const QList<QByteArray> ¶ms, const QByteArray &prefix) {
- QByteArray msg;
- if(!prefix.isEmpty())
- msg += ":" + prefix + " ";
- msg += cmd.toUpper().toAscii();
+void CoreNetwork::putCmd(const QString &cmd, const QList<QByteArray> ¶ms, const QByteArray &prefix)
+{
+ QByteArray msg;
- for(int i = 0; i < params.size() - 1; i++) {
- msg += " " + params[i];
- }
- if(!params.isEmpty())
- msg += " :" + params.last();
+ if (!prefix.isEmpty())
+ msg += ":" + prefix + " ";
+ msg += cmd.toUpper().toAscii();
- putRawLine(msg);
+ for (int i = 0; i < params.size() - 1; i++) {
+ msg += " " + params[i];
+ }
+ if (!params.isEmpty())
+ msg += " :" + params.last();
+
+ putRawLine(msg);
}
-void CoreNetwork::setChannelJoined(const QString &channel) {
- _autoWhoQueue.prepend(channel.toLower()); // prepend so this new chan is the first to be checked
- Core::setChannelPersistent(userId(), networkId(), channel, true);
- Core::setPersistentChannelKey(userId(), networkId(), channel, _channelKeys[channel.toLower()]);
+void CoreNetwork::setChannelJoined(const QString &channel)
+{
+ _autoWhoQueue.prepend(channel.toLower()); // prepend so this new chan is the first to be checked
+
+ Core::setChannelPersistent(userId(), networkId(), channel, true);
+ Core::setPersistentChannelKey(userId(), networkId(), channel, _channelKeys[channel.toLower()]);
}
-void CoreNetwork::setChannelParted(const QString &channel) {
- removeChannelKey(channel);
- _autoWhoQueue.removeAll(channel.toLower());
- _autoWhoPending.remove(channel.toLower());
- Core::setChannelPersistent(userId(), networkId(), channel, false);
+void CoreNetwork::setChannelParted(const QString &channel)
+{
+ removeChannelKey(channel);
+ _autoWhoQueue.removeAll(channel.toLower());
+ _autoWhoPending.remove(channel.toLower());
+
+ Core::setChannelPersistent(userId(), networkId(), channel, false);
}
-void CoreNetwork::addChannelKey(const QString &channel, const QString &key) {
- if(key.isEmpty()) {
- removeChannelKey(channel);
- } else {
- _channelKeys[channel.toLower()] = key;
- }
+
+void CoreNetwork::addChannelKey(const QString &channel, const QString &key)
+{
+ if (key.isEmpty()) {
+ removeChannelKey(channel);
+ }
+ else {
+ _channelKeys[channel.toLower()] = key;
+ }
}
-void CoreNetwork::removeChannelKey(const QString &channel) {
- _channelKeys.remove(channel.toLower());
+
+void CoreNetwork::removeChannelKey(const QString &channel)
+{
+ _channelKeys.remove(channel.toLower());
}
+
#ifdef HAVE_QCA2
-Cipher *CoreNetwork::cipher(const QString &target) const {
- if(target.isEmpty())
- return 0;
+Cipher *CoreNetwork::cipher(const QString &target)
+{
+ if (target.isEmpty())
+ return 0;
- if(!Cipher::neededFeaturesAvailable())
- return 0;
+ if (!Cipher::neededFeaturesAvailable())
+ return 0;
- QByteArray key = cipherKey(target);
- if(key.isEmpty())
+ CoreIrcChannel *channel = qobject_cast<CoreIrcChannel *>(ircChannel(target));
+ if (channel) {
+ return channel->cipher();
+ }
+ CoreIrcUser *user = qobject_cast<CoreIrcUser *>(ircUser(target));
+ if (user) {
+ return user->cipher();
+ } else if (!isChannelName(target)) {
+ return qobject_cast<CoreIrcUser*>(newIrcUser(target))->cipher();
+ }
return 0;
+}
- CoreIrcChannel *channel = qobject_cast<CoreIrcChannel *>(ircChannel(target));
- if(channel) {
- if(channel->cipher()->setKey(key))
- return channel->cipher();
- } else {
- CoreIrcUser *user = qobject_cast<CoreIrcUser *>(ircUser(target));
- if(user && user->cipher()->setKey(key))
- return user->cipher();
- }
- return 0;
+
+QByteArray CoreNetwork::cipherKey(const QString &target) const
+{
+ CoreIrcChannel *c = qobject_cast<CoreIrcChannel*>(ircChannel(target));
+ if (c)
+ return c->cipher()->key();
+
+ CoreIrcUser *u = qobject_cast<CoreIrcUser*>(ircUser(target));
+ if (u)
+ return u->cipher()->key();
+
+ return QByteArray();
}
-QByteArray CoreNetwork::cipherKey(const QString &recipient) const {
- return _cipherKeys.value(recipient.toLower(), QByteArray());
+
+void CoreNetwork::setCipherKey(const QString &target, const QByteArray &key)
+{
+ CoreIrcChannel *c = qobject_cast<CoreIrcChannel*>(ircChannel(target));
+ if (c) {
+ c->setEncrypted(c->cipher()->setKey(key));
+ return;
+ }
+
+ CoreIrcUser *u = qobject_cast<CoreIrcUser*>(ircUser(target));
+ if (!u && !isChannelName(target))
+ u = qobject_cast<CoreIrcUser*>(newIrcUser(target));
+
+ if (u) {
+ u->setEncrypted(u->cipher()->setKey(key));
+ return;
+ }
}
-void CoreNetwork::setCipherKey(const QString &recipient, const QByteArray &key) {
- if(!key.isEmpty())
- _cipherKeys[recipient.toLower()] = key;
- else
- _cipherKeys.remove(recipient.toLower());
+
+bool CoreNetwork::cipherUsesCBC(const QString &target)
+{
+ CoreIrcChannel *c = qobject_cast<CoreIrcChannel*>(ircChannel(target));
+ if (c)
+ return c->cipher()->usesCBC();
+ CoreIrcUser *u = qobject_cast<CoreIrcUser*>(ircUser(target));
+ if (u)
+ return u->cipher()->usesCBC();
+
+ return false;
}
#endif /* HAVE_QCA2 */
-bool CoreNetwork::setAutoWhoDone(const QString &channel) {
- QString chan = channel.toLower();
- if(_autoWhoPending.value(chan, 0) <= 0)
- return false;
- if(--_autoWhoPending[chan] <= 0)
- _autoWhoPending.remove(chan);
- return true;
+bool CoreNetwork::setAutoWhoDone(const QString &channel)
+{
+ QString chan = channel.toLower();
+ if (_autoWhoPending.value(chan, 0) <= 0)
+ return false;
+ if (--_autoWhoPending[chan] <= 0)
+ _autoWhoPending.remove(chan);
+ return true;
}
-void CoreNetwork::setMyNick(const QString &mynick) {
- Network::setMyNick(mynick);
- if(connectionState() == Network::Initializing)
- networkInitialized();
+
+void CoreNetwork::setMyNick(const QString &mynick)
+{
+ Network::setMyNick(mynick);
+ if (connectionState() == Network::Initializing)
+ networkInitialized();
}
-void CoreNetwork::socketHasData() {
- while(socket.canReadLine()) {
- QByteArray s = socket.readLine().trimmed();
- NetworkDataEvent *event = new NetworkDataEvent(EventManager::NetworkIncoming, this, s);
+
+void CoreNetwork::socketHasData()
+{
+ while (socket.canReadLine()) {
+ QByteArray s = socket.readLine();
+ s.chop(2);
+ NetworkDataEvent *event = new NetworkDataEvent(EventManager::NetworkIncoming, this, s);
#if QT_VERSION >= 0x040700
- event->setTimestamp(QDateTime::currentDateTimeUtc());
+ event->setTimestamp(QDateTime::currentDateTimeUtc());
#else
- event->setTimestamp(QDateTime::currentDateTime().toUTC());
+ event->setTimestamp(QDateTime::currentDateTime().toUTC());
#endif
- emit newEvent(event);
- }
+ emit newEvent(event);
+ }
}
-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());
- displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Connection failure: %1").arg(socket.errorString()));
- emitConnectionError(socket.errorString());
- if(socket.state() < QAbstractSocket::ConnectedState) {
- socketDisconnected();
- }
+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());
+ displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Connection failure: %1").arg(socket.errorString()));
+ emitConnectionError(socket.errorString());
+ if (socket.state() < QAbstractSocket::ConnectedState) {
+ socketDisconnected();
+ }
}
-void CoreNetwork::socketInitialized() {
- Server server = usedServer();
+
+void CoreNetwork::socketInitialized()
+{
+ Server server = usedServer();
#ifdef HAVE_SSL
- if(server.useSsl && !socket.isEncrypted())
- return;
+ if (server.useSsl && !socket.isEncrypted())
+ return;
+#endif
+#if QT_VERSION >= 0x040600
+ socket.setSocketOption(QAbstractSocket::KeepAliveOption, true);
#endif
+ CoreIdentity *identity = identityPtr();
+ if (!identity) {
+ qCritical() << "Identity invalid!";
+ disconnectFromIrc();
+ return;
+ }
- CoreIdentity *identity = identityPtr();
- if(!identity) {
- qCritical() << "Identity invalid!";
- disconnectFromIrc();
- return;
- }
-
- // TokenBucket to avoid sending too much at once
- _messageDelay = 2200; // this seems to be a safe value (2.2 seconds delay)
- _burstSize = 5;
- _tokenBucket = _burstSize; // init with a full bucket
- _tokenBucketTimer.start(_messageDelay);
-
- if(networkInfo().useSasl) {
- putRawLine(serverEncode(QString("CAP REQ :sasl")));
- }
- if(!server.password.isEmpty()) {
- putRawLine(serverEncode(QString("PASS %1").arg(server.password)));
- }
- QString nick;
- if(identity->nicks().isEmpty()) {
- nick = "quassel";
- qWarning() << "CoreNetwork::socketInitialized(): no nicks supplied for identity Id" << identity->id();
- } else {
- nick = identity->nicks()[0];
- }
- putRawLine(serverEncode(QString("NICK :%1").arg(nick)));
- putRawLine(serverEncode(QString("USER %1 8 * :%2").arg(identity->ident(), identity->realName())));
-}
-
-void CoreNetwork::socketDisconnected() {
- disablePingTimeout();
- _msgQueue.clear();
-
- _autoWhoCycleTimer.stop();
- _autoWhoTimer.stop();
- _autoWhoQueue.clear();
- _autoWhoPending.clear();
-
- _socketCloseTimer.stop();
-
- _tokenBucketTimer.stop();
-
- IrcUser *me_ = me();
- if(me_) {
- foreach(QString channel, me_->channels())
- displayMsg(Message::Quit, BufferInfo::ChannelBuffer, channel, _quitReason, me_->hostmask());
- }
-
- setConnected(false);
- emit disconnected(networkId());
- if(_quitRequested) {
- _quitRequested = false;
- setConnectionState(Network::Disconnected);
- Core::setNetworkConnected(userId(), networkId(), false);
- } else if(_autoReconnectCount != 0) {
- setConnectionState(Network::Reconnecting);
- if(_autoReconnectCount == -1 || _autoReconnectCount == autoReconnectRetries())
- doAutoReconnect(); // first try is immediate
- else
- _autoReconnectTimer.start();
- }
+ emit socketInitialized(identity, localAddress(), localPort(), peerAddress(), peerPort());
+
+ // TokenBucket to avoid sending too much at once
+ _messageDelay = 2200; // this seems to be a safe value (2.2 seconds delay)
+ _burstSize = 5;
+ _tokenBucket = _burstSize; // init with a full bucket
+ _tokenBucketTimer.start(_messageDelay);
+
+ if (networkInfo().useSasl) {
+ putRawLine(serverEncode(QString("CAP REQ :sasl")));
+ }
+ if (!server.password.isEmpty()) {
+ putRawLine(serverEncode(QString("PASS %1").arg(server.password)));
+ }
+ QString nick;
+ if (identity->nicks().isEmpty()) {
+ nick = "quassel";
+ qWarning() << "CoreNetwork::socketInitialized(): no nicks supplied for identity Id" << identity->id();
+ }
+ else {
+ nick = identity->nicks()[0];
+ }
+ putRawLine(serverEncode(QString("NICK :%1").arg(nick)));
+ putRawLine(serverEncode(QString("USER %1 8 * :%2").arg(identity->ident(), identity->realName())));
+}
+
+
+void CoreNetwork::socketDisconnected()
+{
+ disablePingTimeout();
+ _msgQueue.clear();
+
+ _autoWhoCycleTimer.stop();
+ _autoWhoTimer.stop();
+ _autoWhoQueue.clear();
+ _autoWhoPending.clear();
+
+ _socketCloseTimer.stop();
+
+ _tokenBucketTimer.stop();
+
+ IrcUser *me_ = me();
+ if (me_) {
+ foreach(QString channel, me_->channels())
+ displayMsg(Message::Quit, BufferInfo::ChannelBuffer, channel, _quitReason, me_->hostmask());
+ }
+
+ setConnected(false);
+ emit disconnected(networkId());
+ emit socketDisconnected(identityPtr(), localAddress(), localPort(), peerAddress(), peerPort());
+ if (_quitRequested) {
+ _quitRequested = false;
+ setConnectionState(Network::Disconnected);
+ Core::setNetworkConnected(userId(), networkId(), false);
+ }
+ else if (_autoReconnectCount != 0) {
+ setConnectionState(Network::Reconnecting);
+ if (_autoReconnectCount == -1 || _autoReconnectCount == autoReconnectRetries())
+ doAutoReconnect(); // first try is immediate
+ else
+ _autoReconnectTimer.start();
+ }
}
-void CoreNetwork::socketStateChanged(QAbstractSocket::SocketState socketState) {
- Network::ConnectionState state;
- switch(socketState) {
+
+void CoreNetwork::socketStateChanged(QAbstractSocket::SocketState socketState)
+{
+ Network::ConnectionState state;
+ switch (socketState) {
case QAbstractSocket::UnconnectedState:
- state = Network::Disconnected;
- break;
+ state = Network::Disconnected;
+ break;
case QAbstractSocket::HostLookupState:
case QAbstractSocket::ConnectingState:
- state = Network::Connecting;
- break;
+ state = Network::Connecting;
+ break;
case QAbstractSocket::ConnectedState:
- state = Network::Initializing;
- break;
+ state = Network::Initializing;
+ break;
case QAbstractSocket::ClosingState:
- state = Network::Disconnecting;
- break;
+ state = Network::Disconnecting;
+ break;
default:
- state = Network::Disconnected;
- }
- setConnectionState(state);
-}
-
-void CoreNetwork::networkInitialized() {
- setConnectionState(Network::Initialized);
- setConnected(true);
- _quitRequested = false;
-
- if(useAutoReconnect()) {
- // reset counter
- _autoReconnectCount = unlimitedReconnectRetries() ? -1 : autoReconnectRetries();
- }
+ state = Network::Disconnected;
+ }
+ setConnectionState(state);
+}
+
+
+void CoreNetwork::networkInitialized()
+{
+ setConnectionState(Network::Initialized);
+ setConnected(true);
+ _quitRequested = false;
+
+ if (useAutoReconnect()) {
+ // reset counter
+ _autoReconnectCount = unlimitedReconnectRetries() ? -1 : autoReconnectRetries();
+ }
- // restore away state
- QString awayMsg = Core::awayMessage(userId(), networkId());
- if(!awayMsg.isEmpty())
- userInputHandler()->handleAway(BufferInfo(), Core::awayMessage(userId(), networkId()));
-
- sendPerform();
-
- enablePingTimeout();
-
- if(networkConfig()->autoWhoEnabled()) {
- _autoWhoCycleTimer.start();
- _autoWhoTimer.start();
- startAutoWhoCycle(); // FIXME wait for autojoin to be completed
- }
-
- Core::bufferInfo(userId(), networkId(), BufferInfo::StatusBuffer); // create status buffer
- Core::setNetworkConnected(userId(), networkId(), true);
-}
+ // restore away state
+ QString awayMsg = Core::awayMessage(userId(), networkId());
+ if (!awayMsg.isEmpty())
+ userInputHandler()->handleAway(BufferInfo(), Core::awayMessage(userId(), networkId()));
-void CoreNetwork::sendPerform() {
- BufferInfo statusBuf = BufferInfo::fakeStatusBuffer(networkId());
+ sendPerform();
- // do auto identify
- if(useAutoIdentify() && !autoIdentifyService().isEmpty() && !autoIdentifyPassword().isEmpty()) {
- userInputHandler()->handleMsg(statusBuf, QString("%1 IDENTIFY %2").arg(autoIdentifyService(), autoIdentifyPassword()));
- }
+ _sendPings = true;
- // restore old user modes if server default mode is set.
- IrcUser *me_ = me();
- if(me_) {
- if(!me_->userModes().isEmpty()) {
- restoreUserModes();
- } else {
- connect(me_, SIGNAL(userModesSet(QString)), this, SLOT(restoreUserModes()));
- connect(me_, SIGNAL(userModesAdded(QString)), this, SLOT(restoreUserModes()));
+ if (networkConfig()->autoWhoEnabled()) {
+ _autoWhoCycleTimer.start();
+ _autoWhoTimer.start();
+ startAutoWhoCycle(); // FIXME wait for autojoin to be completed
}
- }
- // send perform list
- foreach(QString line, perform()) {
- if(!line.isEmpty()) userInput(statusBuf, line);
- }
+ Core::bufferInfo(userId(), networkId(), BufferInfo::StatusBuffer); // create status buffer
+ Core::setNetworkConnected(userId(), networkId(), true);
+}
+
+
+void CoreNetwork::sendPerform()
+{
+ BufferInfo statusBuf = BufferInfo::fakeStatusBuffer(networkId());
+
+ // do auto identify
+ if (useAutoIdentify() && !autoIdentifyService().isEmpty() && !autoIdentifyPassword().isEmpty()) {
+ userInputHandler()->handleMsg(statusBuf, QString("%1 IDENTIFY %2").arg(autoIdentifyService(), autoIdentifyPassword()));
+ }
- // rejoin channels we've been in
- 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);
- }
+ // restore old user modes if server default mode is set.
+ IrcUser *me_ = me();
+ if (me_) {
+ if (!me_->userModes().isEmpty()) {
+ restoreUserModes();
+ }
+ else {
+ connect(me_, SIGNAL(userModesSet(QString)), this, SLOT(restoreUserModes()));
+ connect(me_, SIGNAL(userModesAdded(QString)), this, SLOT(restoreUserModes()));
+ }
+ }
+
+ // send perform list
+ foreach(QString line, perform()) {
+ if (!line.isEmpty()) userInput(statusBuf, line);
+ }
+
+ // rejoin channels we've been in
+ 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::restoreUserModes() {
- IrcUser *me_ = me();
- Q_ASSERT(me_);
- disconnect(me_, SIGNAL(userModesSet(QString)), this, SLOT(restoreUserModes()));
- disconnect(me_, SIGNAL(userModesAdded(QString)), this, SLOT(restoreUserModes()));
+void CoreNetwork::restoreUserModes()
+{
+ IrcUser *me_ = me();
+ Q_ASSERT(me_);
- QString modesDelta = Core::userModes(userId(), networkId());
- QString currentModes = me_->userModes();
+ disconnect(me_, SIGNAL(userModesSet(QString)), this, SLOT(restoreUserModes()));
+ disconnect(me_, SIGNAL(userModesAdded(QString)), this, SLOT(restoreUserModes()));
- QString addModes, removeModes;
- if(modesDelta.contains('-')) {
- addModes = modesDelta.section('-', 0, 0);
- removeModes = modesDelta.section('-', 1);
- } else {
- addModes = modesDelta;
- }
+ QString modesDelta = Core::userModes(userId(), networkId());
+ QString currentModes = me_->userModes();
+ QString addModes, removeModes;
+ if (modesDelta.contains('-')) {
+ addModes = modesDelta.section('-', 0, 0);
+ removeModes = modesDelta.section('-', 1);
+ }
+ else {
+ addModes = modesDelta;
+ }
- addModes.remove(QRegExp(QString("[%1]").arg(currentModes)));
- if(currentModes.isEmpty())
- removeModes = QString();
- else
- removeModes.remove(QRegExp(QString("[^%1]").arg(currentModes)));
+ addModes.remove(QRegExp(QString("[%1]").arg(currentModes)));
+ if (currentModes.isEmpty())
+ removeModes = QString();
+ else
+ removeModes.remove(QRegExp(QString("[^%1]").arg(currentModes)));
- if(addModes.isEmpty() && removeModes.isEmpty())
- return;
+ if (addModes.isEmpty() && removeModes.isEmpty())
+ return;
- if(!addModes.isEmpty())
- addModes = '+' + addModes;
- if(!removeModes.isEmpty())
- removeModes = '-' + removeModes;
+ if (!addModes.isEmpty())
+ addModes = '+' + addModes;
+ if (!removeModes.isEmpty())
+ removeModes = '-' + removeModes;
- // don't use InputHandler::handleMode() as it keeps track of our persistent mode changes
- putRawLine(serverEncode(QString("MODE %1 %2%3").arg(me_->nick()).arg(addModes).arg(removeModes)));
+ // don't use InputHandler::handleMode() as it keeps track of our persistent mode changes
+ putRawLine(serverEncode(QString("MODE %1 %2%3").arg(me_->nick()).arg(addModes).arg(removeModes)));
}
-void CoreNetwork::updateIssuedModes(const QString &requestedModes) {
- QString addModes;
- QString removeModes;
- bool addMode = true;
- for(int i = 0; i < requestedModes.length(); i++) {
- if(requestedModes[i] == '+') {
- addMode = true;
- continue;
+void CoreNetwork::updateIssuedModes(const QString &requestedModes)
+{
+ QString addModes;
+ QString removeModes;
+ bool addMode = true;
+
+ for (int i = 0; i < requestedModes.length(); i++) {
+ if (requestedModes[i] == '+') {
+ addMode = true;
+ continue;
+ }
+ if (requestedModes[i] == '-') {
+ addMode = false;
+ continue;
+ }
+ if (addMode) {
+ addModes += requestedModes[i];
+ }
+ else {
+ removeModes += requestedModes[i];
+ }
}
- if(requestedModes[i] == '-') {
- addMode = false;
- continue;
+
+ QString addModesOld = _requestedUserModes.section('-', 0, 0);
+ QString removeModesOld = _requestedUserModes.section('-', 1);
+
+ addModes.remove(QRegExp(QString("[%1]").arg(addModesOld))); // deduplicate
+ addModesOld.remove(QRegExp(QString("[%1]").arg(removeModes))); // update
+ addModes += addModesOld;
+
+ removeModes.remove(QRegExp(QString("[%1]").arg(removeModesOld))); // deduplicate
+ removeModesOld.remove(QRegExp(QString("[%1]").arg(addModes))); // update
+ removeModes += removeModesOld;
+
+ _requestedUserModes = QString("%1-%2").arg(addModes).arg(removeModes);
+}
+
+
+void CoreNetwork::updatePersistentModes(QString addModes, QString removeModes)
+{
+ QString persistentUserModes = Core::userModes(userId(), networkId());
+
+ QString requestedAdd = _requestedUserModes.section('-', 0, 0);
+ QString requestedRemove = _requestedUserModes.section('-', 1);
+
+ QString persistentAdd, persistentRemove;
+ if (persistentUserModes.contains('-')) {
+ persistentAdd = persistentUserModes.section('-', 0, 0);
+ persistentRemove = persistentUserModes.section('-', 1);
}
- if(addMode) {
- addModes += requestedModes[i];
- } else {
- removeModes += requestedModes[i];
+ else {
+ persistentAdd = persistentUserModes;
}
- }
+ // remove modes we didn't issue
+ if (requestedAdd.isEmpty())
+ addModes = QString();
+ else
+ addModes.remove(QRegExp(QString("[^%1]").arg(requestedAdd)));
+
+ if (requestedRemove.isEmpty())
+ removeModes = QString();
+ else
+ removeModes.remove(QRegExp(QString("[^%1]").arg(requestedRemove)));
- QString addModesOld = _requestedUserModes.section('-', 0, 0);
- QString removeModesOld = _requestedUserModes.section('-', 1);
+ // deduplicate
+ persistentAdd.remove(QRegExp(QString("[%1]").arg(addModes)));
+ persistentRemove.remove(QRegExp(QString("[%1]").arg(removeModes)));
- addModes.remove(QRegExp(QString("[%1]").arg(addModesOld))); // deduplicate
- addModesOld.remove(QRegExp(QString("[%1]").arg(removeModes))); // update
- addModes += addModesOld;
+ // update
+ persistentAdd.remove(QRegExp(QString("[%1]").arg(removeModes)));
+ persistentRemove.remove(QRegExp(QString("[%1]").arg(addModes)));
- removeModes.remove(QRegExp(QString("[%1]").arg(removeModesOld))); // deduplicate
- removeModesOld.remove(QRegExp(QString("[%1]").arg(addModes))); // update
- removeModes += removeModesOld;
+ // update issued mode list
+ requestedAdd.remove(QRegExp(QString("[%1]").arg(addModes)));
+ requestedRemove.remove(QRegExp(QString("[%1]").arg(removeModes)));
+ _requestedUserModes = QString("%1-%2").arg(requestedAdd).arg(requestedRemove);
- _requestedUserModes = QString("%1-%2").arg(addModes).arg(removeModes);
+ persistentAdd += addModes;
+ persistentRemove += removeModes;
+ Core::setUserModes(userId(), networkId(), QString("%1-%2").arg(persistentAdd).arg(persistentRemove));
}
-void CoreNetwork::updatePersistentModes(QString addModes, QString removeModes) {
- QString persistentUserModes = Core::userModes(userId(), networkId());
-
- QString requestedAdd = _requestedUserModes.section('-', 0, 0);
- QString requestedRemove = _requestedUserModes.section('-', 1);
- QString persistentAdd, persistentRemove;
- if(persistentUserModes.contains('-')) {
- persistentAdd = persistentUserModes.section('-', 0, 0);
- persistentRemove = persistentUserModes.section('-', 1);
- } else {
- persistentAdd = persistentUserModes;
- }
+void CoreNetwork::resetPersistentModes()
+{
+ _requestedUserModes = QString('-');
+ Core::setUserModes(userId(), networkId(), QString());
+}
- // remove modes we didn't issue
- if(requestedAdd.isEmpty())
- addModes = QString();
- else
- addModes.remove(QRegExp(QString("[^%1]").arg(requestedAdd)));
- if(requestedRemove.isEmpty())
- removeModes = QString();
- else
- removeModes.remove(QRegExp(QString("[^%1]").arg(requestedRemove)));
+void CoreNetwork::setUseAutoReconnect(bool use)
+{
+ Network::setUseAutoReconnect(use);
+ if (!use)
+ _autoReconnectTimer.stop();
+}
- // deduplicate
- persistentAdd.remove(QRegExp(QString("[%1]").arg(addModes)));
- persistentRemove.remove(QRegExp(QString("[%1]").arg(removeModes)));
- // update
- persistentAdd.remove(QRegExp(QString("[%1]").arg(removeModes)));
- persistentRemove.remove(QRegExp(QString("[%1]").arg(addModes)));
+void CoreNetwork::setAutoReconnectInterval(quint32 interval)
+{
+ Network::setAutoReconnectInterval(interval);
+ _autoReconnectTimer.setInterval(interval * 1000);
+}
- // update issued mode list
- requestedAdd.remove(QRegExp(QString("[%1]").arg(addModes)));
- requestedRemove.remove(QRegExp(QString("[%1]").arg(removeModes)));
- _requestedUserModes = QString("%1-%2").arg(requestedAdd).arg(requestedRemove);
- persistentAdd += addModes;
- persistentRemove += removeModes;
- Core::setUserModes(userId(), networkId(), QString("%1-%2").arg(persistentAdd).arg(persistentRemove));
+void CoreNetwork::setAutoReconnectRetries(quint16 retries)
+{
+ Network::setAutoReconnectRetries(retries);
+ if (_autoReconnectCount != 0) {
+ if (unlimitedReconnectRetries())
+ _autoReconnectCount = -1;
+ else
+ _autoReconnectCount = autoReconnectRetries();
+ }
}
-void CoreNetwork::resetPersistentModes() {
- _requestedUserModes = QString('-');
- Core::setUserModes(userId(), networkId(), QString());
+
+void CoreNetwork::doAutoReconnect()
+{
+ if (connectionState() != Network::Disconnected && connectionState() != Network::Reconnecting) {
+ qWarning() << "CoreNetwork::doAutoReconnect(): Cannot reconnect while not being disconnected!";
+ return;
+ }
+ if (_autoReconnectCount > 0 || _autoReconnectCount == -1)
+ _autoReconnectCount--; // -2 means we delay the next reconnect
+ connectToIrc(true);
}
-void CoreNetwork::setUseAutoReconnect(bool use) {
- Network::setUseAutoReconnect(use);
- if(!use)
- _autoReconnectTimer.stop();
+
+void CoreNetwork::sendPing()
+{
+ uint now = QDateTime::currentDateTime().toTime_t();
+ if (_pingCount != 0) {
+ qDebug() << "UserId:" << userId() << "Network:" << networkName() << "missed" << _pingCount << "pings."
+ << "BA:" << socket.bytesAvailable() << "BTW:" << socket.bytesToWrite();
+ }
+ if ((int)_pingCount >= networkConfig()->maxPingCount() && now - _lastPingTime <= (uint)(_pingTimer.interval() / 1000) + 1) {
+ // the second check compares the actual elapsed time since the last ping and the pingTimer interval
+ // if the interval is shorter then the actual elapsed time it means that this thread was somehow blocked
+ // and unable to even handle a ping answer. So we ignore those misses.
+ disconnectFromIrc(false, QString("No Ping reply in %1 seconds.").arg(_pingCount * _pingTimer.interval() / 1000), true /* withReconnect */);
+ }
+ else {
+ _lastPingTime = now;
+ _pingCount++;
+ // Don't send pings until the network is initialized
+ if(_sendPings)
+ userInputHandler()->handlePing(BufferInfo(), QString());
+ }
}
-void CoreNetwork::setAutoReconnectInterval(quint32 interval) {
- Network::setAutoReconnectInterval(interval);
- _autoReconnectTimer.setInterval(interval * 1000);
+
+void CoreNetwork::enablePingTimeout(bool enable)
+{
+ if (!enable)
+ disablePingTimeout();
+ else {
+ resetPingTimeout();
+ if (networkConfig()->pingTimeoutEnabled())
+ _pingTimer.start();
+ }
}
-void CoreNetwork::setAutoReconnectRetries(quint16 retries) {
- Network::setAutoReconnectRetries(retries);
- if(_autoReconnectCount != 0) {
- if(unlimitedReconnectRetries())
- _autoReconnectCount = -1;
- else
- _autoReconnectCount = autoReconnectRetries();
- }
-}
-
-void CoreNetwork::doAutoReconnect() {
- if(connectionState() != Network::Disconnected && connectionState() != Network::Reconnecting) {
- qWarning() << "CoreNetwork::doAutoReconnect(): Cannot reconnect while not being disconnected!";
- return;
- }
- if(_autoReconnectCount > 0 || _autoReconnectCount == -1)
- _autoReconnectCount--; // -2 means we delay the next reconnect
- connectToIrc(true);
-}
-
-void CoreNetwork::sendPing() {
- uint now = QDateTime::currentDateTime().toTime_t();
- if(_pingCount != 0) {
- qDebug() << "UserId:" << userId() << "Network:" << networkName() << "missed" << _pingCount << "pings."
- << "BA:" << socket.bytesAvailable() << "BTW:" << socket.bytesToWrite();
- }
- if((int)_pingCount >= networkConfig()->maxPingCount() && now - _lastPingTime <= (uint)(_pingTimer.interval() / 1000) + 1) {
- // the second check compares the actual elapsed time since the last ping and the pingTimer interval
- // if the interval is shorter then the actual elapsed time it means that this thread was somehow blocked
- // and unable to even handle a ping answer. So we ignore those misses.
- disconnectFromIrc(false, QString("No Ping reply in %1 seconds.").arg(_pingCount * _pingTimer.interval() / 1000), true /* withReconnect */);
- } else {
- _lastPingTime = now;
- _pingCount++;
- userInputHandler()->handlePing(BufferInfo(), QString());
- }
-}
-
-void CoreNetwork::enablePingTimeout(bool enable) {
- if(!enable)
- disablePingTimeout();
- else {
+
+void CoreNetwork::disablePingTimeout()
+{
+ _pingTimer.stop();
+ _sendPings = false;
resetPingTimeout();
- if(networkConfig()->pingTimeoutEnabled())
- _pingTimer.start();
- }
}
-void CoreNetwork::disablePingTimeout() {
- _pingTimer.stop();
- resetPingTimeout();
-}
-void CoreNetwork::setPingInterval(int interval) {
- _pingTimer.setInterval(interval * 1000);
+void CoreNetwork::setPingInterval(int interval)
+{
+ _pingTimer.setInterval(interval * 1000);
}
+
/******** AutoWHO ********/
-void CoreNetwork::startAutoWhoCycle() {
- if(!_autoWhoQueue.isEmpty()) {
- _autoWhoCycleTimer.stop();
- return;
- }
- _autoWhoQueue = channels();
+void CoreNetwork::startAutoWhoCycle()
+{
+ if (!_autoWhoQueue.isEmpty()) {
+ _autoWhoCycleTimer.stop();
+ return;
+ }
+ _autoWhoQueue = channels();
}
-void CoreNetwork::setAutoWhoDelay(int delay) {
- _autoWhoTimer.setInterval(delay * 1000);
+
+void CoreNetwork::setAutoWhoDelay(int delay)
+{
+ _autoWhoTimer.setInterval(delay * 1000);
}
-void CoreNetwork::setAutoWhoInterval(int interval) {
- _autoWhoCycleTimer.setInterval(interval * 1000);
+
+void CoreNetwork::setAutoWhoInterval(int interval)
+{
+ _autoWhoCycleTimer.setInterval(interval * 1000);
}
-void CoreNetwork::setAutoWhoEnabled(bool enabled) {
- if(enabled && isConnected() && !_autoWhoTimer.isActive())
- _autoWhoTimer.start();
- else if(!enabled) {
- _autoWhoTimer.stop();
- _autoWhoCycleTimer.stop();
- }
-}
-
-void CoreNetwork::sendAutoWho() {
- // Don't send autowho if there are still some pending
- if(_autoWhoPending.count())
- return;
-
- while(!_autoWhoQueue.isEmpty()) {
- QString chan = _autoWhoQueue.takeFirst();
- IrcChannel *ircchan = ircChannel(chan);
- if(!ircchan) continue;
- if(networkConfig()->autoWhoNickLimit() > 0 && ircchan->ircUsers().count() >= networkConfig()->autoWhoNickLimit())
- continue;
- _autoWhoPending[chan]++;
- putRawLine("WHO " + serverEncode(chan));
- break;
- }
- if(_autoWhoQueue.isEmpty() && networkConfig()->autoWhoEnabled() && !_autoWhoCycleTimer.isActive()) {
- // Timer was stopped, means a new cycle is due immediately
- _autoWhoCycleTimer.start();
- startAutoWhoCycle();
- }
+
+void CoreNetwork::setAutoWhoEnabled(bool enabled)
+{
+ if (enabled && isConnected() && !_autoWhoTimer.isActive())
+ _autoWhoTimer.start();
+ else if (!enabled) {
+ _autoWhoTimer.stop();
+ _autoWhoCycleTimer.stop();
+ }
+}
+
+
+void CoreNetwork::sendAutoWho()
+{
+ // Don't send autowho if there are still some pending
+ if (_autoWhoPending.count())
+ return;
+
+ while (!_autoWhoQueue.isEmpty()) {
+ QString chan = _autoWhoQueue.takeFirst();
+ IrcChannel *ircchan = ircChannel(chan);
+ if (!ircchan) continue;
+ if (networkConfig()->autoWhoNickLimit() > 0 && ircchan->ircUsers().count() >= networkConfig()->autoWhoNickLimit())
+ continue;
+ _autoWhoPending[chan]++;
+ putRawLine("WHO " + serverEncode(chan));
+ break;
+ }
+ if (_autoWhoQueue.isEmpty() && networkConfig()->autoWhoEnabled() && !_autoWhoCycleTimer.isActive()) {
+ // Timer was stopped, means a new cycle is due immediately
+ _autoWhoCycleTimer.start();
+ startAutoWhoCycle();
+ }
}
+
#ifdef HAVE_SSL
-void CoreNetwork::sslErrors(const QList<QSslError> &sslErrors) {
- Q_UNUSED(sslErrors)
- socket.ignoreSslErrors();
- // TODO errorhandling
+void CoreNetwork::sslErrors(const QList<QSslError> &sslErrors)
+{
+ Q_UNUSED(sslErrors)
+ socket.ignoreSslErrors();
+ // TODO errorhandling
}
+
+
#endif // HAVE_SSL
-void CoreNetwork::fillBucketAndProcessQueue() {
- if(_tokenBucket < _burstSize) {
- _tokenBucket++;
- }
+void CoreNetwork::fillBucketAndProcessQueue()
+{
+ if (_tokenBucket < _burstSize) {
+ _tokenBucket++;
+ }
- while(_msgQueue.size() > 0 && _tokenBucket > 0) {
- writeToSocket(_msgQueue.takeFirst());
- }
+ while (_msgQueue.size() > 0 && _tokenBucket > 0) {
+ writeToSocket(_msgQueue.takeFirst());
+ }
}
-void CoreNetwork::writeToSocket(const QByteArray &data) {
- socket.write(data);
- socket.write("\r\n");
- _tokenBucket--;
+
+void CoreNetwork::writeToSocket(const QByteArray &data)
+{
+ socket.write(data);
+ socket.write("\r\n");
+ _tokenBucket--;
}
-Network::Server CoreNetwork::usedServer() const {
- if(_lastUsedServerIndex < serverList().count())
- return serverList()[_lastUsedServerIndex];
- if(!serverList().isEmpty())
- return serverList()[0];
+Network::Server CoreNetwork::usedServer() const
+{
+ if (_lastUsedServerIndex < serverList().count())
+ return serverList()[_lastUsedServerIndex];
+
+ if (!serverList().isEmpty())
+ return serverList()[0];
- return Network::Server();
+ return Network::Server();
}
-void CoreNetwork::requestConnect() const {
- if(connectionState() != Disconnected) {
- qWarning() << "Requesting connect while already being connected!";
- return;
- }
- QMetaObject::invokeMethod(const_cast<CoreNetwork *>(this), "connectToIrc", Qt::QueuedConnection);
+
+void CoreNetwork::requestConnect() const
+{
+ if (connectionState() != Disconnected) {
+ qWarning() << "Requesting connect while already being connected!";
+ return;
+ }
+ QMetaObject::invokeMethod(const_cast<CoreNetwork *>(this), "connectToIrc", Qt::QueuedConnection);
}
-void CoreNetwork::requestDisconnect() const {
- if(connectionState() == Disconnected) {
- qWarning() << "Requesting disconnect while not being connected!";
- return;
- }
- userInputHandler()->handleQuit(BufferInfo(), QString());
+
+void CoreNetwork::requestDisconnect() const
+{
+ if (connectionState() == Disconnected) {
+ qWarning() << "Requesting disconnect while not being connected!";
+ return;
+ }
+ userInputHandler()->handleQuit(BufferInfo(), QString());
}
-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;
+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;
+ }
}
- }
}
projects / quassel.git / blobdiff