X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetwork.cpp;h=bb9b6bf9b3aa2f2ba065ab4a78366e9b6c7242ff;hp=4e14af4fc835348ff470c64c05bfc1520f4333f5;hb=1f21c1f9613031ae263eeed0c4883bfcd5488343;hpb=7d30b18136eecbdf2089e5d5877c7e41c6f4bcb6 diff --git a/src/common/network.cpp b/src/common/network.cpp index 4e14af4f..bb9b6bf9 100644 --- a/src/common/network.cpp +++ b/src/common/network.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2016 by the Quassel Project * + * Copyright (C) 2005-2019 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -18,58 +18,60 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#include "network.h" + +#include + #include -#include "network.h" +#include "peer.h" -QTextCodec *Network::_defaultCodecForServer = 0; -QTextCodec *Network::_defaultCodecForEncoding = 0; -QTextCodec *Network::_defaultCodecForDecoding = 0; +QTextCodec* Network::_defaultCodecForServer = nullptr; +QTextCodec* Network::_defaultCodecForEncoding = nullptr; +QTextCodec* Network::_defaultCodecForDecoding = nullptr; // ==================== // Public: // ==================== -INIT_SYNCABLE_OBJECT(Network) -Network::Network(const NetworkId &networkid, QObject *parent) - : SyncableObject(parent), - _proxy(0), - _networkId(networkid), - _identity(0), - _myNick(QString()), - _latency(0), - _networkName(QString("")), - _currentServer(QString()), - _connected(false), - _connectionState(Disconnected), - _prefixes(QString()), - _prefixModes(QString()), - _useRandomServer(false), - _useAutoIdentify(false), - _useSasl(false), - _useAutoReconnect(false), - _autoReconnectInterval(60), - _autoReconnectRetries(10), - _unlimitedReconnectRetries(false), - _useCustomMessageRate(false), - _messageRateBurstSize(5), - _messageRateDelay(2200), - _unlimitedMessageRate(false), - _codecForServer(0), - _codecForEncoding(0), - _codecForDecoding(0), - _autoAwayActive(false) + +Network::Network(const NetworkId& networkid, QObject* parent) + : SyncableObject(parent) + , _proxy(nullptr) + , _networkId(networkid) + , _identity(0) + , _myNick(QString()) + , _latency(0) + , _networkName(QString("")) + , _currentServer(QString()) + , _connected(false) + , _connectionState(Disconnected) + , _prefixes(QString()) + , _prefixModes(QString()) + , _useRandomServer(false) + , _useAutoIdentify(false) + , _useSasl(false) + , _useAutoReconnect(false) + , _autoReconnectInterval(60) + , _autoReconnectRetries(10) + , _unlimitedReconnectRetries(false) + , _useCustomMessageRate(false) + , _messageRateBurstSize(5) + , _messageRateDelay(2200) + , _unlimitedMessageRate(false) + , _codecForServer(nullptr) + , _codecForEncoding(nullptr) + , _codecForDecoding(nullptr) + , _autoAwayActive(false) { setObjectName(QString::number(networkid.toInt())); } - Network::~Network() { emit aboutToBeDestroyed(); } - -bool Network::isChannelName(const QString &channelname) const +bool Network::isChannelName(const QString& channelname) const { if (channelname.isEmpty()) return false; @@ -80,8 +82,7 @@ bool Network::isChannelName(const QString &channelname) const return QString("#&!+").contains(channelname[0]); } - -bool Network::isStatusMsg(const QString &target) const +bool Network::isStatusMsg(const QString& target) const { if (target.isEmpty()) return false; @@ -92,7 +93,6 @@ bool Network::isStatusMsg(const QString &target) const return QString("@+").contains(target[0]); } - NetworkInfo Network::networkInfo() const { NetworkInfo info; @@ -123,29 +123,47 @@ NetworkInfo Network::networkInfo() const return info; } - -void Network::setNetworkInfo(const NetworkInfo &info) +void Network::setNetworkInfo(const NetworkInfo& info) { // we don't set our ID! - if (!info.networkName.isEmpty() && info.networkName != networkName()) setNetworkName(info.networkName); - if (info.identity > 0 && info.identity != identity()) setIdentity(info.identity); - if (info.codecForServer != codecForServer()) setCodecForServer(QTextCodec::codecForName(info.codecForServer)); - if (info.codecForEncoding != codecForEncoding()) setCodecForEncoding(QTextCodec::codecForName(info.codecForEncoding)); - if (info.codecForDecoding != codecForDecoding()) setCodecForDecoding(QTextCodec::codecForName(info.codecForDecoding)); - if (info.serverList.count()) setServerList(toVariantList(info.serverList)); // FIXME compare components - if (info.useRandomServer != useRandomServer()) setUseRandomServer(info.useRandomServer); - if (info.perform != perform()) setPerform(info.perform); - if (info.useAutoIdentify != useAutoIdentify()) setUseAutoIdentify(info.useAutoIdentify); - if (info.autoIdentifyService != autoIdentifyService()) setAutoIdentifyService(info.autoIdentifyService); - if (info.autoIdentifyPassword != autoIdentifyPassword()) setAutoIdentifyPassword(info.autoIdentifyPassword); - if (info.useSasl != useSasl()) setUseSasl(info.useSasl); - if (info.saslAccount != saslAccount()) setSaslAccount(info.saslAccount); - if (info.saslPassword != saslPassword()) setSaslPassword(info.saslPassword); - if (info.useAutoReconnect != useAutoReconnect()) setUseAutoReconnect(info.useAutoReconnect); - if (info.autoReconnectInterval != autoReconnectInterval()) setAutoReconnectInterval(info.autoReconnectInterval); - if (info.autoReconnectRetries != autoReconnectRetries()) setAutoReconnectRetries(info.autoReconnectRetries); - if (info.unlimitedReconnectRetries != unlimitedReconnectRetries()) setUnlimitedReconnectRetries(info.unlimitedReconnectRetries); - if (info.rejoinChannels != rejoinChannels()) setRejoinChannels(info.rejoinChannels); + if (!info.networkName.isEmpty() && info.networkName != networkName()) + setNetworkName(info.networkName); + if (info.identity > 0 && info.identity != identity()) + setIdentity(info.identity); + if (info.codecForServer != codecForServer()) + setCodecForServer(QTextCodec::codecForName(info.codecForServer)); + if (info.codecForEncoding != codecForEncoding()) + setCodecForEncoding(QTextCodec::codecForName(info.codecForEncoding)); + if (info.codecForDecoding != codecForDecoding()) + setCodecForDecoding(QTextCodec::codecForName(info.codecForDecoding)); + if (info.serverList.count()) + setServerList(toVariantList(info.serverList)); // FIXME compare components + if (info.useRandomServer != useRandomServer()) + setUseRandomServer(info.useRandomServer); + if (info.perform != perform()) + setPerform(info.perform); + if (info.useAutoIdentify != useAutoIdentify()) + setUseAutoIdentify(info.useAutoIdentify); + if (info.autoIdentifyService != autoIdentifyService()) + setAutoIdentifyService(info.autoIdentifyService); + if (info.autoIdentifyPassword != autoIdentifyPassword()) + setAutoIdentifyPassword(info.autoIdentifyPassword); + if (info.useSasl != useSasl()) + setUseSasl(info.useSasl); + if (info.saslAccount != saslAccount()) + setSaslAccount(info.saslAccount); + if (info.saslPassword != saslPassword()) + setSaslPassword(info.saslPassword); + if (info.useAutoReconnect != useAutoReconnect()) + setUseAutoReconnect(info.useAutoReconnect); + if (info.autoReconnectInterval != autoReconnectInterval()) + setAutoReconnectInterval(info.autoReconnectInterval); + if (info.autoReconnectRetries != autoReconnectRetries()) + setAutoReconnectRetries(info.autoReconnectRetries); + if (info.unlimitedReconnectRetries != unlimitedReconnectRetries()) + setUnlimitedReconnectRetries(info.unlimitedReconnectRetries); + if (info.rejoinChannels != rejoinChannels()) + setRejoinChannels(info.rejoinChannels); // Custom rate limiting if (info.useCustomMessageRate != useCustomMessageRate()) setUseCustomMessageRate(info.useCustomMessageRate); @@ -157,8 +175,7 @@ void Network::setNetworkInfo(const NetworkInfo &info) setUnlimitedMessageRate(info.unlimitedMessageRate); } - -QString Network::prefixToMode(const QString &prefix) const +QString Network::prefixToMode(const QString& prefix) const { if (prefixes().contains(prefix)) return QString(prefixModes()[prefixes().indexOf(prefix)]); @@ -166,8 +183,7 @@ QString Network::prefixToMode(const QString &prefix) const return QString(); } - -QString Network::modeToPrefix(const QString &mode) const +QString Network::modeToPrefix(const QString& mode) const { if (prefixModes().contains(mode)) return QString(prefixes()[prefixModes().indexOf(mode)]); @@ -175,19 +191,54 @@ QString Network::modeToPrefix(const QString &mode) const return QString(); } +QString Network::sortPrefixModes(const QString& modes) const +{ + // If modes is empty or we don't have any modes, nothing can be sorted, bail out early + if (modes.isEmpty() || prefixModes().isEmpty()) { + return modes; + } + + // Store a copy of the modes for modification + // QString should be efficient and not copy memory if nothing changes, but if mistaken, + // std::is_sorted could be called first. + QString sortedModes = QString(modes); + + // Sort modes as if a QChar array + // See https://en.cppreference.com/w/cpp/algorithm/sort + // Defining lambda with [&] implicitly captures variables by reference + std::sort(sortedModes.begin(), sortedModes.end(), [&](const QChar& lmode, const QChar& rmode) { + // Compare characters according to prefix modes + // Return true if lmode comes before rmode (is "less than") + + // Check for unknown modes... + if (!prefixModes().contains(lmode)) { + // Left mode not in prefix list, send to end + return false; + } + else if (!prefixModes().contains(rmode)) { + // Right mode not in prefix list, send to end + return true; + } + else { + // Both characters known, sort according to index in prefixModes() + return (prefixModes().indexOf(lmode) < prefixModes().indexOf(rmode)); + } + }); + + return sortedModes; +} QStringList Network::nicks() const { // we don't use _ircUsers.keys() since the keys may be // not up to date after a nick change QStringList nicks; - foreach(IrcUser *ircuser, _ircUsers.values()) { + foreach (IrcUser* ircuser, _ircUsers.values()) { nicks << ircuser->nick(); } return nicks; } - QString Network::prefixes() const { if (_prefixes.isNull()) @@ -196,7 +247,6 @@ QString Network::prefixes() const return _prefixes; } - QString Network::prefixModes() const { if (_prefixModes.isNull()) @@ -205,9 +255,8 @@ QString Network::prefixModes() const return _prefixModes; } - // example Unreal IRCD: CHANMODES=beI,kfL,lj,psmntirRcOAQKVCuzNSMTG -Network::ChannelModeType Network::channelModeType(const QString &mode) +Network::ChannelModeType Network::channelModeType(const QString& mode) { if (mode.isEmpty()) return NOT_A_CHANMODE; @@ -230,8 +279,7 @@ Network::ChannelModeType Network::channelModeType(const QString &mode) return modeType; } - -QString Network::support(const QString ¶m) const +QString Network::support(const QString& param) const { QString support_ = param.toUpper(); if (_supports.contains(support_)) @@ -240,12 +288,31 @@ QString Network::support(const QString ¶m) const return QString(); } +bool Network::saslMaybeSupports(const QString& saslMechanism) const +{ + if (!capAvailable(IrcCap::SASL)) { + // If SASL's not advertised at all, it's likely the mechanism isn't supported, as per specs. + // Unfortunately, we don't know for sure, but Quassel won't request SASL without it being + // advertised, anyways. + // This may also occur if the network's disconnected or negotiation hasn't yet happened. + return false; + } + + // Get the SASL capability value + QString saslCapValue = capValue(IrcCap::SASL); + // SASL mechanisms are only specified in capability values as part of SASL 3.2. In SASL 3.1, + // it's handled differently. If we don't know via capability value, assume it's supported to + // reduce the risk of breaking existing setups. + // See: http://ircv3.net/specs/extensions/sasl-3.1.html + // And: http://ircv3.net/specs/extensions/sasl-3.2.html + return (saslCapValue.length() == 0) || (saslCapValue.contains(saslMechanism, Qt::CaseInsensitive)); +} -IrcUser *Network::newIrcUser(const QString &hostmask, const QVariantMap &initData) +IrcUser* Network::newIrcUser(const QString& hostmask, const QVariantMap& initData) { QString nick(nickFromMask(hostmask).toLower()); if (!_ircUsers.contains(nick)) { - IrcUser *ircuser = ircUserFactory(hostmask); + IrcUser* ircuser = ircUserFactory(hostmask); if (!initData.isEmpty()) { ircuser->fromVariantMap(initData); ircuser->setInitialized(); @@ -256,7 +323,7 @@ IrcUser *Network::newIrcUser(const QString &hostmask, const QVariantMap &initDat else qWarning() << "unable to synchronize new IrcUser" << hostmask << "forgot to call Network::setProxy(SignalProxy *)?"; - connect(ircuser, SIGNAL(nickSet(QString)), this, SLOT(ircUserNickChanged(QString))); + connect(ircuser, &IrcUser::nickSet, this, &Network::ircUserNickChanged); _ircUsers[nick] = ircuser; @@ -272,57 +339,52 @@ IrcUser *Network::newIrcUser(const QString &hostmask, const QVariantMap &initDat return _ircUsers[nick]; } - -IrcUser *Network::ircUser(QString nickname) const +IrcUser* Network::ircUser(QString nickname) const { nickname = nickname.toLower(); if (_ircUsers.contains(nickname)) return _ircUsers[nickname]; else - return 0; + return nullptr; } - -void Network::removeIrcUser(IrcUser *ircuser) +void Network::removeIrcUser(IrcUser* ircuser) { QString nick = _ircUsers.key(ircuser); if (nick.isNull()) return; _ircUsers.remove(nick); - disconnect(ircuser, 0, this, 0); + disconnect(ircuser, nullptr, this, nullptr); ircuser->deleteLater(); } - -void Network::removeIrcChannel(IrcChannel *channel) +void Network::removeIrcChannel(IrcChannel* channel) { QString chanName = _ircChannels.key(channel); if (chanName.isNull()) return; _ircChannels.remove(chanName); - disconnect(channel, 0, this, 0); + disconnect(channel, nullptr, this, nullptr); channel->deleteLater(); } - void Network::removeChansAndUsers() { - QList users = ircUsers(); + QList users = ircUsers(); _ircUsers.clear(); - QList channels = ircChannels(); + QList channels = ircChannels(); _ircChannels.clear(); qDeleteAll(users); qDeleteAll(channels); } - -IrcChannel *Network::newIrcChannel(const QString &channelname, const QVariantMap &initData) +IrcChannel* Network::newIrcChannel(const QString& channelname, const QVariantMap& initData) { if (!_ircChannels.contains(channelname.toLower())) { - IrcChannel *channel = ircChannelFactory(channelname); + IrcChannel* channel = ircChannelFactory(channelname); if (!initData.isEmpty()) { channel->fromVariantMap(initData); channel->setInitialized(); @@ -342,17 +404,15 @@ IrcChannel *Network::newIrcChannel(const QString &channelname, const QVariantMap return _ircChannels[channelname.toLower()]; } - -IrcChannel *Network::ircChannel(QString channelname) const +IrcChannel* Network::ircChannel(QString channelname) const { channelname = channelname.toLower(); if (_ircChannels.contains(channelname)) return _ircChannels[channelname]; else - return 0; + return nullptr; } - QByteArray Network::defaultCodecForServer() { if (_defaultCodecForServer) @@ -360,13 +420,11 @@ QByteArray Network::defaultCodecForServer() return QByteArray(); } - -void Network::setDefaultCodecForServer(const QByteArray &name) +void Network::setDefaultCodecForServer(const QByteArray& name) { _defaultCodecForServer = QTextCodec::codecForName(name); } - QByteArray Network::defaultCodecForEncoding() { if (_defaultCodecForEncoding) @@ -374,13 +432,11 @@ QByteArray Network::defaultCodecForEncoding() return QByteArray(); } - -void Network::setDefaultCodecForEncoding(const QByteArray &name) +void Network::setDefaultCodecForEncoding(const QByteArray& name) { _defaultCodecForEncoding = QTextCodec::codecForName(name); } - QByteArray Network::defaultCodecForDecoding() { if (_defaultCodecForDecoding) @@ -388,13 +444,11 @@ QByteArray Network::defaultCodecForDecoding() return QByteArray(); } - -void Network::setDefaultCodecForDecoding(const QByteArray &name) +void Network::setDefaultCodecForDecoding(const QByteArray& name) { _defaultCodecForDecoding = QTextCodec::codecForName(name); } - QByteArray Network::codecForServer() const { if (_codecForServer) @@ -402,14 +456,12 @@ QByteArray Network::codecForServer() const return QByteArray(); } - -void Network::setCodecForServer(const QByteArray &name) +void Network::setCodecForServer(const QByteArray& name) { setCodecForServer(QTextCodec::codecForName(name)); } - -void Network::setCodecForServer(QTextCodec *codec) +void Network::setCodecForServer(QTextCodec* codec) { _codecForServer = codec; QByteArray codecName = codecForServer(); @@ -417,7 +469,6 @@ void Network::setCodecForServer(QTextCodec *codec) emit configChanged(); } - QByteArray Network::codecForEncoding() const { if (_codecForEncoding) @@ -425,14 +476,12 @@ QByteArray Network::codecForEncoding() const return QByteArray(); } - -void Network::setCodecForEncoding(const QByteArray &name) +void Network::setCodecForEncoding(const QByteArray& name) { setCodecForEncoding(QTextCodec::codecForName(name)); } - -void Network::setCodecForEncoding(QTextCodec *codec) +void Network::setCodecForEncoding(QTextCodec* codec) { _codecForEncoding = codec; QByteArray codecName = codecForEncoding(); @@ -440,22 +489,20 @@ void Network::setCodecForEncoding(QTextCodec *codec) emit configChanged(); } - QByteArray Network::codecForDecoding() const { if (_codecForDecoding) return _codecForDecoding->name(); - else return QByteArray(); + else + return QByteArray(); } - -void Network::setCodecForDecoding(const QByteArray &name) +void Network::setCodecForDecoding(const QByteArray& name) { setCodecForDecoding(QTextCodec::codecForName(name)); } - -void Network::setCodecForDecoding(QTextCodec *codec) +void Network::setCodecForDecoding(QTextCodec* codec) { _codecForDecoding = codec; QByteArray codecName = codecForDecoding(); @@ -463,17 +510,16 @@ void Network::setCodecForDecoding(QTextCodec *codec) emit configChanged(); } - // FIXME use server encoding if appropriate -QString Network::decodeString(const QByteArray &text) const +QString Network::decodeString(const QByteArray& text) const { if (_codecForDecoding) return ::decodeString(text, _codecForDecoding); - else return ::decodeString(text, _defaultCodecForDecoding); + else + return ::decodeString(text, _defaultCodecForDecoding); } - -QByteArray Network::encodeString(const QString &string) const +QByteArray Network::encodeString(const QString& string) const { if (_codecForEncoding) { return _codecForEncoding->fromUnicode(string); @@ -484,8 +530,7 @@ QByteArray Network::encodeString(const QString &string) const return string.toLatin1(); } - -QString Network::decodeServerString(const QByteArray &text) const +QString Network::decodeServerString(const QByteArray& text) const { if (_codecForServer) return ::decodeString(text, _codecForServer); @@ -493,8 +538,7 @@ QString Network::decodeServerString(const QByteArray &text) const return ::decodeString(text, _defaultCodecForServer); } - -QByteArray Network::encodeServerString(const QString &string) const +QByteArray Network::encodeServerString(const QString& string) const { if (_codecForServer) { return _codecForServer->fromUnicode(string); @@ -505,11 +549,10 @@ QByteArray Network::encodeServerString(const QString &string) const return string.toLatin1(); } - // ==================== // Public Slots: // ==================== -void Network::setNetworkName(const QString &networkName) +void Network::setNetworkName(const QString& networkName) { _networkName = networkName; SYNC(ARG(networkName)) @@ -517,15 +560,13 @@ void Network::setNetworkName(const QString &networkName) emit configChanged(); } - -void Network::setCurrentServer(const QString ¤tServer) +void Network::setCurrentServer(const QString& currentServer) { _currentServer = currentServer; SYNC(ARG(currentServer)) emit currentServerSet(currentServer); } - void Network::setConnected(bool connected) { if (_connected == connected) @@ -541,18 +582,16 @@ void Network::setConnected(bool connected) emit connectedSet(connected); } - -//void Network::setConnectionState(ConnectionState state) { +// void Network::setConnectionState(ConnectionState state) { void Network::setConnectionState(int state) { _connectionState = (ConnectionState)state; - //qDebug() << "netstate" << networkId() << networkName() << state; + // qDebug() << "netstate" << networkId() << networkName() << state; SYNC(ARG(state)) emit connectionStateSet(_connectionState); } - -void Network::setMyNick(const QString &nickname) +void Network::setMyNick(const QString& nickname) { _myNick = nickname; if (!_myNick.isEmpty() && !ircUser(myNick())) { @@ -562,7 +601,6 @@ void Network::setMyNick(const QString &nickname) emit myNickSet(nickname); } - void Network::setLatency(int latency) { if (_latency == latency) @@ -571,7 +609,6 @@ void Network::setLatency(int latency) SYNC(ARG(latency)) } - void Network::setIdentity(IdentityId id) { _identity = id; @@ -580,15 +617,13 @@ void Network::setIdentity(IdentityId id) emit configChanged(); } - -void Network::setServerList(const QVariantList &serverList) +void Network::setServerList(const QVariantList& serverList) { _serverList = fromVariantList(serverList); SYNC(ARG(serverList)) emit configChanged(); } - void Network::setUseRandomServer(bool use) { _useRandomServer = use; @@ -596,15 +631,13 @@ void Network::setUseRandomServer(bool use) emit configChanged(); } - -void Network::setPerform(const QStringList &perform) +void Network::setPerform(const QStringList& perform) { _perform = perform; SYNC(ARG(perform)) emit configChanged(); } - void Network::setUseAutoIdentify(bool use) { _useAutoIdentify = use; @@ -612,23 +645,20 @@ void Network::setUseAutoIdentify(bool use) emit configChanged(); } - -void Network::setAutoIdentifyService(const QString &service) +void Network::setAutoIdentifyService(const QString& service) { _autoIdentifyService = service; SYNC(ARG(service)) emit configChanged(); } - -void Network::setAutoIdentifyPassword(const QString &password) +void Network::setAutoIdentifyPassword(const QString& password) { _autoIdentifyPassword = password; SYNC(ARG(password)) emit configChanged(); } - void Network::setUseSasl(bool use) { _useSasl = use; @@ -636,23 +666,20 @@ void Network::setUseSasl(bool use) emit configChanged(); } - -void Network::setSaslAccount(const QString &account) +void Network::setSaslAccount(const QString& account) { _saslAccount = account; SYNC(ARG(account)) emit configChanged(); } - -void Network::setSaslPassword(const QString &password) +void Network::setSaslPassword(const QString& password) { _saslPassword = password; SYNC(ARG(password)) emit configChanged(); } - void Network::setUseAutoReconnect(bool use) { _useAutoReconnect = use; @@ -660,7 +687,6 @@ void Network::setUseAutoReconnect(bool use) emit configChanged(); } - void Network::setAutoReconnectInterval(quint32 interval) { _autoReconnectInterval = interval; @@ -668,7 +694,6 @@ void Network::setAutoReconnectInterval(quint32 interval) emit configChanged(); } - void Network::setAutoReconnectRetries(quint16 retries) { _autoReconnectRetries = retries; @@ -676,7 +701,6 @@ void Network::setAutoReconnectRetries(quint16 retries) emit configChanged(); } - void Network::setUnlimitedReconnectRetries(bool unlimited) { _unlimitedReconnectRetries = unlimited; @@ -684,7 +708,6 @@ void Network::setUnlimitedReconnectRetries(bool unlimited) emit configChanged(); } - void Network::setRejoinChannels(bool rejoin) { _rejoinChannels = rejoin; @@ -692,7 +715,6 @@ void Network::setRejoinChannels(bool rejoin) emit configChanged(); } - void Network::setUseCustomMessageRate(bool useCustomRate) { if (_useCustomMessageRate != useCustomRate) { @@ -703,13 +725,14 @@ void Network::setUseCustomMessageRate(bool useCustomRate) } } - void Network::setMessageRateBurstSize(quint32 burstSize) { if (burstSize < 1) { - // Can't go slower than one message at a time - qWarning() << "Received invalid setMessageRateBurstSize data, cannot have zero message " - "burst size!" << burstSize; + // Can't go slower than one message at a time. Also blocks old clients from trying to set + // this to 0. + qDebug() << "Received invalid setMessageRateBurstSize data - message burst size must be " + "non-zero positive, given" + << burstSize; return; } if (_messageRateBurstSize != burstSize) { @@ -720,9 +743,16 @@ void Network::setMessageRateBurstSize(quint32 burstSize) } } - void Network::setMessageRateDelay(quint32 messageDelay) { + if (messageDelay == 0) { + // Nonsensical to have no delay - just check the Unlimited box instead. Also blocks old + // clients from trying to set this to 0. + qDebug() << "Received invalid setMessageRateDelay data - message delay must be non-zero " + "positive, given" + << messageDelay; + return; + } if (_messageRateDelay != messageDelay) { _messageRateDelay = messageDelay; SYNC(ARG(messageDelay)) @@ -731,7 +761,6 @@ void Network::setMessageRateDelay(quint32 messageDelay) } } - void Network::setUnlimitedMessageRate(bool unlimitedRate) { if (_unlimitedMessageRate != unlimitedRate) { @@ -742,8 +771,7 @@ void Network::setUnlimitedMessageRate(bool unlimitedRate) } } - -void Network::addSupport(const QString ¶m, const QString &value) +void Network::addSupport(const QString& param, const QString& value) { if (!_supports.contains(param)) { _supports[param] = value; @@ -751,8 +779,7 @@ void Network::addSupport(const QString ¶m, const QString &value) } } - -void Network::removeSupport(const QString ¶m) +void Network::removeSupport(const QString& param) { if (_supports.contains(param)) { _supports.remove(param); @@ -760,7 +787,6 @@ void Network::removeSupport(const QString ¶m) } } - QVariantMap Network::initSupports() const { QVariantMap supports; @@ -772,7 +798,7 @@ QVariantMap Network::initSupports() const return supports; } -void Network::addCap(const QString &capability, const QString &value) +void Network::addCap(const QString& capability, const QString& value) { // IRCv3 specs all use lowercase capability names QString _capLowercase = capability.toLower(); @@ -783,7 +809,7 @@ void Network::addCap(const QString &capability, const QString &value) } } -void Network::acknowledgeCap(const QString &capability) +void Network::acknowledgeCap(const QString& capability) { // IRCv3 specs all use lowercase capability names QString _capLowercase = capability.toLower(); @@ -794,7 +820,7 @@ void Network::acknowledgeCap(const QString &capability) } } -void Network::removeCap(const QString &capability) +void Network::removeCap(const QString& capability) { // IRCv3 specs all use lowercase capability names QString _capLowercase = capability.toLower(); @@ -821,7 +847,7 @@ void Network::clearCaps() // If performance issues arise, this can be converted to a more-efficient setup without breaking // protocol (in theory). QString _capLowercase; - foreach (const QString &capability, _caps) { + foreach (const QString& capability, _caps) { _capLowercase = capability.toLower(); emit capRemoved(_capLowercase); } @@ -843,7 +869,6 @@ QVariantMap Network::initCaps() const return caps; } - // There's potentially a lot of users and channels, so it makes sense to optimize the format of this. // Rather than sending a thousand maps with identical keys, we convert this into one map containing lists // where each list index corresponds to a particular IrcUser. This saves sending the key names a thousand times. @@ -851,14 +876,30 @@ QVariantMap Network::initCaps() const // (without compression) with a decent amount of IrcUsers. QVariantMap Network::initIrcUsersAndChannels() const { + Q_ASSERT(proxy()); + Q_ASSERT(proxy()->targetPeer()); QVariantMap usersAndChannels; if (_ircUsers.count()) { QHash users; - QHash::const_iterator it = _ircUsers.begin(); - QHash::const_iterator end = _ircUsers.end(); + QHash::const_iterator it = _ircUsers.begin(); + QHash::const_iterator end = _ircUsers.end(); while (it != end) { - const QVariantMap &map = it.value()->toVariantMap(); + QVariantMap map = it.value()->toVariantMap(); + // If the peer doesn't support LongTime, replace the lastAwayMessageTime field + // with the 32-bit numerical seconds value (lastAwayMessage) used in older versions + if (!proxy()->targetPeer()->hasFeature(Quassel::Feature::LongTime)) { +#if QT_VERSION >= 0x050800 + int lastAwayMessage = it.value()->lastAwayMessageTime().toSecsSinceEpoch(); +#else + // toSecsSinceEpoch() was added in Qt 5.8. Manually downconvert to seconds for now. + // See https://doc.qt.io/qt-5/qdatetime.html#toMSecsSinceEpoch + int lastAwayMessage = it.value()->lastAwayMessageTime().toMSecsSinceEpoch() / 1000; +#endif + map.remove("lastAwayMessageTime"); + map["lastAwayMessage"] = lastAwayMessage; + } + QVariantMap::const_iterator mapiter = map.begin(); while (mapiter != map.end()) { users[mapiter.key()] << mapiter.value(); @@ -869,17 +910,17 @@ QVariantMap Network::initIrcUsersAndChannels() const // Can't have a container with a value type != QVariant in a QVariant :( // However, working directly on a QVariantMap is awkward for appending, thus the detour via the hash above. QVariantMap userMap; - foreach(const QString &key, users.keys()) + foreach (const QString& key, users.keys()) userMap[key] = users[key]; usersAndChannels["Users"] = userMap; } if (_ircChannels.count()) { QHash channels; - QHash::const_iterator it = _ircChannels.begin(); - QHash::const_iterator end = _ircChannels.end(); + QHash::const_iterator it = _ircChannels.begin(); + QHash::const_iterator end = _ircChannels.end(); while (it != end) { - const QVariantMap &map = it.value()->toVariantMap(); + const QVariantMap& map = it.value()->toVariantMap(); QVariantMap::const_iterator mapiter = map.begin(); while (mapiter != map.end()) { channels[mapiter.key()] << mapiter.value(); @@ -888,7 +929,7 @@ QVariantMap Network::initIrcUsersAndChannels() const ++it; } QVariantMap channelMap; - foreach(const QString &key, channels.keys()) + foreach (const QString& key, channels.keys()) channelMap[key] = channels[key]; usersAndChannels["Channels"] = channelMap; } @@ -896,23 +937,24 @@ QVariantMap Network::initIrcUsersAndChannels() const return usersAndChannels; } - -void Network::initSetIrcUsersAndChannels(const QVariantMap &usersAndChannels) +void Network::initSetIrcUsersAndChannels(const QVariantMap& usersAndChannels) { Q_ASSERT(proxy()); + Q_ASSERT(proxy()->sourcePeer()); if (isInitialized()) { - qWarning() << "Network" << networkId() << "received init data for users and channels although there already are known users or channels!"; + qWarning() << "Network" << networkId() + << "received init data for users and channels although there already are known users or channels!"; return; } // toMap() and toList() are cheap, so we can avoid copying to lists... // However, we really have to make sure to never accidentally detach from the shared data! - const QVariantMap &users = usersAndChannels["Users"].toMap(); + const QVariantMap& users = usersAndChannels["Users"].toMap(); // sanity check int count = users["nick"].toList().count(); - foreach(const QString &key, users.keys()) { + foreach (const QString& key, users.keys()) { if (users[key].toList().count() != count) { qWarning() << "Received invalid usersAndChannels init data, sizes of attribute lists don't match!"; return; @@ -920,35 +962,50 @@ void Network::initSetIrcUsersAndChannels(const QVariantMap &usersAndChannels) } // now create the individual IrcUsers - for(int i = 0; i < count; i++) { + for (int i = 0; i < count; i++) { QVariantMap map; - foreach(const QString &key, users.keys()) + foreach (const QString& key, users.keys()) map[key] = users[key].toList().at(i); - newIrcUser(map["nick"].toString(), map); // newIrcUser() properly handles the hostmask being just the nick + + // If the peer doesn't support LongTime, upconvert the lastAwayMessageTime field + // from the 32-bit numerical seconds value used in older versions to QDateTime + if (!proxy()->sourcePeer()->hasFeature(Quassel::Feature::LongTime)) { + QDateTime lastAwayMessageTime = QDateTime(); + lastAwayMessageTime.setTimeSpec(Qt::UTC); +#if QT_VERSION >= 0x050800 + lastAwayMessageTime.fromSecsSinceEpoch(map.take("lastAwayMessage").toInt()); +#else + // toSecsSinceEpoch() was added in Qt 5.8. Manually downconvert to seconds for now. + // See https://doc.qt.io/qt-5/qdatetime.html#toMSecsSinceEpoch + lastAwayMessageTime.fromMSecsSinceEpoch(map.take("lastAwayMessage").toInt() * 1000); +#endif + map["lastAwayMessageTime"] = lastAwayMessageTime; + } + + newIrcUser(map["nick"].toString(), map); // newIrcUser() properly handles the hostmask being just the nick } // same thing for IrcChannels - const QVariantMap &channels = usersAndChannels["Channels"].toMap(); + const QVariantMap& channels = usersAndChannels["Channels"].toMap(); // sanity check count = channels["name"].toList().count(); - foreach(const QString &key, channels.keys()) { + foreach (const QString& key, channels.keys()) { if (channels[key].toList().count() != count) { qWarning() << "Received invalid usersAndChannels init data, sizes of attribute lists don't match!"; return; } } // now create the individual IrcChannels - for(int i = 0; i < count; i++) { + for (int i = 0; i < count; i++) { QVariantMap map; - foreach(const QString &key, channels.keys()) + foreach (const QString& key, channels.keys()) map[key] = channels[key].toList().at(i); newIrcChannel(map["name"].toString(), map); } } - -void Network::initSetSupports(const QVariantMap &supports) +void Network::initSetSupports(const QVariantMap& supports) { QMapIterator iter(supports); while (iter.hasNext()) { @@ -957,8 +1014,7 @@ void Network::initSetSupports(const QVariantMap &supports) } } - -void Network::initSetCaps(const QVariantMap &caps) +void Network::initSetCaps(const QVariantMap& caps) { QMapIterator iter(caps); while (iter.hasNext()) { @@ -967,11 +1023,10 @@ void Network::initSetCaps(const QVariantMap &caps) } } - -IrcUser *Network::updateNickFromMask(const QString &mask) +IrcUser* Network::updateNickFromMask(const QString& mask) { QString nick(nickFromMask(mask).toLower()); - IrcUser *ircuser; + IrcUser* ircuser; if (_ircUsers.contains(nick)) { ircuser = _ircUsers[nick]; @@ -983,27 +1038,25 @@ IrcUser *Network::updateNickFromMask(const QString &mask) return ircuser; } - void Network::ircUserNickChanged(QString newnick) { - QString oldnick = _ircUsers.key(qobject_cast(sender())); + QString oldnick = _ircUsers.key(qobject_cast(sender())); if (oldnick.isNull()) return; - if (newnick.toLower() != oldnick) _ircUsers[newnick.toLower()] = _ircUsers.take(oldnick); + if (newnick.toLower() != oldnick) + _ircUsers[newnick.toLower()] = _ircUsers.take(oldnick); if (myNick().toLower() == oldnick) setMyNick(newnick); } - -void Network::emitConnectionError(const QString &errorMsg) +void Network::emitConnectionError(const QString& errorMsg) { emit connectionError(errorMsg); } - // ==================== // Private: // ==================== @@ -1052,154 +1105,123 @@ void Network::determinePrefixes() const } } - /************************************************************************ * NetworkInfo ************************************************************************/ -NetworkInfo::NetworkInfo() - : networkId(0), - identity(1), - useRandomServer(false), - useAutoIdentify(false), - autoIdentifyService("NickServ"), - useSasl(false), - useAutoReconnect(true), - autoReconnectInterval(60), - autoReconnectRetries(20), - unlimitedReconnectRetries(false), - rejoinChannels(true), - useCustomMessageRate(false), - messageRateBurstSize(5), - messageRateDelay(2200), - unlimitedMessageRate(false) -{ -} - - -bool NetworkInfo::operator==(const NetworkInfo &other) const -{ - if (networkId != other.networkId) return false; - if (networkName != other.networkName) return false; - if (identity != other.identity) return false; - if (codecForServer != other.codecForServer) return false; - if (codecForEncoding != other.codecForEncoding) return false; - if (codecForDecoding != other.codecForDecoding) return false; - if (serverList != other.serverList) return false; - if (useRandomServer != other.useRandomServer) return false; - if (perform != other.perform) return false; - if (useAutoIdentify != other.useAutoIdentify) return false; - if (autoIdentifyService != other.autoIdentifyService) return false; - if (autoIdentifyPassword != other.autoIdentifyPassword) return false; - if (useSasl != other.useSasl) return false; - if (saslAccount != other.saslAccount) return false; - if (saslPassword != other.saslPassword) return false; - if (useAutoReconnect != other.useAutoReconnect) return false; - if (autoReconnectInterval != other.autoReconnectInterval) return false; - if (autoReconnectRetries != other.autoReconnectRetries) return false; - if (unlimitedReconnectRetries != other.unlimitedReconnectRetries) return false; - if (rejoinChannels != other.rejoinChannels) return false; - // Custom rate limiting - if (useCustomMessageRate != other.useCustomMessageRate) return false; - if (messageRateBurstSize != other.messageRateBurstSize) return false; - if (messageRateDelay != other.messageRateDelay) return false; - if (unlimitedMessageRate != other.unlimitedMessageRate) return false; - return true; -} - - -bool NetworkInfo::operator!=(const NetworkInfo &other) const +bool NetworkInfo::operator==(const NetworkInfo& other) const +{ + return networkName == other.networkName + && serverList == other.serverList + && perform == other.perform + && autoIdentifyService == other.autoIdentifyService + && autoIdentifyPassword == other.autoIdentifyPassword + && saslAccount == other.saslAccount + && saslPassword == other.saslPassword + && codecForServer == other.codecForServer + && codecForEncoding == other.codecForEncoding + && codecForDecoding == other.codecForDecoding + && networkId == other.networkId + && identity == other.identity + && messageRateBurstSize == other.messageRateBurstSize + && messageRateDelay == other.messageRateDelay + && autoReconnectInterval == other.autoReconnectInterval + && autoReconnectRetries == other.autoReconnectRetries + && rejoinChannels == other.rejoinChannels + && useRandomServer == other.useRandomServer + && useAutoIdentify == other.useAutoIdentify + && useSasl == other.useSasl + && useAutoReconnect == other.useAutoReconnect + && unlimitedReconnectRetries == other.unlimitedReconnectRetries + && useCustomMessageRate == other.useCustomMessageRate + && unlimitedMessageRate == other.unlimitedMessageRate + ; +} + +bool NetworkInfo::operator!=(const NetworkInfo& other) const { return !(*this == other); } - -QDataStream &operator<<(QDataStream &out, const NetworkInfo &info) +QDataStream& operator<<(QDataStream& out, const NetworkInfo& info) { QVariantMap i; - i["NetworkId"] = QVariant::fromValue(info.networkId); - i["NetworkName"] = info.networkName; - i["Identity"] = QVariant::fromValue(info.identity); - i["CodecForServer"] = info.codecForServer; - i["CodecForEncoding"] = info.codecForEncoding; - i["CodecForDecoding"] = info.codecForDecoding; - i["ServerList"] = toVariantList(info.serverList); - i["UseRandomServer"] = info.useRandomServer; - i["Perform"] = info.perform; - i["UseAutoIdentify"] = info.useAutoIdentify; - i["AutoIdentifyService"] = info.autoIdentifyService; - i["AutoIdentifyPassword"] = info.autoIdentifyPassword; - i["UseSasl"] = info.useSasl; - i["SaslAccount"] = info.saslAccount; - i["SaslPassword"] = info.saslPassword; - i["UseAutoReconnect"] = info.useAutoReconnect; - i["AutoReconnectInterval"] = info.autoReconnectInterval; - i["AutoReconnectRetries"] = info.autoReconnectRetries; + i["NetworkName"] = info.networkName; + i["ServerList"] = toVariantList(info.serverList); + i["Perform"] = info.perform; + i["AutoIdentifyService"] = info.autoIdentifyService; + i["AutoIdentifyPassword"] = info.autoIdentifyPassword; + i["SaslAccount"] = info.saslAccount; + i["SaslPassword"] = info.saslPassword; + i["CodecForServer"] = info.codecForServer; + i["CodecForEncoding"] = info.codecForEncoding; + i["CodecForDecoding"] = info.codecForDecoding; + i["NetworkId"] = QVariant::fromValue(info.networkId); + i["Identity"] = QVariant::fromValue(info.identity); + i["MessageRateBurstSize"] = info.messageRateBurstSize; + i["MessageRateDelay"] = info.messageRateDelay; + i["AutoReconnectInterval"] = info.autoReconnectInterval; + i["AutoReconnectRetries"] = info.autoReconnectRetries; + i["RejoinChannels"] = info.rejoinChannels; + i["UseRandomServer"] = info.useRandomServer; + i["UseAutoIdentify"] = info.useAutoIdentify; + i["UseSasl"] = info.useSasl; + i["UseAutoReconnect"] = info.useAutoReconnect; i["UnlimitedReconnectRetries"] = info.unlimitedReconnectRetries; - i["RejoinChannels"] = info.rejoinChannels; - // Custom rate limiting - i["UseCustomMessageRate"] = info.useCustomMessageRate; - i["MessageRateBurstSize"] = info.messageRateBurstSize; - i["MessageRateDelay"] = info.messageRateDelay; - i["UnlimitedMessageRate"] = info.unlimitedMessageRate; + i["UseCustomMessageRate"] = info.useCustomMessageRate; + i["UnlimitedMessageRate"] = info.unlimitedMessageRate; out << i; return out; } - -QDataStream &operator>>(QDataStream &in, NetworkInfo &info) +QDataStream& operator>>(QDataStream& in, NetworkInfo& info) { QVariantMap i; in >> i; - info.networkId = i["NetworkId"].value(); - info.networkName = i["NetworkName"].toString(); - info.identity = i["Identity"].value(); - info.codecForServer = i["CodecForServer"].toByteArray(); - info.codecForEncoding = i["CodecForEncoding"].toByteArray(); - info.codecForDecoding = i["CodecForDecoding"].toByteArray(); - info.serverList = fromVariantList(i["ServerList"].toList()); - info.useRandomServer = i["UseRandomServer"].toBool(); - info.perform = i["Perform"].toStringList(); - info.useAutoIdentify = i["UseAutoIdentify"].toBool(); - info.autoIdentifyService = i["AutoIdentifyService"].toString(); - info.autoIdentifyPassword = i["AutoIdentifyPassword"].toString(); - info.useSasl = i["UseSasl"].toBool(); - info.saslAccount = i["SaslAccount"].toString(); - info.saslPassword = i["SaslPassword"].toString(); - info.useAutoReconnect = i["UseAutoReconnect"].toBool(); - info.autoReconnectInterval = i["AutoReconnectInterval"].toUInt(); - info.autoReconnectRetries = i["AutoReconnectRetries"].toInt(); + info.networkName = i["NetworkName"].toString(); + info.serverList = fromVariantList(i["ServerList"].toList()); + info.perform = i["Perform"].toStringList(); + info.autoIdentifyService = i["AutoIdentifyService"].toString(); + info.autoIdentifyPassword = i["AutoIdentifyPassword"].toString(); + info.saslAccount = i["SaslAccount"].toString(); + info.saslPassword = i["SaslPassword"].toString(); + info.codecForServer = i["CodecForServer"].toByteArray(); + info.codecForEncoding = i["CodecForEncoding"].toByteArray(); + info.codecForDecoding = i["CodecForDecoding"].toByteArray(); + info.networkId = i["NetworkId"].value(); + info.identity = i["Identity"].value(); + info.messageRateBurstSize = i["MessageRateBurstSize"].toUInt(); + info.messageRateDelay = i["MessageRateDelay"].toUInt(); + info.autoReconnectInterval = i["AutoReconnectInterval"].toUInt(); + info.autoReconnectRetries = i["AutoReconnectRetries"].toInt(); + info.rejoinChannels = i["RejoinChannels"].toBool(); + info.useRandomServer = i["UseRandomServer"].toBool(); + info.useAutoIdentify = i["UseAutoIdentify"].toBool(); + info.useSasl = i["UseSasl"].toBool(); + info.useAutoReconnect = i["UseAutoReconnect"].toBool(); info.unlimitedReconnectRetries = i["UnlimitedReconnectRetries"].toBool(); - info.rejoinChannels = i["RejoinChannels"].toBool(); - // Custom rate limiting - info.useCustomMessageRate = i["UseCustomMessageRate"].toBool(); - info.messageRateBurstSize = i["MessageRateBurstSize"].toUInt(); - info.messageRateDelay = i["MessageRateDelay"].toUInt(); - info.unlimitedMessageRate = i["UnlimitedMessageRate"].toBool(); + info.useCustomMessageRate = i["UseCustomMessageRate"].toBool(); + info.unlimitedMessageRate = i["UnlimitedMessageRate"].toBool(); return in; } - -QDebug operator<<(QDebug dbg, const NetworkInfo &i) +QDebug operator<<(QDebug dbg, const NetworkInfo& i) { dbg.nospace() << "(id = " << i.networkId << " name = " << i.networkName << " identity = " << i.identity - << " codecForServer = " << i.codecForServer << " codecForEncoding = " << i.codecForEncoding << " codecForDecoding = " << i.codecForDecoding - << " serverList = " << i.serverList << " useRandomServer = " << i.useRandomServer << " perform = " << i.perform - << " useAutoIdentify = " << i.useAutoIdentify << " autoIdentifyService = " << i.autoIdentifyService << " autoIdentifyPassword = " << i.autoIdentifyPassword - << " useSasl = " << i.useSasl << " saslAccount = " << i.saslAccount << " saslPassword = " << i.saslPassword - << " useAutoReconnect = " << i.useAutoReconnect << " autoReconnectInterval = " << i.autoReconnectInterval - << " autoReconnectRetries = " << i.autoReconnectRetries << " unlimitedReconnectRetries = " << i.unlimitedReconnectRetries - << " rejoinChannels = " << i.rejoinChannels - << " useCustomMessageRate = " << i.useCustomMessageRate - << " messageRateBurstSize = " << i.messageRateBurstSize - << " messageRateDelay = " << i.messageRateDelay - << " unlimitedMessageRate = " << i.unlimitedMessageRate - << ")"; + << " codecForServer = " << i.codecForServer << " codecForEncoding = " << i.codecForEncoding + << " codecForDecoding = " << i.codecForDecoding << " serverList = " << i.serverList + << " useRandomServer = " << i.useRandomServer << " perform = " << i.perform << " useAutoIdentify = " << i.useAutoIdentify + << " autoIdentifyService = " << i.autoIdentifyService << " autoIdentifyPassword = " << i.autoIdentifyPassword + << " useSasl = " << i.useSasl << " saslAccount = " << i.saslAccount << " saslPassword = " << i.saslPassword + << " useAutoReconnect = " << i.useAutoReconnect << " autoReconnectInterval = " << i.autoReconnectInterval + << " autoReconnectRetries = " << i.autoReconnectRetries << " unlimitedReconnectRetries = " << i.unlimitedReconnectRetries + << " rejoinChannels = " << i.rejoinChannels << " useCustomMessageRate = " << i.useCustomMessageRate + << " messageRateBurstSize = " << i.messageRateBurstSize << " messageRateDelay = " << i.messageRateDelay + << " unlimitedMessageRate = " << i.unlimitedMessageRate << ")"; return dbg.space(); } - -QDataStream &operator<<(QDataStream &out, const Network::Server &server) +QDataStream& operator<<(QDataStream& out, const Network::Server& server) { QVariantMap serverMap; serverMap["Host"] = server.host; @@ -1218,8 +1240,7 @@ QDataStream &operator<<(QDataStream &out, const Network::Server &server) return out; } - -QDataStream &operator>>(QDataStream &in, Network::Server &server) +QDataStream& operator>>(QDataStream& in, Network::Server& server) { QVariantMap serverMap; in >> serverMap; @@ -1238,34 +1259,43 @@ QDataStream &operator>>(QDataStream &in, Network::Server &server) return in; } - -bool Network::Server::operator==(const Server &other) const +bool Network::Server::operator==(const Server& other) const { - if (host != other.host) return false; - if (port != other.port) return false; - if (password != other.password) return false; - if (useSsl != other.useSsl) return false; - if (sslVerify != other.sslVerify) return false; - if (sslVersion != other.sslVersion) return false; - if (useProxy != other.useProxy) return false; - if (proxyType != other.proxyType) return false; - if (proxyHost != other.proxyHost) return false; - if (proxyPort != other.proxyPort) return false; - if (proxyUser != other.proxyUser) return false; - if (proxyPass != other.proxyPass) return false; + if (host != other.host) + return false; + if (port != other.port) + return false; + if (password != other.password) + return false; + if (useSsl != other.useSsl) + return false; + if (sslVerify != other.sslVerify) + return false; + if (sslVersion != other.sslVersion) + return false; + if (useProxy != other.useProxy) + return false; + if (proxyType != other.proxyType) + return false; + if (proxyHost != other.proxyHost) + return false; + if (proxyPort != other.proxyPort) + return false; + if (proxyUser != other.proxyUser) + return false; + if (proxyPass != other.proxyPass) + return false; return true; } - -bool Network::Server::operator!=(const Server &other) const +bool Network::Server::operator!=(const Server& other) const { return !(*this == other); } - -QDebug operator<<(QDebug dbg, const Network::Server &server) +QDebug operator<<(QDebug dbg, const Network::Server& server) { - dbg.nospace() << "Server(host = " << server.host << ":" << server.port << ", useSsl = " << - server.useSsl << ", sslVerify = " << server.sslVerify << ")"; + dbg.nospace() << "Server(host = " << server.host << ":" << server.port << ", useSsl = " << server.useSsl + << ", sslVerify = " << server.sslVerify << ")"; return dbg.space(); }