X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Foidentdconfiggenerator.cpp;h=df3f8c48b6919a761bd8383ada2058808f87c95f;hp=29cb56d47217976adfe6088a084459771cf816b6;hb=da885f3c8e152e9bdf573290adcf53bed58d95d1;hpb=2f4b9ffd04fad33c75254ccc3ca751a396a8470f

diff --git a/src/core/oidentdconfiggenerator.cpp b/src/core/oidentdconfiggenerator.cpp
index 29cb56d4..df3f8c48 100644
--- a/src/core/oidentdconfiggenerator.cpp
+++ b/src/core/oidentdconfiggenerator.cpp
@@ -24,11 +24,15 @@ OidentdConfigGenerator::OidentdConfigGenerator(QObject *parent) :
   QObject(parent),
   _initialized(false)
 {
-  qDebug() << "OidentdConfigGenerator() checking for being initialized";
   if (!_initialized)
     init();
 }
 
+OidentdConfigGenerator::~OidentdConfigGenerator() {
+  _quasselConfig.clear();
+  writeConfig();
+}
+
 bool OidentdConfigGenerator::init() {
   configDir = QDir::homePath();
   configFileName = ".oidentd.conf";
@@ -41,7 +45,6 @@ bool OidentdConfigGenerator::init() {
   configTag = " stanza created by Quassel";
 
   _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
@@ -50,11 +53,9 @@ bool OidentdConfigGenerator::init() {
   quasselStanzaTemplate = QString("lport %1 { reply \"%2\" } #%3\n");
   quasselStanzaRx = QRegExp(QString("^lport .* \\{ .* \\} #%1\\r?\\n").arg(configTag));
 
-  _mutex.lock();
   // initially remove all Quassel stanzas that might be present
   if (parseConfig(false) && writeConfig())
     _initialized = true;
-  _mutex.unlock();
 
   return _initialized;
 }
@@ -63,11 +64,9 @@ bool OidentdConfigGenerator::addSocket(const CoreIdentity *identity, const QHost
   Q_UNUSED(localAddress) Q_UNUSED(peerAddress) Q_UNUSED(peerPort)
   QString ident = identity->ident();
 
-  _config.append(quasselStanzaTemplate.arg(localPort).arg(ident).arg(configTag));
+  _quasselConfig.append(quasselStanzaTemplate.arg(localPort).arg(ident).arg(configTag));
 
-  _mutex.lock();
   bool ret = writeConfig();
-  _mutex.unlock();
 
   return ret;
 }
@@ -78,32 +77,40 @@ bool OidentdConfigGenerator::removeSocket(const CoreIdentity *identity, const QH
   return true;
 }
 
-bool OidentdConfigGenerator::parseConfig(bool keepQuasselStanzas) {
+bool OidentdConfigGenerator::parseConfig(bool readQuasselStanzas) {
   if (!_configFile->isOpen() && !_configFile->open(QIODevice::ReadWrite))
     return false;
+  _mutex.lock();
 
-  QByteArray parsedConfig;
+  _parsedConfig.clear();
+  _configFile->seek(0);
   while (!_configFile->atEnd()) {
     QByteArray line = _configFile->readLine();
 
-    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(QIODevice::ReadWrite | QIODevice::Text))
     return false;
+  _mutex.lock();
 
   _configFile->seek(0);
   _configFile->resize(0);
-  _configFile->write(_config);
+  _configFile->write(_parsedConfig);
+  _configFile->write(_quasselConfig);
 
-  return _configFile->flush();
+  _configFile->close();
+  _mutex.unlock();
+  return true;
 }
 
 bool OidentdConfigGenerator::lineByUs(const QByteArray &line) {