X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2Foidentdconfiggenerator.h;h=55c06caf3469d2bfeec0bebaf5c79b959ecab598;hb=9c15e81b15a20e861c707e240c2cfee56bdf4bc9;hp=bc2e25a7b38354b192370173ebf9a63307343ef8;hpb=a72e2b4a90ce18c58b54e111161691ba008dc47d;p=quassel.git

diff --git a/src/core/oidentdconfiggenerator.h b/src/core/oidentdconfiggenerator.h
index bc2e25a7..55c06caf 100644
--- a/src/core/oidentdconfiggenerator.h
+++ b/src/core/oidentdconfiggenerator.h
@@ -27,19 +27,40 @@
 #include <QDateTime>
 #include <QHostAddress>
 #include <QMutex>
+#include <QByteArray>
+
+#ifndef Q_OS_WIN32
+#  include <sys/types.h>
+#  include <sys/stat.h>
+#endif /* Q_OS_WIN32 */
 
 #include "quassel.h"
 #include "coreidentity.h"
-#include <QDebug>
+
+//!  Produces oidentd configuration files
+/*!
+  Upon IRC connect this class puts the clients' ident data into an oidentd configuration file.
+
+  The default path is <~/.oidentd.conf>.
+
+  For oidentd to incorporate this file, the global oidentd.conf has to state something like this:
+
+  user "quassel" {
+    default {
+      allow spoof
+      allow spoof_all
+    }
+  }
+
+*/
 
 class OidentdConfigGenerator : public QObject
 {
-    Q_OBJECT
+  Q_OBJECT
 public:
   explicit OidentdConfigGenerator(QObject *parent = 0);
+  ~OidentdConfigGenerator();
 
-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);
@@ -47,20 +68,23 @@ public slots:
 private:
   bool init();
   bool writeConfig();
-  bool parseConfig(bool keepQuasselStanzas = true);
+  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;
+  QDir _configDir;
+  QString _configFileName;
+  QString _configPath;
+  QString _configTag;
+  QRegExp _quasselStanzaRx;
+  QString _quasselStanzaTemplate;
 };
 
 #endif // OIDENTDCONFIGGENERATOR_H