projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
oidentd code cleanup
[quassel.git]
/
src
/
core
/
oidentdconfiggenerator.cpp
diff --git
a/src/core/oidentdconfiggenerator.cpp
b/src/core/oidentdconfiggenerator.cpp
index
62d31c2
..
fac6dcd
100644
(file)
--- a/
src/core/oidentdconfiggenerator.cpp
+++ b/
src/core/oidentdconfiggenerator.cpp
@@
-24,79
+24,104
@@
OidentdConfigGenerator::OidentdConfigGenerator(QObject *parent) :
QObject(parent),
_initialized(false)
{
QObject(parent),
_initialized(false)
{
- qDebug() << "OidentdConfigGenerator() checking for being initialized";
if (!_initialized)
init();
}
if (!_initialized)
init();
}
+OidentdConfigGenerator::~OidentdConfigGenerator() {
+ _quasselConfig.clear();
+ writeConfig();
+ _configFile->deleteLater();
+}
+
bool OidentdConfigGenerator::init() {
bool OidentdConfigGenerator::init() {
- configDir = QDir::homePath();
- configFileName = ".oidentd.conf";
+
_
configDir = QDir::homePath();
+
_
configFileName = ".oidentd.conf";
if(Quassel::isOptionSet("oidentd-conffile"))
if(Quassel::isOptionSet("oidentd-conffile"))
- configPath = Quassel::optionValue("oidentd-conffile");
+
_
configPath = Quassel::optionValue("oidentd-conffile");
else
else
-
configPath = configDir.absoluteFilePath(
configFileName);
+
_configPath = _configDir.absoluteFilePath(_
configFileName);
- configTag = " stanza created by Quassel";
+
_
configTag = " stanza created by Quassel";
- _configFile = new QFile(configPath);
- qDebug() << "1: _configFile" << _configFile->fileName();
+ _configFile = new QFile(_configPath);
- quasselStanza = QRegExp(QString("^lport .* { .* } #%1$").arg(configTag));
+ // 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.
- if (parseConfig(true) && writeConfig())
-
_initialized = true
;
+ _quasselStanzaTemplate = QString("lport %1 { reply \"%2\" } #%3\n");
+
_quasselStanzaRx = QRegExp(QString("^lport .* \\{ .* \\} #%1\\r?\\n").arg(_configTag))
;
- qDebug() << "konichi wa °-°";
+ // initially remove all Quassel stanzas that might be present
+ if (parseConfig(false) && writeConfig())
+ _initialized = true;
return _initialized;
}
bool OidentdConfigGenerator::addSocket(const CoreIdentity *identity, const QHostAddress &localAddress, quint16 localPort, const QHostAddress &peerAddress, quint16 peerPort) {
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();
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();
+
+ return ret;
+}
- return writeConfig();
+//! 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 stripQuasselStanzas) {
- qDebug() << "_configFile name" << _configFile->fileName();
- qDebug() << "open?" << _configFile->isOpen();
- 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;
return false;
+ _mutex.lock();
- QByteArray parsedConfig;
+ _parsedConfig.clear();
+ _configFile->seek(0);
while (!_configFile->atEnd()) {
QByteArray line = _configFile->readLine();
while (!_configFile->atEnd()) {
QByteArray line = _configFile->readLine();
- if (!stripQuasselStanzas || checkLine(line))
- parsedConfig.append(line);
+ if (!lineByUs(line))
+ _parsedConfig.append(line);
+ else if (readQuasselStanzas)
+ _quasselConfig.append(line);
}
}
- _config
= parsedConfig
;
-
+ _config
File->close()
;
+ _mutex.unlock();
return true;
}
bool OidentdConfigGenerator::writeConfig() {
return true;
}
bool OidentdConfigGenerator::writeConfig() {
- if (!_configFile->isOpen() && !_configFile->open(QIODevice::ReadWrite))
+ mode_t prev_umask = umask(S_IXUSR | S_IWGRP | S_IXGRP | S_IWOTH | S_IXOTH); // == 0133, rw-r--r--
+ bool not_open = (!_configFile->isOpen() && !_configFile->open(QIODevice::ReadWrite | QIODevice::Text));
+ umask(prev_umask);
+
+ if (not_open)
return false;
return false;
- //FIXME: thread safety
- QTextStream out(_configFile);
- out << _config;
+ _mutex.lock();
+
+ _configFile->seek(0);
+ _configFile->resize(0);
+ _configFile->write(_parsedConfig);
+ _configFile->write(_quasselConfig);
- return _configFile->flush();
+ _configFile->close();
+ _mutex.unlock();
+ return true;
}
}
-bool OidentdConfigGenerator::
checkLine
(const QByteArray &line) {
- return
!quasselStanza
.exactMatch(line);
+bool OidentdConfigGenerator::
lineByUs
(const QByteArray &line) {
+ return
_quasselStanzaRx
.exactMatch(line);
}
}