* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include "oidentdconfiggenerator.h"
-#include "corenetwork.h"
-
#include <QString>
-OidentdConfigGenerator::OidentdConfigGenerator(bool strict, QObject *parent) :
+#include "corenetwork.h"
+#include "oidentdconfiggenerator.h"
+
+OidentdConfigGenerator::OidentdConfigGenerator(QObject *parent) :
QObject(parent),
- _initialized(false),
- _strict(strict)
+ _initialized(false)
{
if (!_initialized)
init();
return _initialized;
}
-const QString OidentdConfigGenerator::sysidentForIdentity(const CoreIdentity *identity) {
- if (!_strict) {
- return identity->ident();
- }
+
+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()->strictSysident();
+ return network->coreSession()->strictCompliantIdent(identity);
}
+
bool OidentdConfigGenerator::addSocket(const CoreIdentity *identity, const QHostAddress &localAddress, quint16 localPort, const QHostAddress &peerAddress, quint16 peerPort)
{
Q_UNUSED(localAddress) Q_UNUSED(peerAddress) Q_UNUSED(peerPort)
- const QString ident = sysidentForIdentity(identity);
+ const QString ident = sysIdentForIdentity(identity);
_quasselConfig.append(_quasselStanzaTemplate.arg(localPort).arg(ident).arg(_configTag).toLatin1());