X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Foidentdconfiggenerator.h;h=ee3e53c3196622cc3a4a72d67134ffb6a38cf06a;hb=20745bd0cbae035b84913127dfec9e8433d1282d;hp=3302c87b8f886316b2c5d2aa07de669dc10441db;hpb=68878dc8366f2f4a0afe132847aad9a51a80cdbf;p=quassel.git

diff --git a/src/core/oidentdconfiggenerator.h b/src/core/oidentdconfiggenerator.h
index 3302c87b..ee3e53c3 100644
--- a/src/core/oidentdconfiggenerator.h
+++ b/src/core/oidentdconfiggenerator.h
@@ -22,6 +22,7 @@
 #define OIDENTDCONFIGGENERATOR_H
 
 #include <QObject>
+#include <QString>
 #include <QDir>
 #include <QFile>
 #include <QDateTime>
@@ -29,11 +30,6 @@
 #include <QMutex>
 #include <QByteArray>
 
-#ifdef HAVE_UMASK
-#  include <sys/types.h>
-#  include <sys/stat.h>
-#endif /* HAVE_UMASK */
-
 #include "quassel.h"
 #include "coreidentity.h"
 
@@ -58,20 +54,26 @@ 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 _initialized;
+    bool _initialized{false};
+    bool _strict;
     QDateTime _lastSync;
     QFile *_configFile;
     QByteArray _parsedConfig;