X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetwork.cpp;h=df2a8376788417225175b6854ea61040be960cf0;hp=b565a78e104e8757d46d69c493355fb6767a44eb;hb=a5dfcc8ecf8b81025d24b3c5c816169e3e030ea4;hpb=8010224cf5bfe5685dc2cf535e8dc1ec19c4c364 diff --git a/src/common/network.cpp b/src/common/network.cpp index b565a78e..df2a8376 100644 --- a/src/common/network.cpp +++ b/src/common/network.cpp @@ -19,10 +19,6 @@ ***************************************************************************/ #include "network.h" -#include "signalproxy.h" -#include "ircuser.h" -#include "ircchannel.h" - #include #include @@ -32,14 +28,30 @@ QTextCodec *Network::_defaultCodecForServer = 0; QTextCodec *Network::_defaultCodecForEncoding = 0; QTextCodec *Network::_defaultCodecForDecoding = 0; +Network::Server Network::Server::fromVariant(const QVariant &variant) { + QVariantMap serverMap = variant.toMap(); + return Server(serverMap["Host"].toString(), serverMap["Port"].toUInt(), serverMap["Password"].toString(), serverMap["UseSSL"].toBool()); +} + +QVariant Network::Server::toVariant() const { + QVariantMap serverMap; + serverMap["Host"] = host; + serverMap["Port"] = port; + serverMap["Password"] = password; + serverMap["UseSSL"] = useSsl; + return QVariant::fromValue(serverMap); +} + // ==================== // Public: // ==================== -Network::Network(const NetworkId &networkid, QObject *parent) : SyncableObject(parent), +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), @@ -54,64 +66,26 @@ Network::Network(const NetworkId &networkid, QObject *parent) : SyncableObject(p _unlimitedReconnectRetries(false), _codecForServer(0), _codecForEncoding(0), - _codecForDecoding(0) + _codecForDecoding(0), + _autoAwayActive(false) { setObjectName(QString::number(networkid.toInt())); } -// I think this is unnecessary since IrcUsers have us as their daddy :) - Network::~Network() { emit aboutToBeDestroyed(); -// QHashIterator ircuser(_ircUsers); -// while (ircuser.hasNext()) { -// ircuser.next(); -// delete ircuser.value(); -// } -// qDebug() << "Destroying net" << networkName() << networkId(); -} - - -NetworkId Network::networkId() const { - return _networkId; -} - -SignalProxy *Network::proxy() const { - return _proxy; -} - -void Network::setProxy(SignalProxy *proxy) { - _proxy = proxy; - //proxy->synchronize(this); // we should to this explicitly from the outside! -} - -bool Network::isMyNick(const QString &nick) const { - return (myNick().toLower() == nick.toLower()); -} - -bool Network::isMe(IrcUser *ircuser) const { - return (ircuser->nick().toLower() == myNick().toLower()); } bool Network::isChannelName(const QString &channelname) const { if(channelname.isEmpty()) return false; - + if(supports("CHANTYPES")) return support("CHANTYPES").contains(channelname[0]); else return QString("#&!+").contains(channelname[0]); } -bool Network::isConnected() const { - return _connected; -} - -//Network::ConnectionState Network::connectionState() const { -int Network::connectionState() const { - return _connectionState; -} - NetworkInfo Network::networkInfo() const { NetworkInfo info; info.networkName = networkName(); @@ -120,7 +94,7 @@ NetworkInfo Network::networkInfo() const { info.codecForServer = codecForServer(); info.codecForEncoding = codecForEncoding(); info.codecForDecoding = codecForDecoding(); - info.serverList = serverList(); + info.serverList = variantServerList(); info.useRandomServer = useRandomServer(); info.perform = perform(); info.useAutoIdentify = useAutoIdentify(); @@ -161,10 +135,6 @@ QString Network::prefixToMode(const QString &prefix) { return QString(); } -QString Network::prefixToMode(const QCharRef &prefix) { - return prefixToMode(QString(prefix)); -} - QString Network::modeToPrefix(const QString &mode) { if(prefixModes().contains(mode)) return QString(prefixes()[prefixModes().indexOf(mode)]); @@ -172,26 +142,6 @@ QString Network::modeToPrefix(const QString &mode) { return QString(); } -QString Network::modeToPrefix(const QCharRef &mode) { - return modeToPrefix(QString(mode)); -} - -QString Network::networkName() const { - return _networkName; -} - -QString Network::currentServer() const { - return _currentServer; -} - -QString Network::myNick() const { - return _myNick; -} - -IdentityId Network::identity() const { - return _identity; -} - QStringList Network::nicks() const { // we don't use _ircUsers.keys() since the keys may be // not up to date after a nick change @@ -202,58 +152,20 @@ QStringList Network::nicks() const { return nicks; } -QStringList Network::channels() const { - return _ircChannels.keys(); -} - -QVariantList Network::serverList() const { - return _serverList; -} - -bool Network::useRandomServer() const { - return _useRandomServer; -} - -QStringList Network::perform() const { - return _perform; -} - -bool Network::useAutoIdentify() const { - return _useAutoIdentify; -} - -QString Network::autoIdentifyService() const { - return _autoIdentifyService; -} - -QString Network::autoIdentifyPassword() const { - return _autoIdentifyPassword; -} - -bool Network::useAutoReconnect() const { - return _useAutoReconnect; -} - -quint32 Network::autoReconnectInterval() const { - return _autoReconnectInterval; -} - -quint16 Network::autoReconnectRetries() const { - return _autoReconnectRetries; -} - -bool Network::unlimitedReconnectRetries() const { - return _unlimitedReconnectRetries; -} - -bool Network::rejoinChannels() const { - return _rejoinChannels; +QVariantList Network::variantServerList() const { + QVariantList servers; + ServerList::const_iterator serverIter = _serverList.constBegin(); + while(serverIter != _serverList.constEnd()) { + servers << serverIter->toVariant(); + serverIter++; + } + return servers; } QString Network::prefixes() { if(_prefixes.isNull()) determinePrefixes(); - + return _prefixes; } @@ -264,8 +176,27 @@ QString Network::prefixModes() { return _prefixModes; } -bool Network::supports(const QString ¶m) const { - return _supports.contains(param); +// example Unreal IRCD: CHANMODES=beI,kfL,lj,psmntirRcOAQKVCuzNSMTG +Network::ChannelModeType Network::channelModeType(const QString &mode) { + if(mode.isEmpty()) + return NOT_A_CHANMODE; + + QString chanmodes = support("CHANMODES"); + if(chanmodes.isEmpty()) + return NOT_A_CHANMODE; + + ChannelModeType modeType = A_CHANMODE; + for(int i = 0; i < chanmodes.count(); i++) { + if(chanmodes[i] == mode[0]) + break; + else if(chanmodes[i] == ',') + modeType = (ChannelModeType)(modeType << 1); + } + if(modeType > D_CHANMODE) { + qWarning() << "Network" << networkId() << "supplied invalid CHANMODES:" << chanmodes; + modeType = NOT_A_CHANMODE; + } + return modeType; } QString Network::support(const QString ¶m) const { @@ -276,29 +207,37 @@ QString Network::support(const QString ¶m) const { return QString(); } -IrcUser *Network::newIrcUser(const QString &hostmask) { +IrcUser *Network::newIrcUser(const QString &hostmask, const QVariantMap &initData) { QString nick(nickFromMask(hostmask).toLower()); if(!_ircUsers.contains(nick)) { IrcUser *ircuser = new IrcUser(hostmask, this); - // mark IrcUser as already initialized to keep the SignalProxy from requesting initData - //if(isInitialized()) - // ircuser->setInitialized(); + if(!initData.isEmpty()) { + ircuser->fromVariantMap(initData); + ircuser->setInitialized(); + } + if(proxy()) proxy()->synchronize(ircuser); 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, SIGNAL(initDone()), this, SLOT(ircUserInitDone())); + _ircUsers[nick] = ircuser; + emit ircUserAdded(hostmask); emit ircUserAdded(ircuser); } + return _ircUsers[nick]; } -IrcUser *Network::newIrcUser(const QByteArray &hostmask) { - return newIrcUser(decodeServerString(hostmask)); +IrcUser *Network::ircUser(QString nickname) const { + nickname = nickname.toLower(); + if(_ircUsers.contains(nickname)) + return _ircUsers[nickname]; + else + return 0; } void Network::removeIrcUser(IrcUser *ircuser) { @@ -308,73 +247,64 @@ void Network::removeIrcUser(IrcUser *ircuser) { _ircUsers.remove(nick); disconnect(ircuser, 0, this, 0); - emit ircUserRemoved(nick); - emit ircUserRemoved(ircuser); ircuser->deleteLater(); } +void Network::removeIrcChannel(IrcChannel *channel) { + QString chanName = _ircChannels.key(channel); + if(chanName.isNull()) + return; + + _ircChannels.remove(chanName); + disconnect(channel, 0, this, 0); + channel->deleteLater(); +} + void Network::removeChansAndUsers() { QList users = ircUsers(); - foreach(IrcUser *user, users) { - removeIrcUser(user); - } + _ircUsers.clear(); QList channels = ircChannels(); + _ircChannels.clear(); + foreach(IrcChannel *channel, channels) { - removeIrcChannel(channel); + proxy()->detachObject(channel); + disconnect(channel, 0, this, 0); + } + foreach(IrcUser *user, users) { + proxy()->detachObject(user); + disconnect(user, 0, this, 0); } -} - -void Network::removeIrcUser(const QString &nick) { - IrcUser *ircuser; - if((ircuser = ircUser(nick)) != 0) - removeIrcUser(ircuser); -} - -IrcUser *Network::ircUser(QString nickname) const { - nickname = nickname.toLower(); - if(_ircUsers.contains(nickname)) - return _ircUsers[nickname]; - else - return 0; -} - -IrcUser *Network::ircUser(const QByteArray &nickname) const { - return ircUser(decodeServerString(nickname)); -} -QList Network::ircUsers() const { - return _ircUsers.values(); -} + // the second loop is needed because quit can have sideffects + foreach(IrcUser *user, users) { + user->quit(); + } -quint32 Network::ircUserCount() const { - return _ircUsers.count(); + qDeleteAll(users); + qDeleteAll(channels); } -IrcChannel *Network::newIrcChannel(const QString &channelname) { +IrcChannel *Network::newIrcChannel(const QString &channelname, const QVariantMap &initData) { if(!_ircChannels.contains(channelname.toLower())) { - IrcChannel *channel = new IrcChannel(channelname, this); - // mark IrcUser as already initialized to keep the SignalProxy from requesting initData - //if(isInitialized()) - // channel->setInitialized(); + IrcChannel *channel = ircChannelFactory(channelname); + if(!initData.isEmpty()) { + channel->fromVariantMap(initData); + channel->setInitialized(); + } if(proxy()) proxy()->synchronize(channel); else qWarning() << "unable to synchronize new IrcChannel" << channelname << "forgot to call Network::setProxy(SignalProxy *)?"; - connect(channel, SIGNAL(initDone()), this, SLOT(ircChannelInitDone())); - connect(channel, SIGNAL(destroyed()), this, SLOT(channelDestroyed())); _ircChannels[channelname.toLower()] = channel; + emit ircChannelAdded(channelname); emit ircChannelAdded(channel); } return _ircChannels[channelname.toLower()]; } -IrcChannel *Network::newIrcChannel(const QByteArray &channelname) { - return newIrcChannel(decodeServerString(channelname)); -} - IrcChannel *Network::ircChannel(QString channelname) const { channelname = channelname.toLower(); if(_ircChannels.contains(channelname)) @@ -383,21 +313,9 @@ IrcChannel *Network::ircChannel(QString channelname) const { return 0; } -IrcChannel *Network::ircChannel(const QByteArray &channelname) const { - return ircChannel(decodeServerString(channelname)); -} - - -QList Network::ircChannels() const { - return _ircChannels.values(); -} - -quint32 Network::ircChannelCount() const { - return _ircChannels.count(); -} - QByteArray Network::defaultCodecForServer() { - if(_defaultCodecForServer) return _defaultCodecForServer->name(); + if(_defaultCodecForServer) + return _defaultCodecForServer->name(); return QByteArray(); } @@ -406,7 +324,8 @@ void Network::setDefaultCodecForServer(const QByteArray &name) { } QByteArray Network::defaultCodecForEncoding() { - if(_defaultCodecForEncoding) return _defaultCodecForEncoding->name(); + if(_defaultCodecForEncoding) + return _defaultCodecForEncoding->name(); return QByteArray(); } @@ -415,7 +334,8 @@ void Network::setDefaultCodecForEncoding(const QByteArray &name) { } QByteArray Network::defaultCodecForDecoding() { - if(_defaultCodecForDecoding) return _defaultCodecForDecoding->name(); + if(_defaultCodecForDecoding) + return _defaultCodecForDecoding->name(); return QByteArray(); } @@ -424,7 +344,8 @@ void Network::setDefaultCodecForDecoding(const QByteArray &name) { } QByteArray Network::codecForServer() const { - if(_codecForServer) return _codecForServer->name(); + if(_codecForServer) + return _codecForServer->name(); return QByteArray(); } @@ -438,7 +359,8 @@ void Network::setCodecForServer(QTextCodec *codec) { } QByteArray Network::codecForEncoding() const { - if(_codecForEncoding) return _codecForEncoding->name(); + if(_codecForEncoding) + return _codecForEncoding->name(); return QByteArray(); } @@ -452,7 +374,8 @@ void Network::setCodecForEncoding(QTextCodec *codec) { } QByteArray Network::codecForDecoding() const { - if(_codecForDecoding) return _codecForDecoding->name(); + if(_codecForDecoding) + return _codecForDecoding->name(); else return QByteArray(); } @@ -467,7 +390,8 @@ void Network::setCodecForDecoding(QTextCodec *codec) { // FIXME use server encoding if appropriate QString Network::decodeString(const QByteArray &text) const { - if(_codecForDecoding) return ::decodeString(text, _codecForDecoding); + if(_codecForDecoding) + return ::decodeString(text, _codecForDecoding); else return ::decodeString(text, _defaultCodecForDecoding); } @@ -482,8 +406,10 @@ QByteArray Network::encodeString(const QString &string) const { } QString Network::decodeServerString(const QByteArray &text) const { - if(_codecForServer) return ::decodeString(text, _codecForServer); - else return ::decodeString(text, _defaultCodecForServer); + if(_codecForServer) + return ::decodeString(text, _codecForServer); + else + return ::decodeString(text, _defaultCodecForServer); } QByteArray Network::encodeServerString(const QString &string) const { @@ -510,10 +436,14 @@ void Network::setCurrentServer(const QString ¤tServer) { } void Network::setConnected(bool connected) { + if(_connected == connected) + return; + _connected = connected; if(!connected) { - removeChansAndUsers(); + setMyNick(QString()); setCurrentServer(QString()); + removeChansAndUsers(); } emit connectedSet(connected); } @@ -528,16 +458,29 @@ void Network::setConnectionState(int state) { void Network::setMyNick(const QString &nickname) { _myNick = nickname; + if(!_myNick.isEmpty() && !ircUser(myNick())) { + newIrcUser(myNick()); + } emit myNickSet(nickname); } +void Network::setLatency(int latency) { + if(_latency == latency) + return; + _latency = latency; + emit latencySet(latency); +} + void Network::setIdentity(IdentityId id) { _identity = id; emit identitySet(id); } void Network::setServerList(const QVariantList &serverList) { - _serverList = serverList; + _serverList.clear(); + foreach(QVariant variant, serverList) { + _serverList << Server::fromVariant(variant); + } emit serverListSet(serverList); } @@ -615,20 +558,52 @@ QVariantMap Network::initSupports() const { return supports; } -QVariantList Network::initServerList() const { - return serverList(); -} +QVariantMap Network::initIrcUsersAndChannels() const { + QVariantMap usersAndChannels; + QVariantMap users; + QVariantMap channels; -QStringList Network::initIrcUsers() const { - QStringList hostmasks; - foreach(IrcUser *ircuser, ircUsers()) { - hostmasks << ircuser->hostmask(); + QHash::const_iterator userIter = _ircUsers.constBegin(); + QHash::const_iterator userIterEnd = _ircUsers.constEnd(); + while(userIter != userIterEnd) { + users[userIter.value()->hostmask()] = userIter.value()->toVariantMap(); + userIter++; } - return hostmasks; + usersAndChannels["users"] = users; + + QHash::const_iterator channelIter = _ircChannels.constBegin(); + QHash::const_iterator channelIterEnd = _ircChannels.constEnd(); + while(channelIter != channelIterEnd) { + channels[channelIter.value()->name()] = channelIter.value()->toVariantMap(); + channelIter++; + } + usersAndChannels["channels"] = channels; + + return usersAndChannels; } -QStringList Network::initIrcChannels() const { - return _ircChannels.keys(); +void Network::initSetIrcUsersAndChannels(const QVariantMap &usersAndChannels) { + Q_ASSERT(proxy()); + if(isInitialized()) { + qWarning() << "Network" << networkId() << "received init data for users and channels allthough there allready are known users or channels!"; + return; + } + + QVariantMap users = usersAndChannels.value("users").toMap(); + QVariantMap::const_iterator userIter = users.constBegin(); + QVariantMap::const_iterator userIterEnd = users.constEnd(); + while(userIter != userIterEnd) { + newIrcUser(userIter.key(), userIter.value().toMap()); + userIter++; + } + + QVariantMap channels = usersAndChannels.value("channels").toMap(); + QVariantMap::const_iterator channelIter = channels.constBegin(); + QVariantMap::const_iterator channelIterEnd = channels.constEnd(); + while(channelIter != channelIterEnd) { + newIrcChannel(channelIter.key(), channelIter.value().toMap()); + channelIter++; + } } void Network::initSetSupports(const QVariantMap &supports) { @@ -639,29 +614,16 @@ void Network::initSetSupports(const QVariantMap &supports) { } } -void Network::initSetServerList(const QVariantList & serverList) { - setServerList(serverList); -} - -void Network::initSetIrcUsers(const QStringList &hostmasks) { - if(!_ircUsers.empty()) - return; - foreach(QString hostmask, hostmasks) { - newIrcUser(hostmask); +void Network::initSetServerList(const QVariantList &serverList) { + foreach(QVariant variant, serverList) { + _serverList << Server::fromVariant(variant); } } -void Network::initSetChannels(const QStringList &channels) { - if(!_ircChannels.empty()) - return; - foreach(QString channel, channels) - newIrcChannel(channel); -} - IrcUser *Network::updateNickFromMask(const QString &mask) { QString nick(nickFromMask(mask).toLower()); IrcUser *ircuser; - + if(_ircUsers.contains(nick)) { ircuser = _ircUsers[nick]; ircuser->updateHostmask(mask); @@ -683,67 +645,6 @@ void Network::ircUserNickChanged(QString newnick) { setMyNick(newnick); } -void Network::ircUserInitDone() { - IrcUser *ircuser = static_cast(sender()); - Q_ASSERT(ircuser); - emit ircUserInitDone(ircuser); -} - -void Network::ircChannelInitDone() { - IrcChannel *ircchannel = static_cast(sender()); - Q_ASSERT(ircchannel); - emit ircChannelInitDone(ircchannel); -} - -void Network::removeIrcChannel(IrcChannel *channel) { - QString chanName = _ircChannels.key(channel); - if(chanName.isNull()) - return; - - _ircChannels.remove(chanName); - disconnect(channel, 0, this, 0); - emit ircChannelRemoved(chanName); - emit ircChannelRemoved(channel); - channel->deleteLater(); -} - -void Network::removeIrcChannel(const QString &channel) { - IrcChannel *chan; - if((chan = ircChannel(channel)) != 0) - removeIrcChannel(chan); -} - -void Network::channelDestroyed() { - IrcChannel *channel = static_cast(sender()); - Q_ASSERT(channel); - _ircChannels.remove(_ircChannels.key(channel)); - emit ircChannelRemoved(channel); -} - -void Network::requestConnect() const { - if(!proxy()) return; - if(proxy()->proxyMode() == SignalProxy::Client) emit connectRequested(); // on the client this triggers calling this slot on the core - else { - if(connectionState() != Disconnected) { - qWarning() << "Requesting connect while already being connected!"; - return; - } - emit connectRequested(networkId()); // and this is for CoreSession :) - } -} - -void Network::requestDisconnect() const { - if(!proxy()) return; - if(proxy()->proxyMode() == SignalProxy::Client) emit disconnectRequested(); // on the client this triggers calling this slot on the core - else { - if(connectionState() == Disconnected) { - qWarning() << "Requesting disconnect while not being connected!"; - return; - } - emit disconnectRequested(networkId()); // and this is for CoreSession :) - } -} - void Network::emitConnectionError(const QString &errorMsg) { emit connectionError(errorMsg); } @@ -753,18 +654,24 @@ void Network::emitConnectionError(const QString &errorMsg) { // ==================== void Network::determinePrefixes() { // seems like we have to construct them first - QString PREFIX = support("PREFIX"); - - if(PREFIX.startsWith("(") && PREFIX.contains(")")) { - _prefixes = PREFIX.section(")", 1); - _prefixModes = PREFIX.mid(1).section(")", 0, 0); + QString prefix = support("PREFIX"); + + if(prefix.startsWith("(") && prefix.contains(")")) { + _prefixes = prefix.section(")", 1); + _prefixModes = prefix.mid(1).section(")", 0, 0); } else { QString defaultPrefixes("~&@%+"); QString defaultPrefixModes("qaohv"); + if(prefix.isEmpty()) { + _prefixes = defaultPrefixes; + _prefixModes = defaultPrefixModes; + return; + } + // we just assume that in PREFIX are only prefix chars stored for(int i = 0; i < defaultPrefixes.size(); i++) { - if(PREFIX.contains(defaultPrefixes[i])) { + if(prefix.contains(defaultPrefixes[i])) { _prefixes += defaultPrefixes[i]; _prefixModes += defaultPrefixModes[i]; } @@ -772,11 +679,11 @@ void Network::determinePrefixes() { // check for success if(!_prefixes.isNull()) return; - + // well... our assumption was obviously wrong... // check if it's only prefix modes for(int i = 0; i < defaultPrefixes.size(); i++) { - if(PREFIX.contains(defaultPrefixModes[i])) { + if(prefix.contains(defaultPrefixModes[i])) { _prefixes += defaultPrefixes[i]; _prefixModes += defaultPrefixModes[i]; } @@ -860,12 +767,13 @@ QDataStream &operator>>(QDataStream &in, NetworkInfo &info) { return in; } - - - - - - - - - +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 + << " useAutoReconnect = " << i.useAutoReconnect << " autoReconnectInterval = " << i.autoReconnectInterval + << " autoReconnectRetries = " << i.autoReconnectRetries << " unlimitedReconnectRetries = " << i.unlimitedReconnectRetries + << " rejoinChannels = " << i.rejoinChannels << ")"; + return dbg.space(); +}