X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Foidentdconfiggenerator.h;h=8a71b53dfbed44a083abdfe35c81396e6a4ac6aa;hb=db00831bca59a012242d1ad5fac52a20c6cd2956;hp=aad24d9530180218a8101e6ff44c59a73bc1bf77;hpb=b65b9f7615165e8700a44d59b7275a55558dd45b;p=quassel.git

diff --git a/src/core/oidentdconfiggenerator.h b/src/core/oidentdconfiggenerator.h
index aad24d95..8a71b53d 100644
--- a/src/core/oidentdconfiggenerator.h
+++ b/src/core/oidentdconfiggenerator.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,21 +21,17 @@
 #ifndef OIDENTDCONFIGGENERATOR_H
 #define OIDENTDCONFIGGENERATOR_H
 
-#include <QObject>
+#include <QByteArray>
+#include <QDateTime>
 #include <QDir>
 #include <QFile>
-#include <QDateTime>
 #include <QHostAddress>
 #include <QMutex>
-#include <QByteArray>
-
-#ifdef HAVE_UMASK
-#  include <sys/types.h>
-#  include <sys/stat.h>
-#endif /* HAVE_UMASK */
+#include <QObject>
+#include <QString>
 
-#include "quassel.h"
 #include "coreidentity.h"
+#include "quassel.h"
 
 //!  Produces oidentd configuration files
 /*!
@@ -58,22 +54,34 @@ class OidentdConfigGenerator : public QObject
 {
     Q_OBJECT
 public:
-    explicit OidentdConfigGenerator(QObject *parent = 0);
-    ~OidentdConfigGenerator();
+    explicit OidentdConfigGenerator(QObject* parent = nullptr);
+    ~OidentdConfigGenerator() override;
 
 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);
+    bool addSocket(const CoreIdentity* identity,
+                   const QHostAddress& localAddress,
+                   quint16 localPort,
+                   const QHostAddress& peerAddress,
+                   quint16 peerPort,
+                   qint64 socketId);
+    bool removeSocket(const CoreIdentity* identity,
+                      const QHostAddress& localAddress,
+                      quint16 localPort,
+                      const QHostAddress& peerAddress,
+                      quint16 peerPort,
+                      qint64 socketId);
 
 private:
+    QString sysIdentForIdentity(const CoreIdentity* identity) const;
     bool init();
     bool writeConfig();
     bool parseConfig(bool readQuasselStanzas = false);
-    bool lineByUs(const QByteArray &line);
+    bool lineByUs(const QByteArray& line);
 
-    bool _initialized;
+    bool _initialized{false};
+    bool _strict;
     QDateTime _lastSync;
-    QFile *_configFile;
+    QFile* _configFile;
     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
@@ -87,5 +95,4 @@ private:
     QString _quasselStanzaTemplate;
 };
 
-
-#endif // OIDENTDCONFIGGENERATOR_H
+#endif  // OIDENTDCONFIGGENERATOR_H