/***************************************************************************
- * 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 *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#include "network.h"
-
-#include <QDebug>
+#include <QSettings>
#include <QTextCodec>
-#include "util.h"
+#include "network.h"
+#include "quassel.h"
QTextCodec *Network::_defaultCodecForServer = 0;
QTextCodec *Network::_defaultCodecForEncoding = 0;
QTextCodec *Network::_defaultCodecForDecoding = 0;
+QString Network::_networksIniPath = QString();
+
// ====================
// Public:
// ====================
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(info.serverList); // FIXME compare components
+ 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);
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(destroyed()), this, SLOT(ircUserDestroyed()));
- if(!ircuser->isInitialized())
- connect(ircuser, SIGNAL(initDone()), this, SLOT(ircUserInitDone()));
_ircUsers[nick] = ircuser;
emit ircUserAdded(hostmask);
emit ircUserAdded(ircuser);
- if(ircuser->isInitialized())
- emit ircUserInitDone(ircuser);
}
return _ircUsers[nick];
}
-void Network::ircUserDestroyed() {
- IrcUser *ircUser = static_cast<IrcUser *>(sender());
- if(!ircUser)
- return;
-
- QHash<QString, IrcUser *>::iterator ircUserIter = _ircUsers.begin();
- while(ircUserIter != _ircUsers.end()) {
- if(ircUser == *ircUserIter) {
- ircUserIter = _ircUsers.erase(ircUserIter);
- break;
- }
- ircUserIter++;
- }
+IrcUser *Network::ircUser(QString nickname) const {
+ nickname = nickname.toLower();
+ if(_ircUsers.contains(nickname))
+ return _ircUsers[nickname];
+ else
+ return 0;
}
void Network::removeIrcUser(IrcUser *ircuser) {
_ircUsers.remove(nick);
disconnect(ircuser, 0, this, 0);
- emit ircUserRemoved(nick);
- emit ircUserRemoved(ircuser);
ircuser->deleteLater();
}
-void Network::removeIrcUser(const QString &nick) {
- IrcUser *ircuser;
- if((ircuser = ircUser(nick)) != 0)
- removeIrcUser(ircuser);
+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<IrcUser *> users = ircUsers();
- foreach(IrcUser *user, users) {
- removeIrcUser(user);
- }
+ _ircUsers.clear();
QList<IrcChannel *> 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);
}
-}
-IrcUser *Network::ircUser(QString nickname) const {
- nickname = nickname.toLower();
- if(_ircUsers.contains(nickname))
- return _ircUsers[nickname];
- else
- return 0;
+ // the second loop is needed because quit can have sideffects
+ foreach(IrcUser *user, users) {
+ user->quit();
+ }
+
+ qDeleteAll(users);
+ qDeleteAll(channels);
}
IrcChannel *Network::newIrcChannel(const QString &channelname, const QVariantMap &initData) {
else
qWarning() << "unable to synchronize new IrcChannel" << channelname << "forgot to call Network::setProxy(SignalProxy *)?";
- connect(channel, SIGNAL(destroyed()), this, SLOT(channelDestroyed()));
- if(!channel->isInitialized())
- connect(channel, SIGNAL(initDone()), this, SLOT(ircChannelInitDone()));
-
_ircChannels[channelname.toLower()] = channel;
emit ircChannelAdded(channelname);
emit ircChannelAdded(channel);
- if(channel->isInitialized())
- emit ircChannelInitDone(channel);
}
return _ircChannels[channelname.toLower()];
}
return string.toAscii();
}
+/*** Handle networks.ini ***/
+
+QStringList Network::presetNetworks(bool onlyDefault) {
+ // lazily find the file, make sure to not call one of the other preset functions first (they'll fail else)
+ if(_networksIniPath.isNull()) {
+ _networksIniPath = Quassel::findDataFilePath("networks.ini");
+ if(_networksIniPath.isNull()) {
+ _networksIniPath = ""; // now we won't check again, as it's not null anymore
+ return QStringList();
+ }
+ }
+ if(!_networksIniPath.isEmpty()) {
+ QSettings s(_networksIniPath, QSettings::IniFormat);
+ QStringList networks = s.childGroups();
+ if(!networks.isEmpty()) {
+ // we sort the list case-insensitive
+ QMap<QString, QString> sorted;
+ foreach(QString net, networks) {
+ if(onlyDefault && !s.value(QString("%1/Default").arg(net)).toBool())
+ continue;
+ sorted[net.toLower()] = net;
+ }
+ return sorted.values();
+ }
+ }
+ return QStringList();
+}
+
+QStringList Network::presetDefaultChannels(const QString &networkName) {
+ if(_networksIniPath.isEmpty()) // be sure to have called presetNetworks() first, else this always fails
+ return QStringList();
+ QSettings s(_networksIniPath, QSettings::IniFormat);
+ return s.value(QString("%1/DefaultChannels").arg(networkName)).toStringList();
+}
+
+NetworkInfo Network::networkInfoFromPreset(const QString &networkName) {
+ NetworkInfo info;
+ if(!_networksIniPath.isEmpty()) {
+ info.networkName = networkName;
+ QSettings s(_networksIniPath, QSettings::IniFormat);
+ s.beginGroup(info.networkName);
+ foreach(QString server, s.value("Servers").toStringList()) {
+ bool ssl = false;
+ QStringList splitserver = server.split(':', QString::SkipEmptyParts);
+ if(splitserver.count() != 2) {
+ qWarning() << "Invalid server entry in networks.conf:" << server;
+ continue;
+ }
+ if(splitserver[1].at(0) == '+')
+ ssl = true;
+ uint port = splitserver[1].toUInt();
+ if(!port) {
+ qWarning() << "Invalid port entry in networks.conf:" << server;
+ continue;
+ }
+ info.serverList << Network::Server(splitserver[0].trimmed(), port, QString(), ssl);
+ }
+ }
+ return info;
+}
+
+
// ====================
// Public Slots:
// ====================
}
void Network::setServerList(const QVariantList &serverList) {
- _serverList = serverList;
+ _serverList = fromVariantList<Server>(serverList);
emit serverListSet(serverList);
}
newIrcChannel(channelIter.key(), channelIter.value().toMap());
channelIter++;
}
-
}
void Network::initSetSupports(const QVariantMap &supports) {
setMyNick(newnick);
}
-void Network::ircUserInitDone() {
- IrcUser *ircuser = static_cast<IrcUser *>(sender());
- Q_ASSERT(ircuser);
- connect(ircuser, SIGNAL(initDone()), this, SLOT(ircUserInitDone()));
- emit ircUserInitDone(ircuser);
-}
-
-void Network::ircChannelInitDone() {
- IrcChannel *ircChannel = static_cast<IrcChannel *>(sender());
- Q_ASSERT(ircChannel);
- disconnect(ircChannel, SIGNAL(initDone()), this, SLOT(ircChannelInitDone()));
- 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<IrcChannel *>(sender());
- Q_ASSERT(channel);
- _ircChannels.remove(_ircChannels.key(channel));
- emit ircChannelRemoved(channel);
-}
-
void Network::emitConnectionError(const QString &errorMsg) {
emit connectionError(errorMsg);
}
* NetworkInfo
************************************************************************/
+NetworkInfo::NetworkInfo()
+: networkId(0),
+ identity(1),
+ useRandomServer(false),
+ useAutoIdentify(false),
+ autoIdentifyService("NickServ"),
+ useAutoReconnect(true),
+ autoReconnectInterval(60),
+ autoReconnectRetries(20),
+ unlimitedReconnectRetries(false),
+ rejoinChannels(true)
+{
+
+}
+
bool NetworkInfo::operator==(const NetworkInfo &other) const {
if(networkId != other.networkId) return false;
if(networkName != other.networkName) return false;
i["CodecForServer"] = info.codecForServer;
i["CodecForEncoding"] = info.codecForEncoding;
i["CodecForDecoding"] = info.codecForDecoding;
- i["ServerList"] = info.serverList;
+ i["ServerList"] = toVariantList(info.serverList);
i["UseRandomServer"] = info.useRandomServer;
i["Perform"] = info.perform;
i["UseAutoIdentify"] = info.useAutoIdentify;
info.codecForServer = i["CodecForServer"].toByteArray();
info.codecForEncoding = i["CodecForEncoding"].toByteArray();
info.codecForDecoding = i["CodecForDecoding"].toByteArray();
- info.serverList = i["ServerList"].toList();
+ info.serverList = fromVariantList<Network::Server>(i["ServerList"].toList());
info.useRandomServer = i["UseRandomServer"].toBool();
info.perform = i["Perform"].toStringList();
info.useAutoIdentify = i["UseAutoIdentify"].toBool();
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 << ")";
+ << " 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();
+}
+
+QDataStream &operator<<(QDataStream &out, const Network::Server &server) {
+ QVariantMap serverMap;
+ serverMap["Host"] = server.host;
+ serverMap["Port"] = server.port;
+ serverMap["Password"] = server.password;
+ serverMap["UseSSL"] = server.useSsl;
+ serverMap["sslVersion"] = server.sslVersion;
+ serverMap["UseProxy"] = server.useProxy;
+ serverMap["ProxyType"] = server.proxyType;
+ serverMap["ProxyHost"] = server.proxyHost;
+ serverMap["ProxyPort"] = server.proxyPort;
+ serverMap["ProxyUser"] = server.proxyUser;
+ serverMap["ProxyPass"] = server.proxyPass;
+ out << serverMap;
+ return out;
+}
+
+QDataStream &operator>>(QDataStream &in, Network::Server &server) {
+ QVariantMap serverMap;
+ in >> serverMap;
+ server.host = serverMap["Host"].toString();
+ server.port = serverMap["Port"].toUInt();
+ server.password = serverMap["Password"].toString();
+ server.useSsl = serverMap["UseSSL"].toBool();
+ server.sslVersion = serverMap["sslVersion"].toInt();
+ server.useProxy = serverMap["UseProxy"].toBool();
+ server.proxyType = serverMap["ProxyType"].toInt();
+ server.proxyHost = serverMap["ProxyHost"].toString();
+ server.proxyPort = serverMap["ProxyPort"].toUInt();
+ server.proxyUser = serverMap["ProxyUser"].toString();
+ server.proxyPass = serverMap["ProxyPass"].toString();
+ return in;
+}
+
+
+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(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 {
+ return !(*this == other);
+}
+
+QDebug operator<<(QDebug dbg, const Network::Server &server) {
+ dbg.nospace() << "Server(host = " << server.host << ":" << server.port << ", useSsl = " << server.useSsl << ")";
return dbg.space();
}