projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SignanlProxy does no longer try to write to closed devices. Also closed devices can...
[quassel.git]
/
src
/
core
/
networkconnection.h
diff --git
a/src/core/networkconnection.h
b/src/core/networkconnection.h
index
cebf837
..
d947455
100644
(file)
--- a/
src/core/networkconnection.h
+++ b/
src/core/networkconnection.h
@@
-26,7
+26,7
@@
#include <QStringList>
#include <QTimer>
#include <QStringList>
#include <QTimer>
-#if
ndef QT_NO_OPEN
SSL
+#if
def HAVE_
SSL
# include <QSslSocket>
# include <QSslError>
#else
# include <QSslSocket>
# include <QSslError>
#else
@@
-39,8
+39,6
@@
#include "network.h"
#include "signalproxy.h"
#include "network.h"
#include "signalproxy.h"
-class Network;
-
class IrcServerHandler;
class UserInputHandler;
class CtcpHandler;
class IrcServerHandler;
class UserInputHandler;
class CtcpHandler;
@@
-91,7
+89,7
@@
public:
public slots:
// void setServerOptions();
void connectToIrc(bool reconnecting = false);
public slots:
// void setServerOptions();
void connectToIrc(bool reconnecting = false);
- void disconnectFromIrc(bool requested = true);
+ void disconnectFromIrc(bool requested = true
, const QString &reason = QString()
);
void userInput(BufferInfo bufferInfo, QString msg);
void putRawLine(QByteArray input);
void userInput(BufferInfo bufferInfo, QString msg);
void putRawLine(QByteArray input);
@@
-140,11
+138,12
@@
private slots:
void sendPerform();
void autoReconnectSettingsChanged();
void doAutoReconnect();
void sendPerform();
void autoReconnectSettingsChanged();
void doAutoReconnect();
+ void sendPing();
void sendAutoWho();
void startAutoWhoCycle();
void nickChanged(const QString &newNick, const QString &oldNick); // this signal is inteded to rename query buffers in the storage backend
void sendAutoWho();
void startAutoWhoCycle();
void nickChanged(const QString &newNick, const QString &oldNick); // this signal is inteded to rename query buffers in the storage backend
-#if
ndef QT_NO_OPEN
SSL
+#if
def HAVE_
SSL
void socketEncrypted();
void sslErrors(const QList<QSslError> &errors);
#endif
void socketEncrypted();
void sslErrors(const QList<QSslError> &errors);
#endif
@@
-152,7
+151,7
@@
private slots:
void fillBucketAndProcessQueue();
private:
void fillBucketAndProcessQueue();
private:
-#if
ndef QT_NO_OPEN
SSL
+#if
def HAVE_
SSL
QSslSocket socket;
#else
QTcpSocket socket;
QSslSocket socket;
#else
QTcpSocket socket;
@@
-176,11
+175,16
@@
private:
QTimer _socketCloseTimer;
QTimer _socketCloseTimer;
+ /* this flag triggers quitRequested() once the socket is closed
+ * it is needed to determine whether or not the connection needs to be
+ *in the automatic session restore. */
bool _quitRequested;
bool _previousConnectionAttemptFailed;
int _lastUsedServerlistIndex;
bool _quitRequested;
bool _previousConnectionAttemptFailed;
int _lastUsedServerlistIndex;
+ QTimer _pingTimer;
+
bool _autoWhoEnabled;
QStringList _autoWhoQueue;
QHash<QString, int> _autoWhoInProgress;
bool _autoWhoEnabled;
QStringList _autoWhoQueue;
QHash<QString, int> _autoWhoInProgress;
@@
-195,12
+199,8
@@
private:
int _tokenBucket; // the virtual bucket that holds the tokens
QList<QByteArray> _msgQueue;
int _tokenBucket; // the virtual bucket that holds the tokens
QList<QByteArray> _msgQueue;
- int _maxMsgSize;
-
void writeToSocket(QByteArray s);
void writeToSocket(QByteArray s);
-
-
class ParseError : public Exception {
public:
ParseError(QString cmd, QString prefix, QStringList params);
class ParseError : public Exception {
public:
ParseError(QString cmd, QString prefix, QStringList params);