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

diff --git a/src/core/oidentdconfiggenerator.cpp b/src/core/oidentdconfiggenerator.cpp
index eca0fcdd..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,35 +45,28 @@ bool OidentdConfigGenerator::init() {
   configTag = " stanza created by Quassel";
 
   _configFile = new QFile(configPath);
-  qDebug() << "1: _configFile" << _configFile->fileName();
 
-  quasselStanza = QRegExp(QString("^lport .* \\{ .* \\} #%1\\n").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.
 
-  _mutex.lock();
+  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;
-  _mutex.unlock();
-
-  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));
 
-  _mutex.lock();
   bool ret = writeConfig();
-  _mutex.unlock();
-  qDebug() << "config written" << ret;
 
   return ret;
 }
@@ -80,39 +77,42 @@ bool OidentdConfigGenerator::removeSocket(const CoreIdentity *identity, const QH
   return true;
 }
 
-bool OidentdConfigGenerator::parseConfig(bool keepQuasselStanzas) {
-  qDebug() << "_configFile name" << _configFile->fileName();
-  qDebug() << "open?" << _configFile->isOpen();
-  qDebug() << "keeping our stanzas?" << 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();
 
-    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(QIODevice::ReadWrite | QIODevice::Text | QFile::Truncate))
+  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) {
-  return quasselStanza.exactMatch(line);
+  return quasselStanzaRx.exactMatch(line);
 }