X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetwork.h;h=6b126d830a7fc521f3f9cc73e3bef31a0fdfcae8;hp=964216268a585a2242e59b02e41e46c7ba0650ca;hb=8a0b44b52a6a0a855a832fa7b46f3631a8684a3f;hpb=f6b9eeda207d42c99fc3e9085631722cf2ec83dc

diff --git a/src/common/network.h b/src/common/network.h
index 96421626..6b126d83 100644
--- a/src/common/network.h
+++ b/src/common/network.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2012 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -29,6 +29,7 @@
 #include <QVariantMap>
 #include <QPointer>
 #include <QMutex>
+#include <QByteArray>
 
 #include "types.h"
 #include "util.h"
@@ -46,7 +47,7 @@ struct NetworkInfo;
 class Network : public SyncableObject {
   SYNCABLE_OBJECT
   Q_OBJECT
-  Q_ENUMS(ConnectionState Network::ConnectionState)
+  Q_ENUMS(ConnectionState)
 
   Q_PROPERTY(QString networkName READ networkName WRITE setNetworkName STORED false)
   Q_PROPERTY(QString currentServer READ currentServer WRITE setCurrentServer STORED false)
@@ -64,6 +65,9 @@ class Network : public SyncableObject {
   Q_PROPERTY(bool useAutoIdentify READ useAutoIdentify WRITE setUseAutoIdentify STORED false)
   Q_PROPERTY(QString autoIdentifyService READ autoIdentifyService WRITE setAutoIdentifyService STORED false)
   Q_PROPERTY(QString autoIdentifyPassword READ autoIdentifyPassword WRITE setAutoIdentifyPassword STORED false)
+  Q_PROPERTY(bool useSasl READ useSasl WRITE setUseSasl STORED false)
+  Q_PROPERTY(QString saslAccount READ saslAccount WRITE setSaslAccount STORED false)
+  Q_PROPERTY(QString saslPassword READ saslPassword WRITE setSaslPassword STORED false)
   Q_PROPERTY(bool useAutoReconnect READ useAutoReconnect WRITE setUseAutoReconnect STORED false)
   Q_PROPERTY(quint32 autoReconnectInterval READ autoReconnectInterval WRITE setAutoReconnectInterval STORED false)
   Q_PROPERTY(quint16 autoReconnectRetries READ autoReconnectRetries WRITE setAutoReconnectRetries STORED false)
@@ -108,7 +112,7 @@ public:
     Server() : port(6667), useSsl(false), sslVersion(0), useProxy(false), proxyType(QNetworkProxy::Socks5Proxy), proxyHost("localhost"), proxyPort(8080) {}
     Server(const QString &host, uint port, const QString &password, bool useSsl)
       : host(host), port(port), password(password), useSsl(useSsl), sslVersion(0),
-	useProxy(false), proxyType(QNetworkProxy::Socks5Proxy), proxyHost("localhost"), proxyPort(8080) {}
+        useProxy(false), proxyType(QNetworkProxy::Socks5Proxy), proxyHost("localhost"), proxyPort(8080) {}
     bool operator==(const Server &other) const;
     bool operator!=(const Server &other) const;
   };
@@ -131,10 +135,10 @@ public:
   //Network::ConnectionState connectionState() const;
   inline int connectionState() const { return _connectionState; }
 
-  QString prefixToMode(const QString &prefix);
-  inline QString prefixToMode(const QCharRef &prefix) { return prefixToMode(QString(prefix)); }
-  QString modeToPrefix(const QString &mode);
-  inline QString modeToPrefix(const QCharRef &mode) { return modeToPrefix(QString(mode)); }
+  QString prefixToMode(const QString &prefix) const;
+  inline QString prefixToMode(const QCharRef &prefix) const { return prefixToMode(QString(prefix)); }
+  QString modeToPrefix(const QString &mode) const;
+  inline QString modeToPrefix(const QCharRef &mode) const { return modeToPrefix(QString(mode)); }
 
   ChannelModeType channelModeType(const QString &mode);
   inline ChannelModeType channelModeType(const QCharRef &mode) { return channelModeType(QString(mode)); }
@@ -153,6 +157,9 @@ public:
   inline bool useAutoIdentify() const { return _useAutoIdentify; }
   inline const QString &autoIdentifyService() const { return _autoIdentifyService; }
   inline const QString &autoIdentifyPassword() const { return _autoIdentifyPassword; }
+  inline bool useSasl() const { return _useSasl; }
+  inline const QString &saslAccount() const { return _saslAccount; }
+  inline const QString &saslPassword() const { return _saslPassword; }
   inline bool useAutoReconnect() const { return _useAutoReconnect; }
   inline quint32 autoReconnectInterval() const { return _autoReconnectInterval; }
   inline quint16 autoReconnectRetries() const { return _autoReconnectRetries; }
@@ -162,8 +169,9 @@ public:
   NetworkInfo networkInfo() const;
   void setNetworkInfo(const NetworkInfo &);
 
-  QString prefixes();
-  QString prefixModes();
+  QString prefixes() const;
+  QString prefixModes() const;
+  void determinePrefixes() const;
 
   bool supports(const QString &param) const { return _supports.contains(param); }
   QString support(const QString &param) const;
@@ -223,6 +231,9 @@ public slots:
   void setUseAutoIdentify(bool);
   void setAutoIdentifyService(const QString &);
   void setAutoIdentifyPassword(const QString &);
+  void setUseSasl(bool);
+  void setSaslAccount(const QString &);
+  void setSaslPassword(const QString &);
   virtual void setUseAutoReconnect(bool);
   virtual void setAutoReconnectInterval(quint32);
   virtual void setAutoReconnectRetries(quint16);
@@ -261,10 +272,10 @@ public slots:
 
   void emitConnectionError(const QString &);
 
-private slots:
-  void removeIrcUser(IrcUser *ircuser);
-  void removeIrcChannel(IrcChannel *ircChannel);
-  void removeChansAndUsers();
+protected slots:
+  virtual void removeIrcUser(IrcUser *ircuser);
+  virtual void removeIrcChannel(IrcChannel *ircChannel);
+  virtual void removeChansAndUsers();
 
 signals:
   void aboutToBeDestroyed();
@@ -278,7 +289,9 @@ signals:
 //   void latencySet(int latency);
   void identitySet(IdentityId);
 
-//   void serverListSet(QVariantList serverList);
+  void configChanged();
+
+  //   void serverListSet(QVariantList serverList);
 //   void useRandomServerSet(bool);
 //   void performSet(const QStringList &);
 //   void useAutoIdentifySet(bool);
@@ -308,6 +321,7 @@ signals:
 
 protected:
   inline virtual IrcChannel *ircChannelFactory(const QString &channelname) { return new IrcChannel(channelname, this); }
+  inline virtual IrcUser *ircUserFactory(const QString &hostmask) { return new IrcUser(hostmask, this); }
 
 private:
   QPointer<SignalProxy> _proxy;
@@ -322,8 +336,8 @@ private:
   bool _connected;
   ConnectionState _connectionState;
 
-  QString _prefixes;
-  QString _prefixModes;
+  mutable QString _prefixes;
+  mutable QString _prefixModes;
 
   QHash<QString, IrcUser *> _ircUsers;  // stores all known nicks for the server
   QHash<QString, IrcChannel *> _ircChannels; // stores all known channels
@@ -337,14 +351,16 @@ private:
   QString _autoIdentifyService;
   QString _autoIdentifyPassword;
 
+  bool _useSasl;
+  QString _saslAccount;
+  QString _saslPassword;
+
   bool _useAutoReconnect;
   quint32 _autoReconnectInterval;
   quint16 _autoReconnectRetries;
   bool _unlimitedReconnectRetries;
   bool _rejoinChannels;
 
-  void determinePrefixes();
-
   QTextCodec *_codecForServer;
   QTextCodec *_codecForEncoding;
   QTextCodec *_codecForDecoding;
@@ -384,6 +400,10 @@ struct NetworkInfo {
   QString autoIdentifyService;
   QString autoIdentifyPassword;
 
+  bool useSasl;
+  QString saslAccount;
+  QString saslPassword;
+
   bool useAutoReconnect;
   quint32 autoReconnectInterval;
   quint16 autoReconnectRetries;