X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fnetworkconnection.cpp;h=fd7e2ba50deb8588ca7fa6d0d85b5cdc0f70bcb4;hp=ed1a72b3d1e3f64c5e8df2b0abea3a497eaa8544;hb=236e70030428e5b85309d6ddb97b772fa3efe61a;hpb=6bff16ce4afeea153ffaf3d1916b6ba977853a27 diff --git a/src/core/networkconnection.cpp b/src/core/networkconnection.cpp index ed1a72b3..fd7e2ba5 100644 --- a/src/core/networkconnection.cpp +++ b/src/core/networkconnection.cpp @@ -27,6 +27,7 @@ #include "core.h" #include "coresession.h" +#include "ircchannel.h" #include "ircuser.h" #include "network.h" #include "identity.h" @@ -35,16 +36,34 @@ #include "userinputhandler.h" #include "ctcphandler.h" -NetworkConnection::NetworkConnection(Network *network, CoreSession *session, const QVariant &state) : QObject(network), +NetworkConnection::NetworkConnection(Network *network, CoreSession *session) : QObject(network), _connectionState(Network::Disconnected), _network(network), _coreSession(session), _ircServerHandler(new IrcServerHandler(this)), _userInputHandler(new UserInputHandler(this)), _ctcpHandler(new CtcpHandler(this)), - _previousState(state) + _autoReconnectCount(0) { + _autoReconnectTimer.setSingleShot(true); + _previousConnectionAttemptFailed = false; + _lastUsedServerlistIndex = 0; + // TODO make configurable + _whoTimer.setInterval(60 * 1000); + _whoTimer.setSingleShot(false); + + QHash channels = coreSession()->persistentChannels(networkId()); + foreach(QString chan, channels.keys()) { + _channelKeys[chan.toLower()] = channels[chan]; + } + + connect(&_autoReconnectTimer, SIGNAL(timeout()), this, SLOT(doAutoReconnect())); + connect(&_whoTimer, SIGNAL(timeout()), this, SLOT(sendWho())); + connect(network, SIGNAL(currentServerSet(const QString &)), this, SLOT(networkInitialized(const QString &))); + connect(network, SIGNAL(useAutoReconnectSet(bool)), this, SLOT(autoReconnectSettingsChanged())); + connect(network, SIGNAL(autoReconnectIntervalSet(quint32)), this, SLOT(autoReconnectSettingsChanged())); + connect(network, SIGNAL(autoReconnectRetriesSet(quint16)), this, SLOT(autoReconnectSettingsChanged())); connect(&socket, SIGNAL(connected()), this, SLOT(socketConnected())); connect(&socket, SIGNAL(disconnected()), this, SLOT(socketDisconnected())); @@ -52,10 +71,13 @@ NetworkConnection::NetworkConnection(Network *network, CoreSession *session, con connect(&socket, SIGNAL(stateChanged(QAbstractSocket::SocketState)), this, SLOT(socketStateChanged(QAbstractSocket::SocketState))); connect(&socket, SIGNAL(readyRead()), this, SLOT(socketHasData())); + connect(_ircServerHandler, SIGNAL(nickChanged(const QString &, const QString &)), + this, SLOT(nickChanged(const QString &, const QString &))); } NetworkConnection::~NetworkConnection() { - disconnectFromIrc(); + if(connectionState() != Network::Disconnected && connectionState() != Network::Reconnecting) + disconnectFromIrc(false); // clean up, but this does not count as requested disconnect! delete _ircServerHandler; delete _userInputHandler; delete _ctcpHandler; @@ -109,12 +131,14 @@ CtcpHandler *NetworkConnection::ctcpHandler() const { } QString NetworkConnection::serverDecode(const QByteArray &string) const { - return network()->decodeString(string); + return network()->decodeServerString(string); } -QString NetworkConnection::bufferDecode(const QString &bufferName, const QByteArray &string) const { - Q_UNUSED(bufferName); - // TODO: Implement buffer-specific encodings +QString NetworkConnection::channelDecode(const QString &bufferName, const QByteArray &string) const { + if(!bufferName.isEmpty()) { + IrcChannel *channel = network()->ircChannel(bufferName); + if(channel) return channel->decodeString(string); + } return network()->decodeString(string); } @@ -125,12 +149,14 @@ QString NetworkConnection::userDecode(const QString &userNick, const QByteArray } QByteArray NetworkConnection::serverEncode(const QString &string) const { - return network()->encodeString(string); + return network()->encodeServerString(string); } -QByteArray NetworkConnection::bufferEncode(const QString &bufferName, const QString &string) const { - Q_UNUSED(bufferName); - // TODO: Implement buffer-specific encodings +QByteArray NetworkConnection::channelEncode(const QString &bufferName, const QString &string) const { + if(!bufferName.isEmpty()) { + IrcChannel *channel = network()->ircChannel(bufferName); + if(channel) return channel->encodeString(string); + } return network()->encodeString(string); } @@ -140,8 +166,25 @@ QByteArray NetworkConnection::userEncode(const QString &userNick, const QString return network()->encodeString(string); } +void NetworkConnection::autoReconnectSettingsChanged() { + if(!network()->useAutoReconnect()) { + _autoReconnectTimer.stop(); + _autoReconnectCount = 0; + } else { + _autoReconnectTimer.setInterval(network()->autoReconnectInterval() * 1000); + if(_autoReconnectCount != 0) { + if(network()->unlimitedReconnectRetries()) _autoReconnectCount = -1; + else _autoReconnectCount = network()->autoReconnectRetries(); + } + } +} -void NetworkConnection::connectToIrc() { +void NetworkConnection::connectToIrc(bool reconnecting) { + if(!reconnecting && network()->useAutoReconnect() && _autoReconnectCount == 0) { + _autoReconnectTimer.setInterval(network()->autoReconnectInterval() * 1000); + if(network()->unlimitedReconnectRetries()) _autoReconnectCount = -1; + else _autoReconnectCount = network()->autoReconnectRetries(); + } QVariantList serverList = network()->serverList(); Identity *identity = coreSession()->identity(network()->identity()); if(!serverList.count()) { @@ -152,32 +195,40 @@ void NetworkConnection::connectToIrc() { qWarning() << "Invalid identity configures, ignoring connect request!"; return; } - // TODO implement cycling / random servers - QString host = serverList[0].toMap()["Host"].toString(); - quint16 port = serverList[0].toMap()["Port"].toUInt(); - displayStatusMsg(QString("Connecting to %1:%2...").arg(host).arg(port)); + // use a random server? + if(network()->useRandomServer()) { + _lastUsedServerlistIndex = 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(++_lastUsedServerlistIndex == serverList.size()) { + _lastUsedServerlistIndex = 0; + } + } + _previousConnectionAttemptFailed = false; + + QString host = serverList[_lastUsedServerlistIndex].toMap()["Host"].toString(); + quint16 port = serverList[_lastUsedServerlistIndex].toMap()["Port"].toUInt(); + displayStatusMsg(tr("Connecting to %1:%2...").arg(host).arg(port)); + displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Connecting to %1:%2...").arg(host).arg(port)); socket.connectToHost(host, port); } void NetworkConnection::networkInitialized(const QString ¤tServer) { if(currentServer.isEmpty()) return; + if(network()->useAutoReconnect() && !network()->unlimitedReconnectRetries()) { + _autoReconnectCount = network()->autoReconnectRetries(); // reset counter + } + sendPerform(); - // rejoin channels we've been in - QStringList chans = _previousState.toStringList(); - if(chans.count() > 0) { - qDebug() << "autojoining" << chans; - QVariantList list; - foreach(QString chan, chans) list << serverEncode(chan); - putCmd("JOIN", list); // FIXME check for 512 byte limit! - } - // delete _previousState, we won't need it again - _previousState = QVariant(); // now we are initialized setConnectionState(Network::Initialized); network()->setConnected(true); emit connected(networkId()); + sendWho(); + _whoTimer.start(); } void NetworkConnection::sendPerform() { @@ -190,16 +241,33 @@ void NetworkConnection::sendPerform() { foreach(QString line, network()->perform()) { if(!line.isEmpty()) userInput(statusBuf, line); } -} -QVariant NetworkConnection::state() const { - IrcUser *me = network()->ircUser(network()->myNick()); - if(!me) return QVariant(); // this shouldn't really happen, I guess - return me->channels(); + // 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); + } + } + QString joinString = QString("%1 %2").arg(channels.join(",")).arg(keys.join(",")).trimmed(); + if(!joinString.isEmpty()) userInputHandler()->handleJoin(statusBuf, joinString); } -void NetworkConnection::disconnectFromIrc() { - socket.disconnectFromHost(); +void NetworkConnection::disconnectFromIrc(bool requested) { + _autoReconnectTimer.stop(); + _autoReconnectCount = 0; + displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Disconnecting.")); + if(socket.state() < QAbstractSocket::ConnectedState) { + setConnectionState(Network::Disconnected); + socketDisconnected(); + } else socket.disconnectFromHost(); + + if(requested) { + emit quitRequested(networkId()); + } } void NetworkConnection::socketHasData() { @@ -210,10 +278,19 @@ void NetworkConnection::socketHasData() { } void NetworkConnection::socketError(QAbstractSocket::SocketError) { + _previousConnectionAttemptFailed = true; qDebug() << qPrintable(tr("Could not connect to %1 (%2)").arg(network()->networkName(), socket.errorString())); emit connectionError(socket.errorString()); emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Connection failure: %1").arg(socket.errorString())); network()->emitConnectionError(socket.errorString()); + if(socket.state() < QAbstractSocket::ConnectedState) { + setConnectionState(Network::Disconnected); + socketDisconnected(); + } + // mark last connection attempt as failed + + //qDebug() << "exiting..."; + //exit(1); } void NetworkConnection::socketConnected() { @@ -251,8 +328,23 @@ void NetworkConnection::socketStateChanged(QAbstractSocket::SocketState socketSt } void NetworkConnection::socketDisconnected() { + _whoTimer.stop(); network()->setConnected(false); emit disconnected(networkId()); + if(_autoReconnectCount != 0) { + setConnectionState(Network::Reconnecting); + if(_autoReconnectCount == network()->autoReconnectRetries()) doAutoReconnect(); // first try is immediate + else _autoReconnectTimer.start(); + } +} + +void NetworkConnection::doAutoReconnect() { + if(connectionState() != Network::Disconnected && connectionState() != Network::Reconnecting) { + qWarning() << "NetworkConnection::doAutoReconnect(): Cannot reconnect while not being disconnected!"; + return; + } + if(_autoReconnectCount > 0) _autoReconnectCount--; + connectToIrc(true); } // FIXME switch to BufferId @@ -280,6 +372,37 @@ void NetworkConnection::putCmd(const QString &cmd, const QVariantList ¶ms, c putRawLine(msg); } +void NetworkConnection::sendWho() { + foreach(QString chan, network()->channels()) { + putRawLine("WHO " + serverEncode(chan)); + } +} + +void NetworkConnection::setChannelJoined(const QString &channel) { + emit channelJoined(networkId(), channel, _channelKeys[channel.toLower()]); +} + +void NetworkConnection::setChannelParted(const QString &channel) { + removeChannelKey(channel); + emit channelParted(networkId(), channel); +} + +void NetworkConnection::addChannelKey(const QString &channel, const QString &key) { + if(key.isEmpty()) { + removeChannelKey(channel); + } else { + _channelKeys[channel.toLower()] = key; + } +} + +void NetworkConnection::removeChannelKey(const QString &channel) { + _channelKeys.remove(channel.toLower()); +} + +void NetworkConnection::nickChanged(const QString &newNick, const QString &oldNick) { + emit nickChanged(networkId(), newNick, oldNick); +} + /* Exception classes for message handling */ NetworkConnection::ParseError::ParseError(QString cmd, QString prefix, QStringList params) { Q_UNUSED(prefix); @@ -290,3 +413,4 @@ NetworkConnection::UnknownCmdError::UnknownCmdError(QString cmd, QString prefix, Q_UNUSED(prefix); _msg = QString("Unknown Command: ") + cmd + params.join(" "); } +