QObject(parent),
_initialized(false)
{
- qDebug() << "OidentdConfigGenerator() checking for being initialized";
if (!_initialized)
init();
}
+OidentdConfigGenerator::~OidentdConfigGenerator() {
+ _quasselConfig.clear();
+ writeConfig();
+ _configFile->deleteLater();
+}
+
bool OidentdConfigGenerator::init() {
- configDir = QDir::homePath();
- configFileName = ".oidentd.conf";
+ _configDir = QDir::homePath();
+ _configFileName = ".oidentd.conf";
if(Quassel::isOptionSet("oidentd-conffile"))
- configPath = Quassel::optionValue("oidentd-conffile");
+ _configPath = Quassel::optionValue("oidentd-conffile");
else
- configPath = configDir.absoluteFilePath(configFileName);
+ _configPath = _configDir.absoluteFilePath(_configFileName);
+
+ _configTag = " stanza created by Quassel";
- configTag = " stanza created by Quassel";
+ _configFile = new QFile(_configPath);
- _configFile = new QFile(configPath);
- qDebug() << "1: _configFile" << _configFile->fileName();
+ // Rx has to match Template in order for cleanup to work.
+ // Template should be enhanced with the "from" parameter as soon as Quassel gains
+ // the ability to bind to an IP on client sockets.
- quasselStanza = QRegExp(QString("^lport .* { .* } #%1$").arg(configTag));
+ _quasselStanzaTemplate = QString("lport %1 { reply \"%2\" } #%3\n");
+ _quasselStanzaRx = QRegExp(QString("^lport .* \\{ .* \\} #%1\\r?\\n").arg(_configTag));
+ // initially remove all Quassel stanzas that might be present
if (parseConfig(false) && writeConfig())
_initialized = true;
- qDebug() << "OidentdConfigGenerator" << (!_initialized ? "not" : "") << "initialized";
-
return _initialized;
}
bool OidentdConfigGenerator::addSocket(const CoreIdentity *identity, const QHostAddress &localAddress, quint16 localPort, const QHostAddress &peerAddress, quint16 peerPort) {
- qDebug() << "localAddress" << localAddress;
- qDebug() << "localPort" << localPort;
- qDebug() << "peerAddress" << peerAddress;
- qDebug() << "peerPort" << peerPort;
- qDebug() << "ident" << identity->ident();
-
+ Q_UNUSED(localAddress) Q_UNUSED(peerAddress) Q_UNUSED(peerPort)
QString ident = identity->ident();
- _config.append(QString("lport %1 { reply \"%2\" } #%3\n").arg(localPort).arg(ident).arg(configTag));
+ _quasselConfig.append(_quasselStanzaTemplate.arg(localPort).arg(ident).arg(_configTag).toAscii());
bool ret = writeConfig();
- qDebug() << "config written" << ret;
return ret;
}
-// not yet implemented
+//! not yet implemented
bool OidentdConfigGenerator::removeSocket(const CoreIdentity *identity, const QHostAddress &localAddress, quint16 localPort, const QHostAddress &peerAddress, quint16 peerPort) {
Q_UNUSED(identity) Q_UNUSED(localAddress) Q_UNUSED(localPort) Q_UNUSED(peerAddress) Q_UNUSED(peerPort)
return true;
}
-bool OidentdConfigGenerator::parseConfig(bool keepQuasselStanzas) {
- qDebug() << "_configFile name" << _configFile->fileName();
- qDebug() << "open?" << _configFile->isOpen();
- qDebug() << "keeping our stanzas?" << keepQuasselStanzas;
- if (!_configFile->isOpen() && !_configFile->open(QIODevice::ReadWrite))
+bool OidentdConfigGenerator::parseConfig(bool readQuasselStanzas) {
+ if (!_configFile->exists())
+ return true;
+
+ if (!_configFile->isOpen() && !_configFile->open(QIODevice::ReadOnly))
return false;
+ _mutex.lock();
- QByteArray parsedConfig;
+ _parsedConfig.clear();
+ _configFile->seek(0);
while (!_configFile->atEnd()) {
QByteArray line = _configFile->readLine();
- qDebug() << "line" << line;
- qDebug() << "line by us?" << lineByUs(line);
- if (keepQuasselStanzas || !lineByUs(line))
- parsedConfig.append(line);
+ if (!lineByUs(line))
+ _parsedConfig.append(line);
+ else if (readQuasselStanzas)
+ _quasselConfig.append(line);
}
- _config = parsedConfig;
-
+ _configFile->close();
+ _mutex.unlock();
return true;
}
bool OidentdConfigGenerator::writeConfig() {
- if (!_configFile->isOpen() && !_configFile->open(QFile::WriteOnly | QFile::Truncate))
+#ifdef HAVE_UMASK
+ mode_t prev_umask = umask(S_IXUSR | S_IWGRP | S_IXGRP | S_IWOTH | S_IXOTH); // == 0133, rw-r--r--
+#endif
+ bool not_open = (!_configFile->isOpen() && !_configFile->open(QIODevice::ReadWrite | QIODevice::Text));
+#ifdef HAVE_UMASK
+ umask(prev_umask);
+#endif
+
+ if (not_open)
return false;
- //FIXME: thread safety
- QTextStream out(_configFile);
- out << _config;
+ _mutex.lock();
- return _configFile->flush();
+ _configFile->seek(0);
+ _configFile->resize(0);
+ _configFile->write(_parsedConfig);
+ _configFile->write(_quasselConfig);
+
+ _configFile->close();
+ _mutex.unlock();
+ return true;
}
bool OidentdConfigGenerator::lineByUs(const QByteArray &line) {
- return !quasselStanza.exactMatch(line);
+ return _quasselStanzaRx.exactMatch(line);
}