/***************************************************************************
- * 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 "coresession.h"
-class Identity;
+class CoreIdentity;
class IrcServerHandler;
class UserInputHandler;
class CtcpHandler;
~CoreNetwork();
inline virtual const QMetaObject *syncMetaObject() const { return &Network::staticMetaObject; }
- inline Identity *identityPtr() const { return coreSession()->identity(identity()); }
+ inline CoreIdentity *identityPtr() const { return coreSession()->identity(identity()); }
inline CoreSession *coreSession() const { return _coreSession; }
inline IrcServerHandler *ircServerHandler() const { return _ircServerHandler; }
QByteArray userEncode(const QString &userNick, const QString &string) const;
inline QString channelKey(const QString &channel) const { return _channelKeys.value(channel.toLower(), QString()); }
- inline QStringList persistentChannels() const { return _channelKeys.keys(); }
- inline bool isAutoWhoInProgress(const QString &channel) const { return _autoWhoInProgress.value(channel.toLower(), 0); }
+ inline bool isAutoWhoInProgress(const QString &channel) const { return _autoWhoPending.value(channel.toLower(), 0); }
inline UserId userId() const { return _coreSession->user(); }
virtual void setAutoReconnectRetries(quint16);
void connectToIrc(bool reconnecting = false);
- void disconnectFromIrc(bool requested = true, const QString &reason = QString());
+ void disconnectFromIrc(bool requested = true, const QString &reason = QString(), bool withReconnect = false);
void userInput(BufferInfo bufferInfo, QString msg);
void putRawLine(QByteArray input);
Server usedServer() const;
+ inline void resetPingTimeout() { _pingCount = 0; }
+
signals:
void recvRawServerMsg(QString);
void displayStatusMsg(QString);
void networkInitialized();
void sendPerform();
+ void restoreUserModes();
void doAutoReconnect();
void sendPing();
+ void enablePingTimeout();
+ void disablePingTimeout();
void sendAutoWho();
void startAutoWhoCycle();
* it is needed to determine whether or not the connection needs to be
* in the automatic session restore. */
bool _quitRequested;
+ QString _quitReason;
bool _previousConnectionAttemptFailed;
int _lastUsedServerIndex;
QTimer _pingTimer;
+ uint _lastPingTime;
+ uint _maxPingCount;
+ uint _pingCount;
bool _autoWhoEnabled;
QStringList _autoWhoQueue;
- QHash<QString, int> _autoWhoInProgress;
+ QHash<QString, int> _autoWhoPending;
int _autoWhoInterval;
int _autoWhoNickLimit;
int _autoWhoDelay;
QTimer _autoWhoTimer, _autoWhoCycleTimer;
QTimer _tokenBucketTimer;
- int _messagesPerSecond; // token refill speed
+ int _messageDelay; // token refill speed in ms
int _burstSize; // size of the token bucket
int _tokenBucket; // the virtual bucket that holds the tokens
QList<QByteArray> _msgQueue;