/***************************************************************************
- * Copyright (C) 2005-2013 by the Quassel Project *
+ * Copyright (C) 2005-2018 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
+#include <QString>
+
+#include "corenetwork.h"
#include "oidentdconfiggenerator.h"
OidentdConfigGenerator::OidentdConfigGenerator(QObject *parent) :
}
-bool OidentdConfigGenerator::addSocket(const CoreIdentity *identity, const QHostAddress &localAddress, quint16 localPort, const QHostAddress &peerAddress, quint16 peerPort)
+QString OidentdConfigGenerator::sysIdentForIdentity(const CoreIdentity *identity) const {
+ // Make sure the identity's ident complies with strict mode if enabled
+ const CoreNetwork *network = qobject_cast<CoreNetwork *>(sender());
+ return network->coreSession()->strictCompliantIdent(identity);
+}
+
+
+bool OidentdConfigGenerator::addSocket(const CoreIdentity *identity,
+ const QHostAddress &localAddress, quint16 localPort,
+ const QHostAddress &peerAddress, quint16 peerPort,
+ qint64 socketId)
{
- Q_UNUSED(localAddress) Q_UNUSED(peerAddress) Q_UNUSED(peerPort)
- QString ident = identity->ident();
+ Q_UNUSED(localAddress)
+ Q_UNUSED(peerAddress)
+ Q_UNUSED(peerPort)
+ Q_UNUSED(socketId)
+
+ const QString ident = sysIdentForIdentity(identity);
- _quasselConfig.append(_quasselStanzaTemplate.arg(localPort).arg(ident).arg(_configTag).toAscii());
+ _quasselConfig.append(_quasselStanzaTemplate.arg(localPort).arg(ident).arg(_configTag).toLatin1());
bool ret = writeConfig();
//! not yet implemented
-bool OidentdConfigGenerator::removeSocket(const CoreIdentity *identity, const QHostAddress &localAddress, quint16 localPort, const QHostAddress &peerAddress, quint16 peerPort)
+bool OidentdConfigGenerator::removeSocket(const CoreIdentity *identity,
+ const QHostAddress &localAddress, quint16 localPort,
+ const QHostAddress &peerAddress, quint16 peerPort,
+ qint64 socketId)
{
- Q_UNUSED(identity) Q_UNUSED(localAddress) Q_UNUSED(localPort) Q_UNUSED(peerAddress) Q_UNUSED(peerPort)
+ Q_UNUSED(identity)
+ Q_UNUSED(localAddress)
+ Q_UNUSED(localPort)
+ Q_UNUSED(peerAddress)
+ Q_UNUSED(peerPort)
+ Q_UNUSED(socketId)
+
return true;
}