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 42ad12d..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 _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(); }
 
 
   inline UserId userId() const { return _coreSession->user(); }
 


@@ -106,7 +106,7 @@ public slots:
 
   Server usedServer() const;
 
 
   Server usedServer() const;
 

-  inline void resetPingTimeout() { _lastPingTime = 0; }
+  inline void resetPingTimeout() { _pingCount = 0; }

 
 signals:
   void recvRawServerMsg(QString);
 
 signals:
   void recvRawServerMsg(QString);


@@ -178,10 +178,12 @@ private:
 
   QTimer _pingTimer;
   uint _lastPingTime;
 
   QTimer _pingTimer;
   uint _lastPingTime;

+  uint _maxPingCount;
+  uint _pingCount;

 
   bool _autoWhoEnabled;
   QStringList _autoWhoQueue;
 
   bool _autoWhoEnabled;
   QStringList _autoWhoQueue;

-  QHash<QString, int> _autoWhoInProgress;
+  QHash<QString, int> _autoWhoPending;

   int _autoWhoInterval;
   int _autoWhoNickLimit;
   int _autoWhoDelay;
   int _autoWhoInterval;
   int _autoWhoNickLimit;
   int _autoWhoDelay;