From 3fe23d142d83c2f79ad75103738fd161d52b003e Mon Sep 17 00:00:00 2001 From: Shane Synan Date: Mon, 18 Jun 2018 21:58:41 -0500 Subject: [PATCH] core: Fix oidentd signal connection, cleanup Update OidentdConfigGenerator signal connections, adding the missing socketId added in commit 41b9d689945e784b160a25d12076600ff4b7ae90 . This fixes a warning about signals/slots not matching up. Thanks to @genius3000 for finding this issue! Clean up line length and spacing while we're here. --- src/core/corenetwork.cpp | 12 ++++++++---- src/core/oidentdconfiggenerator.cpp | 24 ++++++++++++++++++++---- src/core/oidentdconfiggenerator.h | 8 ++++++-- 3 files changed, 34 insertions(+), 10 deletions(-) diff --git a/src/core/corenetwork.cpp b/src/core/corenetwork.cpp index d3c4645b..d7d259b7 100644 --- a/src/core/corenetwork.cpp +++ b/src/core/corenetwork.cpp @@ -100,13 +100,17 @@ CoreNetwork::CoreNetwork(const NetworkId &networkid, CoreSession *session) connect(this, SIGNAL(capRemoved(QString)), this, SLOT(serverCapRemoved(QString))); if (Quassel::isOptionSet("oidentd")) { - connect(this, SIGNAL(socketInitialized(const CoreIdentity*, QHostAddress, quint16, QHostAddress, quint16)), Core::instance()->oidentdConfigGenerator(), SLOT(addSocket(const CoreIdentity*, QHostAddress, quint16, QHostAddress, quint16)), Qt::BlockingQueuedConnection); - connect(this, SIGNAL(socketDisconnected(const CoreIdentity*, QHostAddress, quint16, QHostAddress, quint16)), Core::instance()->oidentdConfigGenerator(), SLOT(removeSocket(const CoreIdentity*, QHostAddress, quint16, QHostAddress, quint16))); + connect(this, SIGNAL(socketInitialized(const CoreIdentity*, QHostAddress, quint16, QHostAddress, quint16, qint64)), + Core::instance()->oidentdConfigGenerator(), SLOT(addSocket(const CoreIdentity*, QHostAddress, quint16, QHostAddress, quint16, qint64)), Qt::BlockingQueuedConnection); + connect(this, SIGNAL(socketDisconnected(const CoreIdentity*, QHostAddress, quint16, QHostAddress, quint16, qint64)), + Core::instance()->oidentdConfigGenerator(), SLOT(removeSocket(const CoreIdentity*, QHostAddress, quint16, QHostAddress, quint16, qint64))); } if (Quassel::isOptionSet("ident-daemon")) { - connect(this, SIGNAL(socketInitialized(const CoreIdentity*, QHostAddress, quint16, QHostAddress, quint16, qint64)), Core::instance()->identServer(), SLOT(addSocket(const CoreIdentity*, QHostAddress, quint16, QHostAddress, quint16, qint64)), Qt::BlockingQueuedConnection); - connect(this, SIGNAL(socketDisconnected(const CoreIdentity*, QHostAddress, quint16, QHostAddress, quint16, qint64)), Core::instance()->identServer(), SLOT(removeSocket(const CoreIdentity*, QHostAddress, quint16, QHostAddress, quint16, qint64))); + connect(this, SIGNAL(socketInitialized(const CoreIdentity*, QHostAddress, quint16, QHostAddress, quint16, qint64)), + Core::instance()->identServer(), SLOT(addSocket(const CoreIdentity*, QHostAddress, quint16, QHostAddress, quint16, qint64)), Qt::BlockingQueuedConnection); + connect(this, SIGNAL(socketDisconnected(const CoreIdentity*, QHostAddress, quint16, QHostAddress, quint16, qint64)), + Core::instance()->identServer(), SLOT(removeSocket(const CoreIdentity*, QHostAddress, quint16, QHostAddress, quint16, qint64))); } } diff --git a/src/core/oidentdconfiggenerator.cpp b/src/core/oidentdconfiggenerator.cpp index c1bd71ab..76a2c064 100644 --- a/src/core/oidentdconfiggenerator.cpp +++ b/src/core/oidentdconfiggenerator.cpp @@ -76,9 +76,16 @@ QString OidentdConfigGenerator::sysIdentForIdentity(const CoreIdentity *identity } -bool OidentdConfigGenerator::addSocket(const CoreIdentity *identity, const QHostAddress &localAddress, quint16 localPort, const QHostAddress &peerAddress, quint16 peerPort) +bool OidentdConfigGenerator::addSocket(const CoreIdentity *identity, + const QHostAddress &localAddress, quint16 localPort, + const QHostAddress &peerAddress, quint16 peerPort, + qint64 socketId) { - Q_UNUSED(localAddress) Q_UNUSED(peerAddress) Q_UNUSED(peerPort) + Q_UNUSED(localAddress) + Q_UNUSED(peerAddress) + Q_UNUSED(peerPort) + Q_UNUSED(socketId) + const QString ident = sysIdentForIdentity(identity); _quasselConfig.append(_quasselStanzaTemplate.arg(localPort).arg(ident).arg(_configTag).toLatin1()); @@ -90,9 +97,18 @@ bool OidentdConfigGenerator::addSocket(const CoreIdentity *identity, const QHost //! not yet implemented -bool OidentdConfigGenerator::removeSocket(const CoreIdentity *identity, const QHostAddress &localAddress, quint16 localPort, const QHostAddress &peerAddress, quint16 peerPort) +bool OidentdConfigGenerator::removeSocket(const CoreIdentity *identity, + const QHostAddress &localAddress, quint16 localPort, + const QHostAddress &peerAddress, quint16 peerPort, + qint64 socketId) { - Q_UNUSED(identity) Q_UNUSED(localAddress) Q_UNUSED(localPort) Q_UNUSED(peerAddress) Q_UNUSED(peerPort) + Q_UNUSED(identity) + Q_UNUSED(localAddress) + Q_UNUSED(localPort) + Q_UNUSED(peerAddress) + Q_UNUSED(peerPort) + Q_UNUSED(socketId) + return true; } diff --git a/src/core/oidentdconfiggenerator.h b/src/core/oidentdconfiggenerator.h index bfd351fe..790d85be 100644 --- a/src/core/oidentdconfiggenerator.h +++ b/src/core/oidentdconfiggenerator.h @@ -63,8 +63,12 @@ public: ~OidentdConfigGenerator(); 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; -- 2.20.1