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

diff --git a/src/core/oidentdconfiggenerator.cpp b/src/core/oidentdconfiggenerator.cpp
index 2e6e0ca2..eca0fcdd 100644
--- a/src/core/oidentdconfiggenerator.cpp
+++ b/src/core/oidentdconfiggenerator.cpp
@@ -32,17 +32,25 @@ OidentdConfigGenerator::OidentdConfigGenerator(QObject *parent) :
 bool OidentdConfigGenerator::init() {
   configDir = QDir::homePath();
   configFileName = ".oidentd.conf";
+
+  if(Quassel::isOptionSet("oidentd-conffile"))
+    configPath = Quassel::optionValue("oidentd-conffile");
+  else
+    configPath = configDir.absoluteFilePath(configFileName);
+
   configTag = " stanza created by Quassel";
 
-  _configFile = new QFile(configDir.absoluteFilePath(configFileName));
+  _configFile = new QFile(configPath);
   qDebug() << "1: _configFile" << _configFile->fileName();
 
-  quasselStanza = QRegExp(QString("^lport .* { .* } #%1$").arg(configTag));
+  quasselStanza = QRegExp(QString("^lport .* \\{ .* \\} #%1\\n").arg(configTag));
 
-  if (parseConfig(true) && writeConfig())
+  _mutex.lock();
+  if (parseConfig(false) && writeConfig())
     _initialized = true;
+  _mutex.unlock();
 
-  qDebug() << "konichi wa °-°";
+  qDebug() << "OidentdConfigGenerator" << (!_initialized ? "not" : "") << "initialized";
 
   return _initialized;
 }
@@ -58,12 +66,24 @@ bool OidentdConfigGenerator::addSocket(const CoreIdentity *identity, const QHost
 
   _config.append(QString("lport %1 { reply \"%2\" } #%3\n").arg(localPort).arg(ident).arg(configTag));
 
-  return writeConfig();
+  _mutex.lock();
+  bool ret = writeConfig();
+  _mutex.unlock();
+  qDebug() << "config written" << ret;
+
+  return ret;
 }
 
-bool OidentdConfigGenerator::parseConfig(bool stripQuasselStanzas) {
+// 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))
     return false;
 
@@ -71,7 +91,9 @@ bool OidentdConfigGenerator::parseConfig(bool stripQuasselStanzas) {
   while (!_configFile->atEnd()) {
     QByteArray line = _configFile->readLine();
 
-    if (!stripQuasselStanzas || checkLine(line))
+    qDebug() << "line" << line;
+    qDebug() << "line by us?" << lineByUs(line);
+    if (keepQuasselStanzas || !lineByUs(line))
       parsedConfig.append(line);
   }
 
@@ -81,16 +103,16 @@ bool OidentdConfigGenerator::parseConfig(bool stripQuasselStanzas) {
 }
 
 bool OidentdConfigGenerator::writeConfig() {
-  if (!_configFile->isOpen() && !_configFile->open(QIODevice::ReadWrite))
+  if (!_configFile->isOpen() && !_configFile->open(QIODevice::ReadWrite | QIODevice::Text | QFile::Truncate))
     return false;
 
-  //FIXME: thread safety
-  QTextStream out(_configFile);
-  out << _config;
+  _configFile->seek(0);
+  _configFile->resize(0);
+  _configFile->write(_config);
 
   return _configFile->flush();
 }
 
-bool OidentdConfigGenerator::checkLine(const QByteArray &line) {
-  return !quasselStanza.exactMatch(line);
+bool OidentdConfigGenerator::lineByUs(const QByteArray &line) {
+  return quasselStanza.exactMatch(line);
 }