X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fnetworkconnection.h;h=83ea6f313a4c34d3453650522747122b88111b3f;hp=57fd9d25648fe1eb8e64c51266342df6715b487e;hb=90ee8b5c90923a3d4a48fc5493ca999e9d0d6a97;hpb=c0bbc724cda7acf652d9d2ce80605ebb53c4a2ff

diff --git a/src/core/networkconnection.h b/src/core/networkconnection.h
index 57fd9d25..83ea6f31 100644
--- a/src/core/networkconnection.h
+++ b/src/core/networkconnection.h
@@ -24,9 +24,15 @@
 #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"
@@ -77,17 +83,20 @@ public:
   //! 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, QString()); }
+  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 &params, 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);
 
@@ -114,18 +123,33 @@ signals:
 
   //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 &currentServer);
 
+#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;
@@ -136,12 +160,18 @@ private:
   UserInputHandler *_userInputHandler;
   CtcpHandler *_ctcpHandler;
 
-  QHash<QString, QString> _channelKeys;
+  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);