#include <QAbstractSocket>
#include <QString>
#include <QStringList>
-#include <QTcpSocket>
#include <QTimer>
+#ifndef QT_NO_OPENSSL
+# include <QSslSocket>
+# include <QSslError>
+#else
+# include <QTcpSocket>
+#endif
+
#include "identity.h"
#include "message.h"
#include "network.h"
Q_OBJECT
public:
- NetworkConnection(Network *network, CoreSession *session, const QVariant &previousState = QVariant());
+ NetworkConnection(Network *network, CoreSession *session);
~NetworkConnection();
NetworkId networkId() const;
UserInputHandler *userInputHandler() const;
CtcpHandler *ctcpHandler() const;
- //! Return data necessary to restore the connection state upon core restart
- QVariant state() const;
-
//! Decode a string using the server (network) decoding.
QString serverDecode(const QByteArray &string) const;
//! Encode a string using the user-specific encoding, if set, and use the standard encoding else.
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(); }
+
public slots:
// void setServerOptions();
void connectToIrc(bool reconnecting = false);
- void disconnectFromIrc();
+ void disconnectFromIrc(bool requested = true);
void userInput(BufferInfo bufferInfo, QString msg);
void putRawLine(QByteArray input);
void putCmd(const QString &cmd, const QVariantList ¶ms, const QByteArray &prefix = QByteArray());
+ void setChannelJoined(const QString &channel);
+ void setChannelParted(const QString &channel);
+ void addChannelKey(const QString &channel, const QString &key);
+ void removeChannelKey(const QString &channel);
private slots:
void sendPerform();
void autoReconnectSettingsChanged();
void doAutoReconnect();
+ void sendWho();
+ void nickChanged(const QString &newNick, const QString &oldNick); // this signal is inteded to rename query buffers in the storage backend
signals:
// #void networkState(QString net, QVariantMap data);
void quitRequested(NetworkId networkId);
//void queryRequested(QString network, QString nick);
+ void nickChanged(const NetworkId &networkId, const QString &newNick, const QString &oldNick); // this signal is inteded to rename query buffers in the storage backend
+ void channelJoined(NetworkId, const QString &channel, const QString &key = QString());
+ void channelParted(NetworkId, const QString &channel);
+ void sslErrors(const QVariant &errorData);
private slots:
void socketHasData();
void socketError(QAbstractSocket::SocketError);
void socketConnected();
+ void socketInitialized();
void socketDisconnected();
void socketStateChanged(QAbstractSocket::SocketState);
void setConnectionState(Network::ConnectionState);
void networkInitialized(const QString ¤tServer);
+#ifndef QT_NO_OPENSSL
+ void socketEncrypted();
+ void sslErrors(const QList<QSslError> &errors);
+#endif
+
private:
+#ifndef QT_NO_OPENSSL
+ QSslSocket socket;
+#else
QTcpSocket socket;
+#endif
+
Network::ConnectionState _connectionState;
Network *_network;
CoreSession *_coreSession;
+ BufferInfo _statusBufferInfo;
IrcServerHandler *_ircServerHandler;
UserInputHandler *_userInputHandler;
CtcpHandler *_ctcpHandler;
- QVariant _previousState;
+ QHash<QString, QString> _channelKeys; // stores persistent channels and their passwords, if any
QTimer _autoReconnectTimer;
int _autoReconnectCount;
+ QTimer _whoTimer;
+
+ bool _previousConnectionAttemptFailed;
+ int _lastUsedServerlistIndex;
+
+ QByteArray lastMsgReceived; // FIXME debug
+
class ParseError : public Exception {
public:
ParseError(QString cmd, QString prefix, QStringList params);