X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Foidentdconfiggenerator.h;h=9e05162a7929741120bc0d8ab8a221bfeab0e69a;hp=f4e819f986835c39f1ce0dc10f2ea2028cc934da;hb=160492494676f09b7836badc165727a538f03ece;hpb=f81ad4f71a532ca310fae0fbe2f412bde9a37521

diff --git a/src/core/oidentdconfiggenerator.h b/src/core/oidentdconfiggenerator.h
index f4e819f9..9e05162a 100644
--- a/src/core/oidentdconfiggenerator.h
+++ b/src/core/oidentdconfiggenerator.h
@@ -26,9 +26,10 @@
 #include <QFile>
 #include <QDateTime>
 #include <QHostAddress>
+#include <QMutex>
 
+#include "quassel.h"
 #include "coreidentity.h"
-#include <QDebug>
 
 class OidentdConfigGenerator : public QObject
 {
@@ -36,28 +37,31 @@ class OidentdConfigGenerator : public QObject
 public:
   explicit OidentdConfigGenerator(QObject *parent = 0);
 
-  QDir configDir;
-  QString configFileName;
-    
 signals:
     
 public slots:
   bool addSocket(const CoreIdentity *identity, const QHostAddress &localAddress, quint16 localPort, const QHostAddress &peerAddress, quint16 peerPort);
+  bool removeSocket(const CoreIdentity *identity, const QHostAddress &localAddress, quint16 localPort, const QHostAddress &peerAddress, quint16 peerPort);
 
 private:
   bool init();
   bool writeConfig();
-  bool parseConfig(bool stripQuasselStanzas = false);
-  bool checkLine(const QByteArray &line);
+  bool parseConfig(bool keepQuasselStanzas = true);
+  bool lineByUs(const QByteArray &line);
 
   bool _initialized;
   QDateTime _lastSync;
   QFile *_configFile;
   QByteArray _config;
+  // Mutex isn't strictly necessary at the moment, since with the current invocation in Core only one instance at a time exists
+  QMutex _mutex;
 
+  QDir configDir;
+  QString configFileName;
+  QString configPath;
   QString configTag;
-
-  QRegExp quasselStanza;
+  QRegExp quasselStanzaRx;
+  QString quasselStanzaTemplate;
 };
 
 #endif // OIDENTDCONFIGGENERATOR_H