/***************************************************************************
- * Copyright (C) 2005-2015 by the Quassel Project *
+ * Copyright (C) 2005-2020 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#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
/*!
{
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
QString _quasselStanzaTemplate;
};
-
-#endif // OIDENTDCONFIGGENERATOR_H
+#endif // OIDENTDCONFIGGENERATOR_H