_autoReconnectCount(0)
{
_autoReconnectTimer.setSingleShot(true);
- _previousConnectionAttemptFailed = false;
- _lastUsedServerlistIndex = 0;
- // TODO make configurable
- _whoTimer.setInterval(90 * 1000);
- _whoTimer.setSingleShot(false);
+
+ _previousConnectionAttemptFailed = false;
+ _lastUsedServerlistIndex = 0;
+
+ // TODO make autowho configurable (possibly per-network)
+ _autoWhoEnabled = true;
+ _autoWhoInterval = 90;
+ _autoWhoNickLimit = 0; // unlimited
+ _autoWhoDelay = 3;
+
+ _autoWhoTimer.setInterval(_autoWhoDelay * 1000);
+ _autoWhoTimer.setSingleShot(false);
+ _autoWhoCycleTimer.setInterval(_autoWhoInterval * 1000);
+ _autoWhoCycleTimer.setSingleShot(false);
+
+ // 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;
+
+ _tokenBucketTimer.start(_messagesPerSecond * 1000);
+ _tokenBucketTimer.setSingleShot(false);
QHash<QString, QString> channels = coreSession()->persistentChannels(networkId());
foreach(QString chan, channels.keys()) {
}
connect(&_autoReconnectTimer, SIGNAL(timeout()), this, SLOT(doAutoReconnect()));
- connect(&_whoTimer, SIGNAL(timeout()), this, SLOT(sendWho()));
+ connect(&_autoWhoTimer, SIGNAL(timeout()), this, SLOT(sendAutoWho()));
+ connect(&_autoWhoCycleTimer, SIGNAL(timeout()), this, SLOT(startAutoWhoCycle()));
+ connect(&_tokenBucketTimer, SIGNAL(timeout()), this, SLOT(fillBucketAndProcessQueue()));
connect(network, SIGNAL(currentServerSet(const QString &)), this, SLOT(networkInitialized(const QString &)));
connect(network, SIGNAL(useAutoReconnectSet(bool)), this, SLOT(autoReconnectSettingsChanged()));
delete _ctcpHandler;
}
-bool NetworkConnection::isConnected() const {
- // return socket.state() == QAbstractSocket::ConnectedState;
- return connectionState() == Network::Initialized;
-}
-
-Network::ConnectionState NetworkConnection::connectionState() const {
- return _connectionState;
-}
-
void NetworkConnection::setConnectionState(Network::ConnectionState state) {
_connectionState = state;
network()->setConnectionState(state);
emit connectionStateChanged(state);
}
-NetworkId NetworkConnection::networkId() const {
- return network()->networkId();
-}
-
-QString NetworkConnection::networkName() const {
- return network()->networkName();
-}
-
-Identity *NetworkConnection::identity() const {
- return coreSession()->identity(network()->identity());
-}
-
-Network *NetworkConnection::network() const {
- return _network;
-}
-
-CoreSession *NetworkConnection::coreSession() const {
- return _coreSession;
-}
-
-IrcServerHandler *NetworkConnection::ircServerHandler() const {
- return _ircServerHandler;
-}
-
-UserInputHandler *NetworkConnection::userInputHandler() const {
- return _userInputHandler;
-}
-
-CtcpHandler *NetworkConnection::ctcpHandler() const {
- return _ctcpHandler;
-}
-
QString NetworkConnection::serverDecode(const QByteArray &string) const {
return network()->decodeServerString(string);
}
setConnectionState(Network::Initialized);
network()->setConnected(true);
emit connected(networkId());
- if(!Global::SPUTDEV) {
- sendWho();
- _whoTimer.start();
+
+ if(_autoWhoEnabled) {
+ _autoWhoCycleTimer.start();
+ _autoWhoTimer.start();
+ startAutoWhoCycle(); // FIXME wait for autojoin to be completed
}
}
#ifndef QT_NO_OPENSSL
-void NetworkConnection::sslErrors(const QList<QSslError> &errors) {
+void NetworkConnection::sslErrors(const QList<QSslError> &sslErrors) {
+ Q_UNUSED(sslErrors)
socket.ignoreSslErrors();
/* TODO errorhandling
QVariantMap errmsg;
}
void NetworkConnection::socketDisconnected() {
- _whoTimer.stop();
+ _autoWhoCycleTimer.stop();
+ _autoWhoTimer.stop();
+ _autoWhoQueue.clear();
+ _autoWhoInProgress.clear();
+
network()->setConnected(false);
emit disconnected(networkId());
if(_autoReconnectCount != 0) {
}
void NetworkConnection::putRawLine(QByteArray s) {
+ if(_tokenBucket > 0) {
+ // qDebug() << "putRawLine: " << s;
+ writeToSocket(s);
+ } else {
+ _msgQueue.append(s);
+ }
+}
+
+void NetworkConnection::writeToSocket(QByteArray s) {
s += "\r\n";
+ // qDebug() << "writeToSocket: " << s.size();
socket.write(s);
- if(Global::SPUTDEV) qDebug() << "SENT:" << s;
+ _tokenBucket--;
+}
+
+void NetworkConnection::fillBucketAndProcessQueue() {
+ if(_tokenBucket < _burstSize) {
+ _tokenBucket++;
+ }
+
+ while(_msgQueue.size() > 0 && _tokenBucket > 0) {
+ writeToSocket(_msgQueue.takeFirst());
+ }
}
void NetworkConnection::putCmd(const QString &cmd, const QVariantList ¶ms, const QByteArray &prefix) {
if(!params.isEmpty())
msg += " :" + params.last().toByteArray();
+ if(cmd == "PRIVMSG" && params.count() > 1) {
+ QByteArray msghead = "PRIVMSG " + params[0].toByteArray() + " :";
+
+ while (msg.size() > _maxMsgSize) {
+ QByteArray splitter(" .,-");
+ int splitPosition = 0;
+ for(int i = 0; i < splitter.size(); i++) {
+ splitPosition = qMax(splitPosition, msg.lastIndexOf(splitter[i], _maxMsgSize));
+ }
+ if(splitPosition < 300) {
+ splitPosition = _maxMsgSize;
+ }
+ putRawLine(msg.left(splitPosition));
+ msg = msghead + msg.mid(splitPosition);
+ }
+ }
+
putRawLine(msg);
}
-void NetworkConnection::sendWho() {
- foreach(QString chan, network()->channels()) {
+void NetworkConnection::sendAutoWho() {
+ while(!_autoWhoQueue.isEmpty()) {
+ QString chan = _autoWhoQueue.takeFirst();
+ IrcChannel *ircchan = network()->ircChannel(chan);
+ if(!ircchan) continue;
+ if(_autoWhoNickLimit > 0 && ircchan->ircUsers().count() > _autoWhoNickLimit) continue;
+ _autoWhoInProgress[chan]++;
putRawLine("WHO " + serverEncode(chan));
+ if(_autoWhoQueue.isEmpty() && _autoWhoEnabled && !_autoWhoCycleTimer.isActive()) {
+ // Timer was stopped, means a new cycle is due immediately
+ _autoWhoCycleTimer.start();
+ startAutoWhoCycle();
+ }
+ break;
+ }
+}
+
+void NetworkConnection::startAutoWhoCycle() {
+ if(!_autoWhoQueue.isEmpty()) {
+ _autoWhoCycleTimer.stop();
+ return;
}
+ _autoWhoQueue = network()->channels();
+}
+
+bool NetworkConnection::setAutoWhoDone(const QString &channel) {
+ if(_autoWhoInProgress.value(channel.toLower(), 0) <= 0) return false;
+ _autoWhoInProgress[channel.toLower()]--;
+ return true;
}
void NetworkConnection::setChannelJoined(const QString &channel) {
emit channelJoined(networkId(), channel, _channelKeys[channel.toLower()]);
+ _autoWhoQueue.prepend(channel.toLower()); // prepend so this new chan is the first to be checked
}
void NetworkConnection::setChannelParted(const QString &channel) {
removeChannelKey(channel);
+ _autoWhoQueue.removeAll(channel.toLower());
+ _autoWhoInProgress.remove(channel.toLower());
emit channelParted(networkId(), channel);
}
projects / quassel.git / blobdiff