/***************************************************************************
- * Copyright (C) 2005-09 by the Quassel Project *
+ * Copyright (C) 2005-2010 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"
// TODO: ConnectionInfo to propagate and sync the current state of NetworkConnection, encodings etcpp
class Network : public SyncableObject {
+ SYNCABLE_OBJECT
Q_OBJECT
Q_ENUMS(ConnectionState Network::ConnectionState)
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;
};
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; }
QString prefixes();
QString prefixModes();
+ void determinePrefixes();
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);
// channel lists up to date
void ircUserNickChanged(QString newnick);
- virtual inline void requestConnect() const { emit connectRequested(); }
- virtual inline void requestDisconnect() const { emit disconnectRequested(); }
- virtual inline void requestSetNetworkInfo(const NetworkInfo &info) { emit setNetworkInfoRequested(info); }
+ virtual inline void requestConnect() const { REQUEST(NO_ARG) }
+ virtual inline void requestDisconnect() const { REQUEST(NO_ARG) }
+ virtual inline void requestSetNetworkInfo(const NetworkInfo &info) { REQUEST(ARG(info)) }
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 currentServerSet(const QString ¤tServer);
void connectedSet(bool isConnected);
void connectionStateSet(Network::ConnectionState);
- void connectionStateSet(int);
+// void connectionStateSet(int);
void connectionError(const QString &errorMsg);
void myNickSet(const QString &mynick);
- void latencySet(int latency);
+// void latencySet(int latency);
void identitySet(IdentityId);
- void serverListSet(QVariantList serverList);
- void useRandomServerSet(bool);
- void performSet(const QStringList &);
- void useAutoIdentifySet(bool);
- void autoIdentifyServiceSet(const QString &);
- void autoIdentifyPasswordSet(const QString &);
- void useAutoReconnectSet(bool);
- void autoReconnectIntervalSet(quint32);
- void autoReconnectRetriesSet(quint16);
- void unlimitedReconnectRetriesSet(bool);
- void rejoinChannelsSet(bool);
-
- void codecForServerSet(const QByteArray &codecName);
- void codecForEncodingSet(const QByteArray &codecName);
- void codecForDecodingSet(const QByteArray &codecName);
-
- void supportAdded(const QString ¶m, const QString &value);
- void supportRemoved(const QString ¶m);
-
- void ircUserAdded(const QString &hostmask);
+ void configChanged();
+
+ // void serverListSet(QVariantList serverList);
+// void useRandomServerSet(bool);
+// void performSet(const QStringList &);
+// void useAutoIdentifySet(bool);
+// void autoIdentifyServiceSet(const QString &);
+// void autoIdentifyPasswordSet(const QString &);
+// void useAutoReconnectSet(bool);
+// void autoReconnectIntervalSet(quint32);
+// void autoReconnectRetriesSet(quint16);
+// void unlimitedReconnectRetriesSet(bool);
+// void rejoinChannelsSet(bool);
+
+// void codecForServerSet(const QByteArray &codecName);
+// void codecForEncodingSet(const QByteArray &codecName);
+// void codecForDecodingSet(const QByteArray &codecName);
+
+// void supportAdded(const QString ¶m, const QString &value);
+// void supportRemoved(const QString ¶m);
+
+// void ircUserAdded(const QString &hostmask);
void ircUserAdded(IrcUser *);
- void ircChannelAdded(const QString &channelname);
+// void ircChannelAdded(const QString &channelname);
void ircChannelAdded(IrcChannel *);
- void connectRequested() const;
- void disconnectRequested() const;
- void setNetworkInfoRequested(const NetworkInfo &) const;
+// void connectRequested() const;
+// void disconnectRequested() const;
+// void setNetworkInfoRequested(const NetworkInfo &) const;
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;
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;