X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetwork.h;h=f0bd112ca8238bff95f6386094ae670c492b281a;hp=17853722570ddccc06d818c5a2ea829576e418e4;hb=e4972a0ebce0d555d752ab2f34ffd6a6dcdef1dd;hpb=6f0a3994d3dfd440746d396681f767bcb559f424 diff --git a/src/common/network.h b/src/common/network.h index 17853722..f0bd112c 100644 --- a/src/common/network.h +++ b/src/common/network.h @@ -1,5 +1,5 @@ /*************************************************************************** - * 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 * @@ -24,12 +24,14 @@ #include #include #include +#include #include #include #include #include #include "types.h" +#include "util.h" #include "syncableobject.h" #include "signalproxy.h" @@ -42,6 +44,7 @@ struct NetworkInfo; // 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) @@ -61,6 +64,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) @@ -88,6 +94,28 @@ public: 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 ServerList; Network(const NetworkId &networkid, QObject *parent = 0); ~Network(); @@ -122,12 +150,15 @@ public: inline IdentityId identity() const { return _identity; } QStringList nicks() const; inline QStringList channels() const { return _ircChannels.keys(); } - inline const QVariantList &serverList() const { return _serverList; } + 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 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; } @@ -176,16 +207,19 @@ public: static void setDefaultCodecForEncoding(const QByteArray &name); static void setDefaultCodecForDecoding(const QByteArray &name); - bool autoAwayActive() const { return _autoAwayActive; } - void setAutoAwayActive(bool active) { _autoAwayActive = active; } + 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); @@ -195,9 +229,12 @@ public slots: void setUseAutoIdentify(bool); void setAutoIdentifyService(const QString &); void setAutoIdentifyPassword(const QString &); - void setUseAutoReconnect(bool); - void setAutoReconnectInterval(quint32); - void setAutoReconnectRetries(quint16); + void setUseSasl(bool); + void setSaslAccount(const QString &); + void setSaslPassword(const QString &); + virtual void setUseAutoReconnect(bool); + virtual void setAutoReconnectInterval(quint32); + virtual void setAutoReconnectRetries(quint16); void setUnlimitedReconnectRetries(bool); void setRejoinChannels(bool); @@ -210,22 +247,16 @@ public slots: inline void addIrcUser(const QString &hostmask) { newIrcUser(hostmask); } inline void addIrcChannel(const QString &channel) { newIrcChannel(channel); } - void removeIrcUser(const QString &nick); - void removeIrcChannel(const QString &channel); //init geters QVariantMap initSupports() const; - inline QVariantList initServerList() const { return serverList(); } + inline QVariantList initServerList() const { return toVariantList(serverList()); } virtual QVariantMap initIrcUsersAndChannels() const; -// QStringList initIrcUsers() const; -// QStringList initIrcChannels() const; //init seters void initSetSupports(const QVariantMap &supports); - inline void initSetServerList(const QVariantList &serverList) { setServerList(serverList); } + inline void initSetServerList(const QVariantList &serverList) { _serverList = fromVariantList(serverList); } virtual void initSetIrcUsersAndChannels(const QVariantMap &usersAndChannels); -// void initSetIrcUsers(const QStringList &hostmasks); -// void initSetIrcChannels(const QStringList &channels); IrcUser *updateNickFromMask(const QString &mask); @@ -233,20 +264,16 @@ public slots: // 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 ircUserDestroyed(); - void channelDestroyed(); void removeIrcUser(IrcUser *ircuser); void removeIrcChannel(IrcChannel *ircChannel); void removeChansAndUsers(); - void ircUserInitDone(); - void ircChannelInitDone(); signals: void aboutToBeDestroyed(); @@ -254,49 +281,41 @@ signals: 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 ircUserAdded(IrcUser *); - void ircChannelAdded(const QString &channelname); - void ircChannelAdded(IrcChannel *); + void configChanged(); - void ircUserRemoved(const QString &nick); - void ircChannelRemoved(const QString &channel); + // 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); - // needed for client sync progress - void ircUserRemoved(QObject *); - void ircChannelRemoved(QObject *); +// void codecForServerSet(const QByteArray &codecName); +// void codecForEncodingSet(const QByteArray &codecName); +// void codecForDecodingSet(const QByteArray &codecName); - void ircUserInitDone(IrcUser *); - void ircChannelInitDone(IrcChannel *); +// 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(IrcChannel *); - void connectRequested(NetworkId id = 0) const; - void disconnectRequested(NetworkId id = 0) 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); } @@ -321,7 +340,7 @@ private: QHash _ircChannels; // stores all known channels QHash _supports; // stores results from RPL_ISUPPORT - QVariantList _serverList; + ServerList _serverList; bool _useRandomServer; QStringList _perform; @@ -329,6 +348,10 @@ private: QString _autoIdentifyService; QString _autoIdentifyPassword; + bool _useSasl; + QString _saslAccount; + QString _saslPassword; + bool _useAutoReconnect; quint32 _autoReconnectInterval; quint16 _autoReconnectRetries; @@ -346,10 +369,18 @@ private: 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; @@ -359,8 +390,7 @@ struct NetworkInfo { QByteArray codecForEncoding; QByteArray codecForDecoding; - // Server entry: QString "Host", uint "Port", QString "Password", bool "UseSSL" - QVariantList serverList; + Network::ServerList serverList; bool useRandomServer; QStringList perform; @@ -369,6 +399,10 @@ struct NetworkInfo { QString autoIdentifyService; QString autoIdentifyPassword; + bool useSasl; + QString saslAccount; + QString saslPassword; + bool useAutoReconnect; quint32 autoReconnectInterval; quint16 autoReconnectRetries; @@ -382,7 +416,11 @@ struct NetworkInfo { QDataStream &operator<<(QDataStream &out, const NetworkInfo &info); QDataStream &operator>>(QDataStream &in, NetworkInfo &info); QDebug operator<<(QDebug dbg, const NetworkInfo &i); - 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