/***************************************************************************
- * Copyright (C) 2005-08 by the Quassel Project *
+ * Copyright (C) 2005-09 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#ifndef _NETWORK_H_
-#define _NETWORK_H_
+#ifndef NETWORK_H
+#define NETWORK_H
-#include <QDebug>
#include <QString>
#include <QStringList>
#include <QList>
+#include <QNetworkProxy>
#include <QHash>
#include <QVariantMap>
#include <QPointer>
#include <QMutex>
#include "types.h"
+#include "util.h"
#include "syncableobject.h"
-class SignalProxy;
-class IrcUser;
-class IrcChannel;
+#include "signalproxy.h"
+#include "ircuser.h"
+#include "ircchannel.h"
// defined below!
struct NetworkInfo;
Q_PROPERTY(QString networkName READ networkName WRITE setNetworkName STORED false)
Q_PROPERTY(QString currentServer READ currentServer WRITE setCurrentServer STORED false)
Q_PROPERTY(QString myNick READ myNick WRITE setMyNick STORED false)
+ Q_PROPERTY(int latency READ latency WRITE setLatency STORED false)
Q_PROPERTY(QByteArray codecForServer READ codecForServer WRITE setCodecForServer STORED false)
Q_PROPERTY(QByteArray codecForEncoding READ codecForEncoding WRITE setCodecForEncoding STORED false)
Q_PROPERTY(QByteArray codecForDecoding READ codecForDecoding WRITE setCodecForDecoding STORED false)
Q_PROPERTY(bool rejoinChannels READ rejoinChannels WRITE setRejoinChannels STORED false)
public:
- enum ConnectionState { Disconnected, Connecting, Initializing, Initialized, Reconnecting, Disconnecting };
+ enum ConnectionState {
+ Disconnected,
+ Connecting,
+ Initializing,
+ Initialized,
+ Reconnecting,
+ Disconnecting
+ };
+
+ // see:
+ // http://www.irc.org/tech_docs/005.html
+ // http://www.irc.org/tech_docs/draft-brocklesby-irc-isupport-03.txt
+ enum ChannelModeType {
+ NOT_A_CHANMODE = 0x00,
+ A_CHANMODE = 0x01,
+ B_CHANMODE = 0x02,
+ C_CHANMODE = 0x04,
+ D_CHANMODE = 0x08
+ };
+
+ struct Server {
+ QString host;
+ uint port;
+ QString password;
+ bool useSsl;
+ int sslVersion;
+
+ bool useProxy;
+ int proxyType;
+ QString proxyHost;
+ uint proxyPort;
+ QString proxyUser;
+ QString proxyPass;
+
+ 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) {}
+ bool operator==(const Server &other) const;
+ bool operator!=(const Server &other) const;
+ };
+ typedef QList<Server> ServerList;
Network(const NetworkId &networkid, QObject *parent = 0);
~Network();
- NetworkId networkId() const;
+ inline NetworkId networkId() const { return _networkId; }
- SignalProxy *proxy() const;
- void setProxy(SignalProxy *proxy);
+ inline SignalProxy *proxy() const { return _proxy; }
+ inline void setProxy(SignalProxy *proxy) { _proxy = proxy; }
- bool isMyNick(const QString &nick) const;
- bool isMe(IrcUser *ircuser) const;
+ inline bool isMyNick(const QString &nick) const { return (myNick().toLower() == nick.toLower()); }
+ inline bool isMe(IrcUser *ircuser) const { return (ircuser->nick().toLower() == myNick().toLower()); }
bool isChannelName(const QString &channelname) const;
- bool isConnected() const;
+ inline bool isConnected() const { return _connected; }
//Network::ConnectionState connectionState() const;
- int connectionState() const;
+ inline int connectionState() const { return _connectionState; }
QString prefixToMode(const QString &prefix);
- QString prefixToMode(const QCharRef &prefix);
+ inline QString prefixToMode(const QCharRef &prefix) { return prefixToMode(QString(prefix)); }
QString modeToPrefix(const QString &mode);
- QString modeToPrefix(const QCharRef &mode);
+ inline QString modeToPrefix(const QCharRef &mode) { return modeToPrefix(QString(mode)); }
- QString networkName() const;
- QString currentServer() const;
- QString myNick() const;
- IdentityId identity() const;
+ ChannelModeType channelModeType(const QString &mode);
+ inline ChannelModeType channelModeType(const QCharRef &mode) { return channelModeType(QString(mode)); }
+
+ inline const QString &networkName() const { return _networkName; }
+ inline const QString ¤tServer() const { return _currentServer; }
+ inline const QString &myNick() const { return _myNick; }
+ inline int latency() const { return _latency; }
+ inline IrcUser *me() const { return ircUser(myNick()); }
+ inline IdentityId identity() const { return _identity; }
QStringList nicks() const;
- QStringList channels() const;
- QVariantList serverList() const;
- bool useRandomServer() const;
- QStringList perform() const;
- bool useAutoIdentify() const;
- QString autoIdentifyService() const;
- QString autoIdentifyPassword() const;
- bool useAutoReconnect() const;
- quint32 autoReconnectInterval() const;
- quint16 autoReconnectRetries() const;
- bool unlimitedReconnectRetries() const;
- bool rejoinChannels() const;
+ inline QStringList channels() const { return _ircChannels.keys(); }
+ inline const ServerList &serverList() const { return _serverList; }
+ inline bool useRandomServer() const { return _useRandomServer; }
+ inline const QStringList &perform() const { return _perform; }
+ inline bool useAutoIdentify() const { return _useAutoIdentify; }
+ inline const QString &autoIdentifyService() const { return _autoIdentifyService; }
+ inline const QString &autoIdentifyPassword() const { return _autoIdentifyPassword; }
+ inline bool useAutoReconnect() const { return _useAutoReconnect; }
+ inline quint32 autoReconnectInterval() const { return _autoReconnectInterval; }
+ inline quint16 autoReconnectRetries() const { return _autoReconnectRetries; }
+ inline bool unlimitedReconnectRetries() const { return _unlimitedReconnectRetries; }
+ inline bool rejoinChannels() const { return _rejoinChannels; }
NetworkInfo networkInfo() const;
void setNetworkInfo(const NetworkInfo &);
QString prefixes();
QString prefixModes();
- bool supports(const QString ¶m) const;
+ bool supports(const QString ¶m) const { return _supports.contains(param); }
QString support(const QString ¶m) const;
- IrcUser *newIrcUser(const QString &hostmask);
- IrcUser *newIrcUser(const QByteArray &hostmask);
+ IrcUser *newIrcUser(const QString &hostmask, const QVariantMap &initData = QVariantMap());
+ inline IrcUser *newIrcUser(const QByteArray &hostmask) { return newIrcUser(decodeServerString(hostmask)); }
IrcUser *ircUser(QString nickname) const;
- IrcUser *ircUser(const QByteArray &nickname) const;
- QList<IrcUser *> ircUsers() const;
- quint32 ircUserCount() const;
+ inline IrcUser *ircUser(const QByteArray &nickname) const { return ircUser(decodeServerString(nickname)); }
+ inline QList<IrcUser *> ircUsers() const { return _ircUsers.values(); }
+ inline quint32 ircUserCount() const { return _ircUsers.count(); }
- IrcChannel *newIrcChannel(const QString &channelname);
- IrcChannel *newIrcChannel(const QByteArray &channelname);
+ IrcChannel *newIrcChannel(const QString &channelname, const QVariantMap &initData = QVariantMap());
+ inline IrcChannel *newIrcChannel(const QByteArray &channelname) { return newIrcChannel(decodeServerString(channelname)); }
IrcChannel *ircChannel(QString channelname) const;
- IrcChannel *ircChannel(const QByteArray &channelname) const;
- QList<IrcChannel *> ircChannels() const;
- quint32 ircChannelCount() const;
+ inline IrcChannel *ircChannel(const QByteArray &channelname) const { return ircChannel(decodeServerString(channelname)); }
+ inline QList<IrcChannel *> ircChannels() const { return _ircChannels.values(); }
+ inline quint32 ircChannelCount() const { return _ircChannels.count(); }
QByteArray codecForServer() const;
QByteArray codecForEncoding() const;
static void setDefaultCodecForEncoding(const QByteArray &name);
static void setDefaultCodecForDecoding(const QByteArray &name);
+ inline bool autoAwayActive() const { return _autoAwayActive; }
+ inline void setAutoAwayActive(bool active) { _autoAwayActive = active; }
+
+ static QStringList presetNetworks(bool onlyDefault = false);
+ static QStringList presetDefaultChannels(const QString &networkName);
+ static NetworkInfo networkInfoFromPreset(const QString &networkName);
+
public slots:
void setNetworkName(const QString &networkName);
void setCurrentServer(const QString ¤tServer);
void setConnected(bool isConnected);
- //void setConnectionState(Network::ConnectionState state);
void setConnectionState(int state);
- void setMyNick(const QString &mynick);
+ virtual void setMyNick(const QString &mynick);
+ void setLatency(int latency);
void setIdentity(IdentityId);
void setServerList(const QVariantList &serverList);
void setUseAutoIdentify(bool);
void setAutoIdentifyService(const QString &);
void setAutoIdentifyPassword(const QString &);
- void setUseAutoReconnect(bool);
- void setAutoReconnectInterval(quint32);
- void setAutoReconnectRetries(quint16);
+ virtual void setUseAutoReconnect(bool);
+ virtual void setAutoReconnectInterval(quint32);
+ virtual void setAutoReconnectRetries(quint16);
void setUnlimitedReconnectRetries(bool);
void setRejoinChannels(bool);
void removeSupport(const QString ¶m);
inline void addIrcUser(const QString &hostmask) { newIrcUser(hostmask); }
- void removeIrcUser(const QString &nick);
- void removeIrcChannel(const QString &channel);
+ inline void addIrcChannel(const QString &channel) { newIrcChannel(channel); }
//init geters
QVariantMap initSupports() const;
- QVariantList initServerList() const;
- QStringList initIrcUsers() const;
- QStringList initIrcChannels() const;
-
+ inline QVariantList initServerList() const { return toVariantList(serverList()); }
+ virtual QVariantMap initIrcUsersAndChannels() const;
+
//init seters
void initSetSupports(const QVariantMap &supports);
- void initSetServerList(const QVariantList &serverList);
- void initSetIrcUsers(const QStringList &hostmasks);
- void initSetIrcChannels(const QStringList &channels);
-
+ inline void initSetServerList(const QVariantList &serverList) { _serverList = fromVariantList<Server>(serverList); }
+ virtual void initSetIrcUsersAndChannels(const QVariantMap &usersAndChannels);
+
IrcUser *updateNickFromMask(const QString &mask);
// these slots are to keep the hashlists of all users and the
// channel lists up to date
void ircUserNickChanged(QString newnick);
- void requestConnect() const;
- void requestDisconnect() const;
+ virtual inline void requestConnect() const { emit connectRequested(); }
+ virtual inline void requestDisconnect() const { emit disconnectRequested(); }
+ virtual inline void requestSetNetworkInfo(const NetworkInfo &info) { emit setNetworkInfoRequested(info); }
void emitConnectionError(const QString &);
private slots:
- void channelDestroyed();
void removeIrcUser(IrcUser *ircuser);
void removeIrcChannel(IrcChannel *ircChannel);
void removeChansAndUsers();
- void ircUserInitDone();
- void ircChannelInitDone();
signals:
void aboutToBeDestroyed();
void connectionStateSet(int);
void connectionError(const QString &errorMsg);
void myNickSet(const QString &mynick);
+ void latencySet(int latency);
void identitySet(IdentityId);
void serverListSet(QVariantList serverList);
void ircChannelAdded(const QString &channelname);
void ircChannelAdded(IrcChannel *);
- void ircUserRemoved(const QString &nick);
- void ircChannelRemoved(const QString &channel);
-
- // needed for client sync progress
- void ircUserRemoved(QObject *);
- void ircChannelRemoved(QObject *);
+ void connectRequested() const;
+ void disconnectRequested() const;
+ void setNetworkInfoRequested(const NetworkInfo &) const;
- void ircUserInitDone(IrcUser *);
- void ircChannelInitDone(IrcChannel *);
-
- void connectRequested(NetworkId id = 0) const;
- void disconnectRequested(NetworkId id = 0) const;
+protected:
+ inline virtual IrcChannel *ircChannelFactory(const QString &channelname) { return new IrcChannel(channelname, this); }
private:
QPointer<SignalProxy> _proxy;
IdentityId _identity;
QString _myNick;
+ int _latency;
QString _networkName;
QString _currentServer;
bool _connected;
QHash<QString, IrcChannel *> _ircChannels; // stores all known channels
QHash<QString, QString> _supports; // stores results from RPL_ISUPPORT
- QVariantList _serverList;
+ ServerList _serverList;
bool _useRandomServer;
QStringList _perform;
static QTextCodec *_defaultCodecForServer;
static QTextCodec *_defaultCodecForEncoding;
static QTextCodec *_defaultCodecForDecoding;
+
+ bool _autoAwayActive; // when this is active handle305 and handle306 don't trigger any output
+
+ static QString _networksIniPath;
+
+ friend class IrcUser;
+ friend class IrcChannel;
};
//! Stores all editable information about a network (as opposed to runtime state).
struct NetworkInfo {
+ // set some default values, note that this does not initialize e.g. name and id
+ NetworkInfo();
+
NetworkId networkId;
QString networkName;
IdentityId identity;
QByteArray codecForEncoding;
QByteArray codecForDecoding;
- // Server entry: QString "Host", uint "Port", QString "Password", bool "UseSSL"
- QVariantList serverList;
+ Network::ServerList serverList;
bool useRandomServer;
QStringList perform;
QDataStream &operator<<(QDataStream &out, const NetworkInfo &info);
QDataStream &operator>>(QDataStream &in, NetworkInfo &info);
QDebug operator<<(QDebug dbg, const NetworkInfo &i);
+Q_DECLARE_METATYPE(NetworkInfo)
-Q_DECLARE_METATYPE(NetworkInfo);
+QDataStream &operator<<(QDataStream &out, const Network::Server &server);
+QDataStream &operator>>(QDataStream &in, Network::Server &server);
+QDebug operator<<(QDebug dbg, const Network::Server &server);
+Q_DECLARE_METATYPE(Network::Server)
#endif
projects / quassel.git / blobdiff