#include "corenetwork.h"
+#include "ctcphandler.h"
#include "core.h"
-#include "coresession.h"
#include "coreidentity.h"
#include "corenetworkconfig.h"
-
+#include "coresession.h"
+#include "coreuserinputhandler.h"
#include "ircserverhandler.h"
-#include "userinputhandler.h"
-#include "ctcphandler.h"
+#include "networkevent.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),
_lastUsedServerIndex(0),
_lastPingTime(0),
- _pingCount(0)
-
+ _pingCount(0),
+ _requestedUserModes('-')
{
_autoReconnectTimer.setSingleShot(true);
_socketCloseTimer.setSingleShot(true);
if(me_->isAway())
awayMsg = me_->awayMessage();
Core::setAwayMessage(userId(), networkId(), awayMsg);
- Core::setUserModes(userId(), networkId(), me_->userModes());
}
if(reason.isEmpty() && identityPtr())
_channelKeys.remove(channel.toLower());
}
+#ifdef HAVE_QCA2
+Cipher *CoreNetwork::cipher(const QString &target) const {
+ if(target.isEmpty())
+ return 0;
+
+ QByteArray key = cipherKey(target);
+ if(key.isEmpty())
+ return 0;
+
+ CoreIrcChannel *channel = qobject_cast<CoreIrcChannel *>(ircChannel(target));
+ if(channel) {
+ if(channel->cipher()->setKey(key))
+ return channel->cipher();
+ } else {
+ CoreIrcUser *user = qobject_cast<CoreIrcUser *>(ircUser(target));
+ if(user && user->cipher()->setKey(key))
+ return user->cipher();
+ }
+ return 0;
+}
+
+QByteArray CoreNetwork::cipherKey(const QString &recipient) const {
+ return _cipherKeys.value(recipient.toLower(), QByteArray());
+}
+
+void CoreNetwork::setCipherKey(const QString &recipient, const QByteArray &key) {
+ if(!key.isEmpty())
+ _cipherKeys[recipient.toLower()] = key;
+ else
+ _cipherKeys.remove(recipient.toLower());
+}
+#endif /* HAVE_QCA2 */
+
bool CoreNetwork::setAutoWhoDone(const QString &channel) {
QString chan = channel.toLower();
if(_autoWhoPending.value(chan, 0) <= 0)
void CoreNetwork::socketHasData() {
while(socket.canReadLine()) {
QByteArray s = socket.readLine().trimmed();
- ircServerHandler()->handleServerMsg(s);
+ ircServerHandler()->handleServerMsg(s); // FIXME remove with events
+
+ coreSession()->eventManager()->sendEvent(new NetworkDataEvent(EventManager::NetworkIncoming, this, s));
}
}
_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)));
}
setConnected(false);
emit disconnected(networkId());
if(_quitRequested) {
+ _quitRequested = false;
setConnectionState(Network::Disconnected);
Core::setNetworkConnected(userId(), networkId(), false);
} else if(_autoReconnectCount != 0) {
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();
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);
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.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));
+}
- removeModes = QString("%1 -%2").arg(me_->nick(), removeModes);
- addModes = QString("%1 +%2").arg(me_->nick(), addModes);
- userInputHandler()->handleMode(BufferInfo(), removeModes);
- userInputHandler()->handleMode(BufferInfo(), addModes);
+void CoreNetwork::resetPersistentModes() {
+ _requestedUserModes = QString('-');
+ Core::setUserModes(userId(), networkId(), QString());
}
void CoreNetwork::setUseAutoReconnect(bool use) {
uint now = QDateTime::currentDateTime().toTime_t();
if(_pingCount != 0) {
qDebug() << "UserId:" << userId() << "Network:" << networkName() << "missed" << _pingCount << "pings."
- << "BA:" << socket.bytesAvailable() << "BTW:" << socket.bytesToWrite();
+ << "BA:" << socket.bytesAvailable() << "BTW:" << socket.bytesToWrite();
}
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
projects / quassel.git / blobdiff