X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Foidentdconfiggenerator.h;h=81ee21c496637bb085f9a7705f61e8d74b5151da;hp=db4016c1103dd64a487daa31f8af7f41cad8359f;hb=da885f3c8e152e9bdf573290adcf53bed58d95d1;hpb=03eb5a574ec55546c62336428c7a9caa63b45a7a

diff --git a/src/core/oidentdconfiggenerator.h b/src/core/oidentdconfiggenerator.h
index db4016c1..81ee21c4 100644
--- a/src/core/oidentdconfiggenerator.h
+++ b/src/core/oidentdconfiggenerator.h
@@ -25,37 +25,45 @@
 #include <QDir>
 #include <QFile>
 #include <QDateTime>
+#include <QHostAddress>
+#include <QMutex>
 
-#include <QDebug>
+#include "quassel.h"
+#include "coreidentity.h"
 
 class OidentdConfigGenerator : public QObject
 {
     Q_OBJECT
 public:
   explicit OidentdConfigGenerator(QObject *parent = 0);
+  ~OidentdConfigGenerator();
 
-  QDir configDir;
-  QString configFileName;
-    
 signals:
     
 public slots:
-  bool update();
+  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 checkLine(const QByteArray &line);
+  bool parseConfig(bool readQuasselStanzas = false);
+  bool lineByUs(const QByteArray &line);
 
   bool _initialized;
   QDateTime _lastSync;
   QFile *_configFile;
-  QByteArray _config;
+  QByteArray _parsedConfig;
+  QByteArray _quasselConfig;
+  // 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