X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetwork.cpp;h=df2a8376788417225175b6854ea61040be960cf0;hp=fa87a30bbd8d8542afb7debb85a48b633341623c;hb=a5dfcc8ecf8b81025d24b3c5c816169e3e030ea4;hpb=0268b7f62826dc48155866f7f27b2987449a29f5

diff --git a/src/common/network.cpp b/src/common/network.cpp
index fa87a30b..df2a8376 100644
--- a/src/common/network.cpp
+++ b/src/common/network.cpp
@@ -19,95 +19,92 @@
  ***************************************************************************/
 #include "network.h"
 
-#include "signalproxy.h"
-#include "ircuser.h"
-#include "ircchannel.h"
-
 #include <QDebug>
 #include <QTextCodec>
 
 #include "util.h"
 
+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<QVariantMap>(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("<not initialized>")),
     _currentServer(QString()),
     _connected(false),
     _connectionState(Disconnected),
     _prefixes(QString()),
     _prefixModes(QString()),
-    _proxy(0),
+    _useRandomServer(false),
+    _useAutoIdentify(false),
+    _useAutoReconnect(false),
+    _autoReconnectInterval(60),
+    _autoReconnectRetries(10),
+    _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() {
-//  QHashIterator<QString, IrcUser *> 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());
+  emit aboutToBeDestroyed();
 }
 
 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();
   info.networkId = networkId();
   info.identity = identity();
+  info.codecForServer = codecForServer();
   info.codecForEncoding = codecForEncoding();
   info.codecForDecoding = codecForDecoding();
-  info.serverList = serverList();
+  info.serverList = variantServerList();
+  info.useRandomServer = useRandomServer();
+  info.perform = perform();
+  info.useAutoIdentify = useAutoIdentify();
+  info.autoIdentifyService = autoIdentifyService();
+  info.autoIdentifyPassword = autoIdentifyPassword();
+  info.useAutoReconnect = useAutoReconnect();
+  info.autoReconnectInterval = autoReconnectInterval();
+  info.autoReconnectRetries = autoReconnectRetries();
+  info.unlimitedReconnectRetries = unlimitedReconnectRetries();
+  info.rejoinChannels = rejoinChannels();
   return info;
 }
 
@@ -115,11 +112,20 @@ 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.codecForEncoding.isEmpty() && info.codecForEncoding != codecForEncoding())
-    setCodecForEncoding(QTextCodec::codecForName(info.codecForEncoding));
-  if(!info.codecForDecoding.isEmpty() && info.codecForDecoding != codecForDecoding())
-    setCodecForDecoding(QTextCodec::codecForName(info.codecForDecoding));
+  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.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.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);
 }
 
 QString Network::prefixToMode(const QString &prefix) {
@@ -129,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)]);
@@ -140,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
@@ -170,18 +152,20 @@ QStringList Network::nicks() const {
   return nicks;
 }
 
-QStringList Network::channels() const {
-  return _ircChannels.keys();
-}
-
-QVariantList Network::serverList() const {
-  return _serverList;
+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;
 }
 
@@ -192,8 +176,27 @@ QString Network::prefixModes() {
   return _prefixModes;
 }
 
-bool Network::supports(const QString &param) 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 &param) const {
@@ -204,29 +207,37 @@ QString Network::support(const QString &param) 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(decodeString(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) {
@@ -236,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<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);
   }
-}
-
-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(decodeString(nickname));
-}
 
-QList<IrcUser *> 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(decodeString(channelname));
-}
-
 IrcChannel *Network::ircChannel(QString channelname) const {
   channelname = channelname.toLower();
   if(_ircChannels.contains(channelname))
@@ -311,21 +313,54 @@ IrcChannel *Network::ircChannel(QString channelname) const {
     return 0;
 }
 
-IrcChannel *Network::ircChannel(const QByteArray &channelname) const {
-  return ircChannel(decodeString(channelname));
+QByteArray Network::defaultCodecForServer() {
+  if(_defaultCodecForServer)
+    return _defaultCodecForServer->name();
+  return QByteArray();
+}
+
+void Network::setDefaultCodecForServer(const QByteArray &name) {
+  _defaultCodecForServer = QTextCodec::codecForName(name);
 }
 
+QByteArray Network::defaultCodecForEncoding() {
+  if(_defaultCodecForEncoding)
+    return _defaultCodecForEncoding->name();
+  return QByteArray();
+}
 
-QList<IrcChannel *> Network::ircChannels() const {
-  return _ircChannels.values();
+void Network::setDefaultCodecForEncoding(const QByteArray &name) {
+  _defaultCodecForEncoding = QTextCodec::codecForName(name);
 }
 
-quint32 Network::ircChannelCount() const {
-  return _ircChannels.count();
+QByteArray Network::defaultCodecForDecoding() {
+  if(_defaultCodecForDecoding)
+    return _defaultCodecForDecoding->name();
+  return QByteArray();
+}
+
+void Network::setDefaultCodecForDecoding(const QByteArray &name) {
+  _defaultCodecForDecoding = QTextCodec::codecForName(name);
+}
+
+QByteArray Network::codecForServer() const {
+  if(_codecForServer)
+    return _codecForServer->name();
+  return QByteArray();
+}
+
+void Network::setCodecForServer(const QByteArray &name) {
+  setCodecForServer(QTextCodec::codecForName(name));
+}
+
+void Network::setCodecForServer(QTextCodec *codec) {
+  _codecForServer = codec;
+  emit codecForServerSet(codecForServer());
 }
 
 QByteArray Network::codecForEncoding() const {
-  if(_codecForEncoding) return _codecForEncoding->name();
+  if(_codecForEncoding)
+    return _codecForEncoding->name();
   return QByteArray();
 }
 
@@ -339,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();
 }
 
@@ -352,14 +388,37 @@ void Network::setCodecForDecoding(QTextCodec *codec) {
   emit codecForDecodingSet(codecForDecoding());
 }
 
+// FIXME use server encoding if appropriate
 QString Network::decodeString(const QByteArray &text) const {
-  return ::decodeString(text, _codecForDecoding);
+  if(_codecForDecoding)
+    return ::decodeString(text, _codecForDecoding);
+  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);
   }
+  if(_defaultCodecForEncoding) {
+    return _defaultCodecForEncoding->fromUnicode(string);
+  }
+  return string.toAscii();
+}
+
+QString Network::decodeServerString(const QByteArray &text) const {
+  if(_codecForServer)
+    return ::decodeString(text, _codecForServer);
+  else
+    return ::decodeString(text, _defaultCodecForServer);
+}
+
+QByteArray Network::encodeServerString(const QString &string) const {
+  if(_codecForServer) {
+    return _codecForServer->fromUnicode(string);
+  }
+  if(_defaultCodecForServer) {
+    return _defaultCodecForServer->fromUnicode(string);
+  }
   return string.toAscii();
 }
 
@@ -377,9 +436,15 @@ void Network::setCurrentServer(const QString &currentServer) {
 }
 
 void Network::setConnected(bool connected) {
+  if(_connected == connected)
+    return;
+
   _connected = connected;
-  if(!connected)
+  if(!connected) {
+    setMyNick(QString());
+    setCurrentServer(QString());
     removeChansAndUsers();
+  }
   emit connectedSet(connected);
 }
 
@@ -393,19 +458,82 @@ 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);
 }
 
+void Network::setUseRandomServer(bool use) {
+  _useRandomServer = use;
+  emit useRandomServerSet(use);
+}
+
+void Network::setPerform(const QStringList &perform) {
+  _perform = perform;
+  emit performSet(perform);
+}
+
+void Network::setUseAutoIdentify(bool use) {
+  _useAutoIdentify = use;
+  emit useAutoIdentifySet(use);
+}
+
+void Network::setAutoIdentifyService(const QString &service) {
+  _autoIdentifyService = service;
+  emit autoIdentifyServiceSet(service);
+}
+
+void Network::setAutoIdentifyPassword(const QString &password) {
+  _autoIdentifyPassword = password;
+  emit autoIdentifyPasswordSet(password);
+}
+
+void Network::setUseAutoReconnect(bool use) {
+  _useAutoReconnect = use;
+  emit useAutoReconnectSet(use);
+}
+
+void Network::setAutoReconnectInterval(quint32 interval) {
+  _autoReconnectInterval = interval;
+  emit autoReconnectIntervalSet(interval);
+}
+
+void Network::setAutoReconnectRetries(quint16 retries) {
+  _autoReconnectRetries = retries;
+  emit autoReconnectRetriesSet(retries);
+}
+
+void Network::setUnlimitedReconnectRetries(bool unlimited) {
+  _unlimitedReconnectRetries = unlimited;
+  emit unlimitedReconnectRetriesSet(unlimited);
+}
+
+void Network::setRejoinChannels(bool rejoin) {
+  _rejoinChannels = rejoin;
+  emit rejoinChannelsSet(rejoin);
+}
+
 void Network::addSupport(const QString &param, const QString &value) {
   if(!_supports.contains(param)) {
     _supports[param] = value;
@@ -430,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;
+
+  QHash<QString, IrcUser *>::const_iterator userIter = _ircUsers.constBegin();
+  QHash<QString, IrcUser *>::const_iterator userIterEnd = _ircUsers.constEnd();
+  while(userIter != userIterEnd) {
+    users[userIter.value()->hostmask()] = userIter.value()->toVariantMap();
+    userIter++;
+  }
+  usersAndChannels["users"] = users;
 
-QStringList Network::initIrcUsers() const {
-  QStringList hostmasks;
-  foreach(IrcUser *ircuser, ircUsers()) {
-    hostmasks << ircuser->hostmask();
+  QHash<QString, IrcChannel *>::const_iterator channelIter = _ircChannels.constBegin();
+  QHash<QString, IrcChannel *>::const_iterator channelIterEnd = _ircChannels.constEnd();
+  while(channelIter != channelIterEnd) {
+    channels[channelIter.value()->name()] = channelIter.value()->toVariantMap();
+    channelIter++;
   }
-  return hostmasks;
+  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) {
@@ -454,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);
@@ -498,67 +645,6 @@ void Network::ircUserNickChanged(QString newnick) {
     setMyNick(newnick);
 }
 
-void Network::ircUserInitDone() {
-  IrcUser *ircuser = static_cast<IrcUser *>(sender());
-  Q_ASSERT(ircuser);
-  emit ircUserInitDone(ircuser);
-}
-
-void Network::ircChannelInitDone() {
-  IrcChannel *ircchannel = static_cast<IrcChannel *>(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<IrcChannel *>(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 not being disconnected!";
-      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);
 }
@@ -568,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];
       }
@@ -587,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];
       }
@@ -608,9 +700,20 @@ 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(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;
   return true;
 }
 
@@ -623,9 +726,20 @@ QDataStream &operator<<(QDataStream &out, const NetworkInfo &info) {
   i["NetworkId"] = QVariant::fromValue<NetworkId>(info.networkId);
   i["NetworkName"] = info.networkName;
   i["Identity"] = QVariant::fromValue<IdentityId>(info.identity);
+  i["CodecForServer"] = info.codecForServer;
   i["CodecForEncoding"] = info.codecForEncoding;
   i["CodecForDecoding"] = info.codecForDecoding;
   i["ServerList"] = info.serverList;
+  i["UseRandomServer"] = info.useRandomServer;
+  i["Perform"] = info.perform;
+  i["UseAutoIdentify"] = info.useAutoIdentify;
+  i["AutoIdentifyService"] = info.autoIdentifyService;
+  i["AutoIdentifyPassword"] = info.autoIdentifyPassword;
+  i["UseAutoReconnect"] = info.useAutoReconnect;
+  i["AutoReconnectInterval"] = info.autoReconnectInterval;
+  i["AutoReconnectRetries"] = info.autoReconnectRetries;
+  i["UnlimitedReconnectRetries"] = info.unlimitedReconnectRetries;
+  i["RejoinChannels"] = info.rejoinChannels;
   out << i;
   return out;
 }
@@ -636,8 +750,30 @@ QDataStream &operator>>(QDataStream &in, NetworkInfo &info) {
   info.networkId = i["NetworkId"].value<NetworkId>();
   info.networkName = i["NetworkName"].toString();
   info.identity = i["Identity"].value<IdentityId>();
+  info.codecForServer = i["CodecForServer"].toByteArray();
   info.codecForEncoding = i["CodecForEncoding"].toByteArray();
   info.codecForDecoding = i["CodecForDecoding"].toByteArray();
   info.serverList = 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.useAutoReconnect = i["UseAutoReconnect"].toBool();
+  info.autoReconnectInterval = i["AutoReconnectInterval"].toUInt();
+  info.autoReconnectRetries = i["AutoReconnectRetries"].toInt();
+  info.unlimitedReconnectRetries = i["UnlimitedReconnectRetries"].toBool();
+  info.rejoinChannels = i["RejoinChannels"].toBool();
   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();
+}