projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Properly reject invalid handshake data
[quassel.git]
/
src
/
core
/
corenetwork.h
diff --git
a/src/core/corenetwork.h
b/src/core/corenetwork.h
index
d7ebd44
..
a6d3678
100644
(file)
--- a/
src/core/corenetwork.h
+++ b/
src/core/corenetwork.h
@@
-37,10
+37,12
@@
class CoreIdentity;
class IrcServerHandler;
class CoreIdentity;
class IrcServerHandler;
-class UserInputHandler;
+class
Core
UserInputHandler;
class CtcpHandler;
class CtcpHandler;
+class CoreIgnoreListManager;
class CoreNetwork : public Network {
class CoreNetwork : public Network {
+ SYNCABLE_OBJECT
Q_OBJECT
public:
Q_OBJECT
public:
@@
-50,10
+52,12
@@
public:
inline CoreIdentity *identityPtr() const { return coreSession()->identity(identity()); }
inline CoreSession *coreSession() const { return _coreSession; }
inline CoreIdentity *identityPtr() const { return coreSession()->identity(identity()); }
inline CoreSession *coreSession() const { return _coreSession; }
+ inline CoreNetworkConfig *networkConfig() const { return coreSession()->networkConfig(); }
inline IrcServerHandler *ircServerHandler() const { return _ircServerHandler; }
inline IrcServerHandler *ircServerHandler() const { return _ircServerHandler; }
- inline UserInputHandler *userInputHandler() const { return _userInputHandler; }
+ inline
Core
UserInputHandler *userInputHandler() const { return _userInputHandler; }
inline CtcpHandler *ctcpHandler() const { return _ctcpHandler; }
inline CtcpHandler *ctcpHandler() const { return _ctcpHandler; }
+ inline CoreIgnoreListManager *ignoreListManager() { return coreSession()->ignoreListManager(); }
//! Decode a string using the server (network) decoding.
inline QString serverDecode(const QByteArray &string) const { return decodeServerString(string); }
//! Decode a string using the server (network) decoding.
inline QString serverDecode(const QByteArray &string) const { return decodeServerString(string); }
@@
-90,6
+94,8
@@
public slots:
virtual void setAutoReconnectInterval(quint32);
virtual void setAutoReconnectRetries(quint16);
virtual void setAutoReconnectInterval(quint32);
virtual void setAutoReconnectRetries(quint16);
+ void setPingInterval(int interval);
+
void connectToIrc(bool reconnecting = false);
void disconnectFromIrc(bool requested = true, const QString &reason = QString(), bool withReconnect = false);
void connectToIrc(bool reconnecting = false);
void disconnectFromIrc(bool requested = true, const QString &reason = QString(), bool withReconnect = false);
@@
-102,8
+108,16
@@
public slots:
void addChannelKey(const QString &channel, const QString &key);
void removeChannelKey(const QString &channel);
void addChannelKey(const QString &channel, const QString &key);
void removeChannelKey(const QString &channel);
+ void setAutoWhoEnabled(bool enabled);
+ void setAutoWhoInterval(int interval);
+ void setAutoWhoDelay(int delay);
+
bool setAutoWhoDone(const QString &channel);
bool setAutoWhoDone(const QString &channel);
+ void updateIssuedModes(const QString &requestedModes);
+ void updatePersistentModes(QString addModes, QString removeModes);
+ void resetPersistentModes();
+
Server usedServer() const;
inline void resetPingTimeout() { _pingCount = 0; }
Server usedServer() const;
inline void resetPingTimeout() { _pingCount = 0; }
@@
-138,7
+152,7
@@
private slots:
void restoreUserModes();
void doAutoReconnect();
void sendPing();
void restoreUserModes();
void doAutoReconnect();
void sendPing();
- void enablePingTimeout();
+ void enablePingTimeout(
bool enable = true
);
void disablePingTimeout();
void sendAutoWho();
void startAutoWhoCycle();
void disablePingTimeout();
void sendAutoWho();
void startAutoWhoCycle();
@@
-161,7
+175,7
@@
private:
#endif
IrcServerHandler *_ircServerHandler;
#endif
IrcServerHandler *_ircServerHandler;
- UserInputHandler *_userInputHandler;
+
Core
UserInputHandler *_userInputHandler;
CtcpHandler *_ctcpHandler;
QHash<QString, QString> _channelKeys; // stores persistent channels and their passwords, if any
CtcpHandler *_ctcpHandler;
QHash<QString, QString> _channelKeys; // stores persistent channels and their passwords, if any
@@
-182,15
+196,10
@@
private:
QTimer _pingTimer;
uint _lastPingTime;
QTimer _pingTimer;
uint _lastPingTime;
- uint _maxPingCount;
uint _pingCount;
uint _pingCount;
- bool _autoWhoEnabled;
QStringList _autoWhoQueue;
QHash<QString, int> _autoWhoPending;
QStringList _autoWhoQueue;
QHash<QString, int> _autoWhoPending;
- int _autoWhoInterval;
- int _autoWhoNickLimit;
- int _autoWhoDelay;
QTimer _autoWhoTimer, _autoWhoCycleTimer;
QTimer _tokenBucketTimer;
QTimer _autoWhoTimer, _autoWhoCycleTimer;
QTimer _tokenBucketTimer;
@@
-198,6
+207,8
@@
private:
int _burstSize; // size of the token bucket
int _tokenBucket; // the virtual bucket that holds the tokens
QList<QByteArray> _msgQueue;
int _burstSize; // size of the token bucket
int _tokenBucket; // the virtual bucket that holds the tokens
QList<QByteArray> _msgQueue;
+
+ QString _requestedUserModes; // 2 strings separated by a '-' character. first part are requested modes to add, the second to remove
};
#endif //CORENETWORK_H
};
#endif //CORENETWORK_H