X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcorenetwork.cpp;h=76a9d5592c7e1ec61ad7b152ca13935a804a49ad;hp=81c92cbf0101cddd831693ad70a2420e8b025028;hb=63bc3c3a34a0df70cad72b1f36d4fb7b8245d79c;hpb=dee6c478632feeae5c845be82251117556ff1511

diff --git a/src/core/corenetwork.cpp b/src/core/corenetwork.cpp
index 81c92cbf..76a9d559 100644
--- a/src/core/corenetwork.cpp
+++ b/src/core/corenetwork.cpp
@@ -23,16 +23,18 @@
 #include "core.h"
 #include "coresession.h"
 #include "coreidentity.h"
+#include "corenetworkconfig.h"
 
 #include "ircserverhandler.h"
-#include "userinputhandler.h"
+#include "coreuserinputhandler.h"
 #include "ctcphandler.h"
 
+INIT_SYNCABLE_OBJECT(CoreNetwork)
 CoreNetwork::CoreNetwork(const NetworkId &networkid, CoreSession *session)
   : Network(networkid, session),
     _coreSession(session),
     _ircServerHandler(new IrcServerHandler(this)),
-    _userInputHandler(new UserInputHandler(this)),
+    _userInputHandler(new CoreUserInputHandler(this)),
     _ctcpHandler(new CtcpHandler(this)),
     _autoReconnectCount(0),
     _quitRequested(false),
@@ -41,36 +43,34 @@ CoreNetwork::CoreNetwork(const NetworkId &networkid, CoreSession *session)
     _lastUsedServerIndex(0),
 
     _lastPingTime(0),
-    _maxPingCount(3),
     _pingCount(0),
-
-    // TODO make autowho configurable (possibly per-network)
-    _autoWhoEnabled(true),
-    _autoWhoInterval(90),
-    _autoWhoNickLimit(0), // unlimited
-    _autoWhoDelay(5)
+   _requestedUserModes('-')
 {
   _autoReconnectTimer.setSingleShot(true);
   _socketCloseTimer.setSingleShot(true);
   connect(&_socketCloseTimer, SIGNAL(timeout()), this, SLOT(socketCloseTimeout()));
 
-  _pingTimer.setInterval(30000);
+  setPingInterval(networkConfig()->pingInterval());
   connect(&_pingTimer, SIGNAL(timeout()), this, SLOT(sendPing()));
 
-  _autoWhoTimer.setInterval(_autoWhoDelay * 1000);
-  _autoWhoCycleTimer.setInterval(_autoWhoInterval * 1000);
+  setAutoWhoDelay(networkConfig()->autoWhoDelay());
+  setAutoWhoInterval(networkConfig()->autoWhoInterval());
 
   QHash<QString, QString> channels = coreSession()->persistentChannels(networkId());
   foreach(QString chan, channels.keys()) {
     _channelKeys[chan.toLower()] = channels[chan];
   }
 
+  connect(networkConfig(), SIGNAL(pingTimeoutEnabledSet(bool)), SLOT(enablePingTimeout(bool)));
+  connect(networkConfig(), SIGNAL(pingIntervalSet(int)), SLOT(setPingInterval(int)));
+  connect(networkConfig(), SIGNAL(autoWhoEnabledSet(bool)), SLOT(setAutoWhoEnabled(bool)));
+  connect(networkConfig(), SIGNAL(autoWhoIntervalSet(int)), SLOT(setAutoWhoInterval(int)));
+  connect(networkConfig(), SIGNAL(autoWhoDelaySet(int)), SLOT(setAutoWhoDelay(int)));
+
   connect(&_autoReconnectTimer, SIGNAL(timeout()), this, SLOT(doAutoReconnect()));
   connect(&_autoWhoTimer, SIGNAL(timeout()), this, SLOT(sendAutoWho()));
   connect(&_autoWhoCycleTimer, SIGNAL(timeout()), this, SLOT(startAutoWhoCycle()));
   connect(&_tokenBucketTimer, SIGNAL(timeout()), this, SLOT(fillBucketAndProcessQueue()));
-  connect(this, SIGNAL(connectRequested()), this, SLOT(connectToIrc()));
-
 
   connect(&socket, SIGNAL(connected()), this, SLOT(socketInitialized()));
   connect(&socket, SIGNAL(disconnected()), this, SLOT(socketDisconnected()));
@@ -200,7 +200,6 @@ void CoreNetwork::disconnectFromIrc(bool requested, const QString &reason, bool
     if(me_->isAway())
       awayMsg = me_->awayMessage();
     Core::setAwayMessage(userId(), networkId(), awayMsg);
-    Core::setUserModes(userId(), networkId(), me_->userModes());
   }
 
   if(reason.isEmpty() && identityPtr())
@@ -333,6 +332,9 @@ void CoreNetwork::socketInitialized() {
   _tokenBucket = _burstSize; // init with a full bucket
   _tokenBucketTimer.start(_messageDelay);
 
+  if(networkInfo().useSasl) {
+    putRawLine(serverEncode(QString("CAP REQ :sasl")));
+  }
   if(!server.password.isEmpty()) {
     putRawLine(serverEncode(QString("PASS %1").arg(server.password)));
   }
@@ -369,6 +371,7 @@ void CoreNetwork::socketDisconnected() {
   setConnected(false);
   emit disconnected(networkId());
   if(_quitRequested) {
+    _quitRequested = false;
     setConnectionState(Network::Disconnected);
     Core::setNetworkConnected(userId(), networkId(), false);
   } else if(_autoReconnectCount != 0) {
@@ -417,22 +420,11 @@ void CoreNetwork::networkInitialized() {
   if(!awayMsg.isEmpty())
     userInputHandler()->handleAway(BufferInfo(), Core::awayMessage(userId(), networkId()));
 
-  // restore old user modes if server default mode is set.
-  IrcUser *me_ = me();
-  if(me_) {
-    if(!me_->userModes().isEmpty()) {
-      restoreUserModes();
-    } else {
-      connect(me_, SIGNAL(userModesSet(QString)), this, SLOT(restoreUserModes()));
-      connect(me_, SIGNAL(userModesAdded(QString)), this, SLOT(restoreUserModes()));
-    }
-  }
-
   sendPerform();
 
   enablePingTimeout();
 
-  if(_autoWhoEnabled) {
+  if(networkConfig()->autoWhoEnabled()) {
     _autoWhoCycleTimer.start();
     _autoWhoTimer.start();
     startAutoWhoCycle();  // FIXME wait for autojoin to be completed
@@ -450,6 +442,17 @@ void CoreNetwork::sendPerform() {
     userInputHandler()->handleMsg(statusBuf, QString("%1 IDENTIFY %2").arg(autoIdentifyService(), autoIdentifyPassword()));
   }
 
+  // restore old user modes if server default mode is set.
+  IrcUser *me_ = me();
+  if(me_) {
+    if(!me_->userModes().isEmpty()) {
+      restoreUserModes();
+    } else {
+      connect(me_, SIGNAL(userModesSet(QString)), this, SLOT(restoreUserModes()));
+      connect(me_, SIGNAL(userModesAdded(QString)), this, SLOT(restoreUserModes()));
+    }
+  }
+
   // send perform list
   foreach(QString line, perform()) {
     if(!line.isEmpty()) userInput(statusBuf, line);
@@ -480,18 +483,118 @@ void CoreNetwork::restoreUserModes() {
   disconnect(me_, SIGNAL(userModesSet(QString)), this, SLOT(restoreUserModes()));
   disconnect(me_, SIGNAL(userModesAdded(QString)), this, SLOT(restoreUserModes()));
 
-  QString removeModes;
-  QString addModes = Core::userModes(userId(), networkId());
+  QString modesDelta = Core::userModes(userId(), networkId());
   QString currentModes = me_->userModes();
 
-  removeModes = currentModes;
-  removeModes.remove(QRegExp(QString("[%1]").arg(addModes)));
+  QString addModes, removeModes;
+  if(modesDelta.contains('-')) {
+    addModes = modesDelta.section('-', 0, 0);
+    removeModes = modesDelta.section('-', 1);
+  } else {
+    addModes = modesDelta;
+  }
+
+
   addModes.remove(QRegExp(QString("[%1]").arg(currentModes)));
+  if(currentModes.isEmpty())
+    removeModes = QString();
+  else
+    removeModes.remove(QRegExp(QString("[^%1]").arg(currentModes)));
+
+  if(addModes.isEmpty() && removeModes.isEmpty())
+    return;
+
+  if(!addModes.isEmpty())
+    addModes = '+' + addModes;
+  if(!removeModes.isEmpty())
+    removeModes = '-' + removeModes;
+
+  // don't use InputHandler::handleMode() as it keeps track of our persistent mode changes
+  putRawLine(serverEncode(QString("MODE %1 %2%3").arg(me_->nick()).arg(addModes).arg(removeModes)));
+}
+
+void CoreNetwork::updateIssuedModes(const QString &requestedModes) {
+  QString addModes;
+  QString removeModes;
+  bool addMode = true;
+
+  for(int i = 0; i < requestedModes.length(); i++) {
+    if(requestedModes[i] == '+') {
+      addMode = true;
+      continue;
+    }
+    if(requestedModes[i] == '-') {
+      addMode = false;
+      continue;
+    }
+    if(addMode) {
+      addModes += requestedModes[i];
+    } else {
+      removeModes += requestedModes[i];
+    }
+  }
+
+
+  QString addModesOld = _requestedUserModes.section('-', 0, 0);
+  QString removeModesOld = _requestedUserModes.section('-', 1);
+
+  addModes.remove(QRegExp(QString("[%1]").arg(addModesOld))); // deduplicate
+  addModesOld.remove(QRegExp(QString("[%1]").arg(removeModes))); // update
+  addModes += addModesOld;
 
-  removeModes = QString("%1 -%2").arg(me_->nick(), removeModes);
-  addModes = QString("%1 +%2").arg(me_->nick(), addModes);
-  userInputHandler()->handleMode(BufferInfo(), removeModes);
-  userInputHandler()->handleMode(BufferInfo(), addModes);
+  removeModes.remove(QRegExp(QString("[%1]").arg(removeModesOld))); // deduplicate
+  removeModesOld.remove(QRegExp(QString("[%1]").arg(addModes))); // update
+  removeModes += removeModesOld;
+
+  _requestedUserModes = QString("%1-%2").arg(addModes).arg(removeModes);
+}
+
+void CoreNetwork::updatePersistentModes(QString addModes, QString removeModes) {
+  QString persistentUserModes = Core::userModes(userId(), networkId());
+
+  QString requestedAdd = _requestedUserModes.section('-', 0, 0);
+  QString requestedRemove = _requestedUserModes.section('-', 1);
+
+  QString persistentAdd, persistentRemove;
+  if(persistentUserModes.contains('-')) {
+    persistentAdd = persistentUserModes.section('-', 0, 0);
+    persistentRemove = persistentUserModes.section('-', 1);
+  } else {
+    persistentAdd = persistentUserModes;
+  }
+
+  // remove modes we didn't issue
+  if(requestedAdd.isEmpty())
+    addModes = QString();
+  else
+    addModes.remove(QRegExp(QString("[^%1]").arg(requestedAdd)));
+
+  if(requestedRemove.isEmpty())
+    removeModes = QString();
+  else
+    removeModes.remove(QRegExp(QString("[^%1]").arg(requestedRemove)));
+
+  // deduplicate
+  persistentAdd.remove(QRegExp(QString("[%1]").arg(addModes)));
+  persistentRemove.remove(QRegExp(QString("[%1]").arg(removeModes)));
+
+  // update
+  persistentAdd.remove(QRegExp(QString("[%1]").arg(removeModes)));
+  persistentRemove.remove(QRegExp(QString("[%1]").arg(addModes)));
+
+  // update issued mode list
+  requestedAdd.remove(QRegExp(QString("[%1]").arg(addModes)));
+  requestedRemove.remove(QRegExp(QString("[%1]").arg(removeModes)));
+  _requestedUserModes = QString("%1-%2").arg(requestedAdd).arg(requestedRemove);
+
+  persistentAdd += addModes;
+  persistentRemove += removeModes;
+  Core::setUserModes(userId(), networkId(), QString("%1-%2").arg(persistentAdd).arg(persistentRemove));
+}
+
+void CoreNetwork::resetPersistentModes() {
+  _requestedUserModes = QString('-');
+  Core::setUserModes(userId(), networkId(), QString());
 }
 
 void CoreNetwork::setUseAutoReconnect(bool use) {
@@ -531,11 +634,11 @@ void CoreNetwork::sendPing() {
     qDebug() << "UserId:" << userId() << "Network:" << networkName() << "missed" << _pingCount << "pings."
 	     << "BA:" << socket.bytesAvailable() << "BTW:" << socket.bytesToWrite();
   }
-  if(_pingCount >= _maxPingCount && now - _lastPingTime <= (uint)(_pingTimer.interval() / 1000) + 1) {
+  if((int)_pingCount >= networkConfig()->maxPingCount() && now - _lastPingTime <= (uint)(_pingTimer.interval() / 1000) + 1) {
     // the second check compares the actual elapsed time since the last ping and the pingTimer interval
     // if the interval is shorter then the actual elapsed time it means that this thread was somehow blocked
     // and unable to even handle a ping answer. So we ignore those misses.
-    disconnectFromIrc(false, QString("No Ping reply in %1 seconds.").arg(_maxPingCount * _pingTimer.interval() / 1000), true /* withReconnect */);
+    disconnectFromIrc(false, QString("No Ping reply in %1 seconds.").arg(_pingCount * _pingTimer.interval() / 1000), true /* withReconnect */);
   } else {
     _lastPingTime = now;
     _pingCount++;
@@ -543,9 +646,14 @@ void CoreNetwork::sendPing() {
   }
 }
 
-void CoreNetwork::enablePingTimeout() {
-  resetPingTimeout();
-  _pingTimer.start();
+void CoreNetwork::enablePingTimeout(bool enable) {
+  if(!enable)
+    disablePingTimeout();
+  else {
+    resetPingTimeout();
+    if(networkConfig()->pingTimeoutEnabled())
+      _pingTimer.start();
+  }
 }
 
 void CoreNetwork::disablePingTimeout() {
@@ -553,6 +661,37 @@ void CoreNetwork::disablePingTimeout() {
   resetPingTimeout();
 }
 
+void CoreNetwork::setPingInterval(int interval) {
+  _pingTimer.setInterval(interval * 1000);
+}
+
+/******** AutoWHO ********/
+
+void CoreNetwork::startAutoWhoCycle() {
+  if(!_autoWhoQueue.isEmpty()) {
+    _autoWhoCycleTimer.stop();
+    return;
+  }
+  _autoWhoQueue = channels();
+}
+
+void CoreNetwork::setAutoWhoDelay(int delay) {
+  _autoWhoTimer.setInterval(delay * 1000);
+}
+
+void CoreNetwork::setAutoWhoInterval(int interval) {
+  _autoWhoCycleTimer.setInterval(interval * 1000);
+}
+
+void CoreNetwork::setAutoWhoEnabled(bool enabled) {
+  if(enabled && isConnected() && !_autoWhoTimer.isActive())
+    _autoWhoTimer.start();
+  else if(!enabled) {
+    _autoWhoTimer.stop();
+    _autoWhoCycleTimer.stop();
+  }
+}
+
 void CoreNetwork::sendAutoWho() {
   // Don't send autowho if there are still some pending
   if(_autoWhoPending.count())
@@ -562,24 +701,17 @@ void CoreNetwork::sendAutoWho() {
     QString chan = _autoWhoQueue.takeFirst();
     IrcChannel *ircchan = ircChannel(chan);
     if(!ircchan) continue;
-    if(_autoWhoNickLimit > 0 && ircchan->ircUsers().count() > _autoWhoNickLimit) continue;
+    if(networkConfig()->autoWhoNickLimit() > 0 && ircchan->ircUsers().count() >= networkConfig()->autoWhoNickLimit())
+      continue;
     _autoWhoPending[chan]++;
     putRawLine("WHO " + serverEncode(chan));
-    if(_autoWhoQueue.isEmpty() && _autoWhoEnabled && !_autoWhoCycleTimer.isActive()) {
-      // Timer was stopped, means a new cycle is due immediately
-      _autoWhoCycleTimer.start();
-      startAutoWhoCycle();
-    }
     break;
   }
-}
-
-void CoreNetwork::startAutoWhoCycle() {
-  if(!_autoWhoQueue.isEmpty()) {
-    _autoWhoCycleTimer.stop();
-    return;
+  if(_autoWhoQueue.isEmpty() && networkConfig()->autoWhoEnabled() && !_autoWhoCycleTimer.isActive()) {
+    // Timer was stopped, means a new cycle is due immediately
+    _autoWhoCycleTimer.start();
+    startAutoWhoCycle();
   }
-  _autoWhoQueue = channels();
 }
 
 #ifdef HAVE_SSL
@@ -621,7 +753,7 @@ void CoreNetwork::requestConnect() const {
     qWarning() << "Requesting connect while already being connected!";
     return;
   }
-  Network::requestConnect();
+  QMetaObject::invokeMethod(const_cast<CoreNetwork *>(this), "connectToIrc", Qt::QueuedConnection);
 }
 
 void CoreNetwork::requestDisconnect() const {