X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcorenetwork.h;h=a579e3bbac2549b9214515be4b11277167019913;hp=d32734f4f57601f3eea36034f37e3a22926b75db;hb=14281719026a2d9d30667f63f3659c2c4e7e0cca;hpb=ac374ec32612798c230d54665f6bce7faf416602

diff --git a/src/core/corenetwork.h b/src/core/corenetwork.h
index d32734f4..a579e3bb 100644
--- a/src/core/corenetwork.h
+++ b/src/core/corenetwork.h
@@ -23,6 +23,7 @@
 
 #include "network.h"
 #include "coreircchannel.h"
+#include "coreircuser.h"
 
 #include <QTimer>
 
@@ -33,6 +34,10 @@
 # include <QTcpSocket>
 #endif
 
+#ifdef HAVE_QCA2
+#  include "cipher.h"
+#endif
+
 #include "coresession.h"
 
 class CoreIdentity;
@@ -108,12 +113,23 @@ public slots:
   void addChannelKey(const QString &channel, const QString &key);
   void removeChannelKey(const QString &channel);
 
+  // Blowfish stuff
+#ifdef HAVE_QCA2
+  Cipher *cipher(const QString &recipient) const;
+  QByteArray cipherKey(const QString &recipient) const;
+  void setCipherKey(const QString &recipient, const QByteArray &key);
+#endif
+
   void setAutoWhoEnabled(bool enabled);
   void setAutoWhoInterval(int interval);
   void setAutoWhoDelay(int delay);
 
   bool setAutoWhoDone(const QString &channel);
 
+  void updateIssuedModes(const QString &requestedModes);
+  void updatePersistentModes(QString addModes, QString removeModes);
+  void resetPersistentModes();
+
   Server usedServer() const;
 
   inline void resetPingTimeout() { _pingCount = 0; }
@@ -134,6 +150,13 @@ signals:
 
 protected:
   inline virtual IrcChannel *ircChannelFactory(const QString &channelname) { return new CoreIrcChannel(channelname, this); }
+  inline virtual IrcUser *ircUserFactory(const QString &hostmask) { return new CoreIrcUser(hostmask, this); }
+
+protected slots:
+  // TODO: remove cached cipher keys, when appropriate
+  //virtual void removeIrcUser(IrcUser *ircuser);
+  //virtual void removeIrcChannel(IrcChannel *ircChannel);
+  //virtual void removeChansAndUsers();
 
 private slots:
   void socketHasData();
@@ -203,6 +226,11 @@ private:
   int _burstSize;           // size of the token bucket
   int _tokenBucket;         // the virtual bucket that holds the tokens
   QList<QByteArray> _msgQueue;
+
+  QString _requestedUserModes; // 2 strings separated by a '-' character. first part are requested modes to add, the second to remove
+
+  // Blowfish key map
+  QHash<QString, QByteArray> _cipherKeys;
 };
 
 #endif //CORENETWORK_H