X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fnetworkconnection.cpp;h=617433f35871f03116a3448e460f83030fb499de;hb=477c565e5abd47b8655fc2f44dbcbd812c9c698f;hp=3d9fcc73c18dff8defef76c5130b7999c3195384;hpb=72d23cc04e32bfc166720f9b7ecaf4f53e63ec5e;p=quassel.git diff --git a/src/core/networkconnection.cpp b/src/core/networkconnection.cpp index 3d9fcc73..617433f3 100644 --- a/src/core/networkconnection.cpp +++ b/src/core/networkconnection.cpp @@ -29,7 +29,6 @@ #include "ircchannel.h" #include "ircuser.h" -#include "network.h" #include "identity.h" #include "ircserverhandler.h" @@ -59,17 +58,15 @@ NetworkConnection::NetworkConnection(Network *network, CoreSession *session) // TokenBucket to avaid sending too much at once _messagesPerSecond(1), _burstSize(5), - _tokenBucket(5), // init with a full bucket - - // TODO: - // should be 510 (2 bytes are added when writing to the socket) - // maxMsgSize is 510 minus the hostmask which will be added by the server - _maxMsgSize(450) + _tokenBucket(5) // init with a full bucket { _autoReconnectTimer.setSingleShot(true); _socketCloseTimer.setSingleShot(true); connect(&_socketCloseTimer, SIGNAL(timeout()), this, SLOT(socketCloseTimeout())); - + + _pingTimer.setInterval(60000); + connect(&_pingTimer, SIGNAL(timeout()), this, SLOT(sendPing())); + _autoWhoTimer.setInterval(_autoWhoDelay * 1000); _autoWhoCycleTimer.setInterval(_autoWhoInterval * 1000); @@ -220,6 +217,8 @@ void NetworkConnection::networkInitialized(const QString ¤tServer) { network()->setConnected(true); emit connected(networkId()); + _pingTimer.start(); + if(_autoWhoEnabled) { _autoWhoCycleTimer.start(); _autoWhoTimer.start(); @@ -253,20 +252,19 @@ void NetworkConnection::sendPerform() { } void NetworkConnection::disconnectFromIrc(bool requested) { + _quitRequested = requested; // see socketDisconnected(); _autoReconnectTimer.stop(); - _autoReconnectCount = 0; + _autoReconnectCount = 0; // prohibiting auto reconnect displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Disconnecting.")); - if(socket.state() < QAbstractSocket::ConnectedState) { - setConnectionState(Network::Disconnected); + if(socket.state() == QAbstractSocket::UnconnectedState) { + socketDisconnected(); + } else if(socket.state() < QAbstractSocket::ConnectedState) { + socket.close(); + // we might be in a state waiting for a timeout... we don't care... set a disconnected state socketDisconnected(); } else { _socketCloseTimer.start(10000); // the irc server has 10 seconds to close the socket } - - // this flag triggers quitRequested() once the socket is closed - // it is needed to determine whether or not the connection needs to be - // in the automatic session restore. - _quitRequested = requested; } void NetworkConnection::socketHasData() { @@ -283,7 +281,6 @@ void NetworkConnection::socketError(QAbstractSocket::SocketError) { 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 @@ -375,6 +372,7 @@ void NetworkConnection::socketCloseTimeout() { } void NetworkConnection::socketDisconnected() { + _pingTimer.stop(); _autoWhoCycleTimer.stop(); _autoWhoTimer.stop(); _autoWhoQueue.clear(); @@ -384,12 +382,15 @@ void NetworkConnection::socketDisconnected() { network()->setConnected(false); emit disconnected(networkId()); - if(_autoReconnectCount != 0) { - setConnectionState(Network::Reconnecting); - if(_autoReconnectCount == network()->autoReconnectRetries()) doAutoReconnect(); // first try is immediate - else _autoReconnectTimer.start(); - } else if(_quitRequested) { + if(_quitRequested) { + setConnectionState(Network::Disconnected); emit quitRequested(networkId()); + } else if(_autoReconnectCount != 0) { + setConnectionState(Network::Reconnecting); + if(_autoReconnectCount == network()->autoReconnectRetries()) + doAutoReconnect(); // first try is immediate + else + _autoReconnectTimer.start(); } } @@ -433,38 +434,84 @@ void NetworkConnection::fillBucketAndProcessQueue() { } } -void NetworkConnection::putCmd(const QString &cmd, const QVariantList ¶ms, const QByteArray &prefix) { - QByteArray msg; - if(!prefix.isEmpty()) - msg += ":" + prefix + " "; - msg += cmd.toUpper().toAscii(); +// returns 0 if the message will not be chopped by the irc server or number of chopped bytes if message is too long +int NetworkConnection::lastParamOverrun(const QString &cmd, const QList ¶ms) { + //the server will pass our message that trunkated to 512 bytes including CRLF with the following format: + // ":prefix COMMAND param0 param1 :lastparam" + // where prefix = "nickname!user@host" + // that means that the last message can be as long as: + // 512 - nicklen - userlen - hostlen - commandlen - sum(param[0]..param[n-1])) - 2 (for CRLF) - 4 (":!@" + 1space between prefix and command) - max(paramcount - 1, 0) (space for simple params) - 2 (space and colon for last param) + IrcUser *me = network()->me(); + int maxLen = 480 - cmd.toAscii().count(); // educated guess in case we don't know us (yet?) - for(int i = 0; i < params.size() - 1; i++) { - msg += " " + params[i].toByteArray(); + if(me) + maxLen = 512 - serverEncode(me->nick()).count() - serverEncode(me->user()).count() - serverEncode(me->host()).count() - cmd.toAscii().count() - 6; + + if(!params.isEmpty()) { + for(int i = 0; i < params.count() - 1; i++) { + maxLen -= (params[i].count() + 1); + } + maxLen -= 2; // " :" last param separator; + + if(params.last().count() > maxLen) { + return params.last().count() - maxLen; + } else { + return 0; + } + } else { + return 0; } - if(!params.isEmpty()) - msg += " :" + params.last().toByteArray(); +} +void NetworkConnection::putCmd(const QString &cmd, const QList ¶ms, const QByteArray &prefix) { + QByteArray msg; if(cmd == "PRIVMSG" && params.count() > 1) { - QByteArray msghead = "PRIVMSG " + params[0].toByteArray() + " :"; + int overrun = lastParamOverrun(cmd, params); + if(overrun) { + QList paramCopy1; + QList paramCopy2; + for(int i = 0; i < params.count() - 1; i++) { + paramCopy1 << params[i]; + paramCopy2 << params[i]; + } - while (msg.size() > _maxMsgSize) { + QByteArray lastPart = params.last(); QByteArray splitter(" .,-"); - int splitPosition = 0; + int maxSplitPos = params.last().count() - overrun; + int splitPos = -1; for(int i = 0; i < splitter.size(); i++) { - splitPosition = qMax(splitPosition, msg.lastIndexOf(splitter[i], _maxMsgSize)); + splitPos = qMax(splitPos, lastPart.lastIndexOf(splitter[i], maxSplitPos)); } - if(splitPosition < 300) { - splitPosition = _maxMsgSize; + + if(splitPos == -1) { + splitPos = maxSplitPos; } - putRawLine(msg.left(splitPosition)); - msg = msghead + msg.mid(splitPosition); + + paramCopy1 << lastPart.left(splitPos); + paramCopy2 << lastPart.mid(splitPos); + putCmd(cmd, paramCopy1, prefix); + putCmd(cmd, paramCopy2, prefix); + return; } } + + if(!prefix.isEmpty()) + msg += ":" + prefix + " "; + msg += cmd.toUpper().toAscii(); + + for(int i = 0; i < params.size() - 1; i++) { + msg += " " + params[i]; + } + if(!params.isEmpty()) + msg += " :" + params.last(); putRawLine(msg); } +void NetworkConnection::sendPing() { + userInputHandler()->handlePing(BufferInfo(), QString()); +} + void NetworkConnection::sendAutoWho() { while(!_autoWhoQueue.isEmpty()) { QString chan = _autoWhoQueue.takeFirst();