/***************************************************************************
- * 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 *
#include <QVariantMap>
#include <QPointer>
#include <QMutex>
+#include <QByteArray>
#include "types.h"
#include "util.h"
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)
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)
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;
};
//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)); }
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; }
NetworkInfo networkInfo() const;
void setNetworkInfo(const NetworkInfo &);
- QString prefixes();
- QString prefixModes();
+ QString prefixes() const;
+ QString prefixModes() const;
+ void determinePrefixes() const;
bool supports(const QString ¶m) const { return _supports.contains(param); }
QString support(const QString ¶m) const;
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);
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();
// 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);
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;
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
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;
QString autoIdentifyService;
QString autoIdentifyPassword;
+ bool useSasl;
+ QString saslAccount;
+ QString saslPassword;
+
bool useAutoReconnect;
quint32 autoReconnectInterval;
quint16 autoReconnectRetries;