projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tackeling 30 sec ping timeout issues
[quassel.git]
/
src
/
core
/
corenetwork.h
diff --git
a/src/core/corenetwork.h
b/src/core/corenetwork.h
index
f50717b
..
0a07af9
100644
(file)
--- a/
src/core/corenetwork.h
+++ b/
src/core/corenetwork.h
@@
-75,7
+75,7
@@
public:
inline QString channelKey(const QString &channel) const { return _channelKeys.value(channel.toLower(), QString()); }
inline QString channelKey(const QString &channel) const { return _channelKeys.value(channel.toLower(), QString()); }
- inline bool isAutoWhoInProgress(const QString &channel) const { return _autoWho
InProgress
.value(channel.toLower(), 0); }
+ inline bool isAutoWhoInProgress(const QString &channel) const { return _autoWho
Pending
.value(channel.toLower(), 0); }
inline UserId userId() const { return _coreSession->user(); }
inline UserId userId() const { return _coreSession->user(); }
@@
-106,8
+106,7
@@
public slots:
Server usedServer() const;
Server usedServer() const;
- inline void resetPong() { _gotPong = true; }
- inline bool gotPong() { return _gotPong; }
+ inline void resetPingTimeout() { _pingCount = 0; }
signals:
void recvRawServerMsg(QString);
signals:
void recvRawServerMsg(QString);
@@
-135,6
+134,8
@@
private slots:
void restoreUserModes();
void doAutoReconnect();
void sendPing();
void restoreUserModes();
void doAutoReconnect();
void sendPing();
+ void enablePingTimeout();
+ void disablePingTimeout();
void sendAutoWho();
void startAutoWhoCycle();
void sendAutoWho();
void startAutoWhoCycle();
@@
-176,11
+177,13
@@
private:
int _lastUsedServerIndex;
QTimer _pingTimer;
int _lastUsedServerIndex;
QTimer _pingTimer;
- bool _gotPong;
+ uint _lastPingTime;
+ uint _maxPingCount;
+ uint _pingCount;
bool _autoWhoEnabled;
QStringList _autoWhoQueue;
bool _autoWhoEnabled;
QStringList _autoWhoQueue;
- QHash<QString, int> _autoWho
InProgress
;
+ QHash<QString, int> _autoWho
Pending
;
int _autoWhoInterval;
int _autoWhoNickLimit;
int _autoWhoDelay;
int _autoWhoInterval;
int _autoWhoNickLimit;
int _autoWhoDelay;