data/linux.x86.linphone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ldap debug option

Browse source
This commit is contained in:
Christophe Deschamps 2024-11-06 19:10:51 +01:00
parent ab4acc8f03
commit 40137bcf26
5 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Linphone/core/address-books/ldap/LdapCore.cpp
View file

@ -51,7 +51,7 @@ LdapCore::LdapCore(const std::shared_ptr<linphone::Ldap> &ldap) : QObject(nullpt
INIT_CORE_MEMBER(NameAttribute, mLdapModel) INIT_CORE_MEMBER(NameAttribute, mLdapModel)
INIT_CORE_MEMBER(SipAttribute, mLdapModel) INIT_CORE_MEMBER(SipAttribute, mLdapModel)
INIT_CORE_MEMBER(SipDomain, mLdapModel) INIT_CORE_MEMBER(SipDomain, mLdapModel)
INIT_CORE_MEMBER(DebugLevel, mLdapModel) INIT_CORE_MEMBER(Debug, mLdapModel)
} }
LdapCore::~LdapCore() { LdapCore::~LdapCore() {
@ -101,13 +101,12 @@ void LdapCore::setSelf(QSharedPointer<LdapCore> me) {
DEFINE_CORE_GETSET_CONNECT(mLdapModelConnection, LdapCore, LdapModel, mLdapModel, QString, sipAttribute, DEFINE_CORE_GETSET_CONNECT(mLdapModelConnection, LdapCore, LdapModel, mLdapModel, QString, sipAttribute,
SipAttribute) SipAttribute)
DEFINE_CORE_GETSET_CONNECT(mLdapModelConnection, LdapCore, LdapModel, mLdapModel, QString, sipDomain, SipDomain) DEFINE_CORE_GETSET_CONNECT(mLdapModelConnection, LdapCore, LdapModel, mLdapModel, QString, sipDomain, SipDomain)
DEFINE_CORE_GETSET_CONNECT(mLdapModelConnection, LdapCore, LdapModel, mLdapModel, linphone::Ldap::DebugLevel, DEFINE_CORE_GETSET_CONNECT(mLdapModelConnection, LdapCore, LdapModel, mLdapModel, bool, debug, Debug)
debugLevel, DebugLevel)
mLdapModelConnection->makeConnectToModel(&LdapModel::saved, [this]() { mLdapModelConnection->makeConnectToModel(&LdapModel::saved, [this]() {
mLdapModelConnection->invokeToCore([this]() { emit App::getInstance()->getSettings()->ldapConfigChanged(); }); mLdapModelConnection->invokeToCore([this]() { emit App::getInstance() -> getSettings()->ldapConfigChanged(); });
}); });
mLdapModelConnection->makeConnectToModel(&LdapModel::removed, [this]() { mLdapModelConnection->makeConnectToModel(&LdapModel::removed, [this]() {
mLdapModelConnection->invokeToCore([this]() { emit App::getInstance()->getSettings()->ldapConfigChanged(); }); mLdapModelConnection->invokeToCore([this]() { emit App::getInstance() -> getSettings()->ldapConfigChanged(); });
}); });
} }

2
Linphone/core/address-books/ldap/LdapCore.hpp
View file

@ -60,7 +60,7 @@ public:
DECLARE_CORE_GETSET_MEMBER(QString, nameAttribute, NameAttribute) DECLARE_CORE_GETSET_MEMBER(QString, nameAttribute, NameAttribute)
DECLARE_CORE_GETSET_MEMBER(QString, sipAttribute, SipAttribute) DECLARE_CORE_GETSET_MEMBER(QString, sipAttribute, SipAttribute)
DECLARE_CORE_GETSET_MEMBER(QString, sipDomain, SipDomain) DECLARE_CORE_GETSET_MEMBER(QString, sipDomain, SipDomain)
DECLARE_CORE_GETSET_MEMBER(linphone::Ldap::DebugLevel, debugLevel, DebugLevel) DECLARE_CORE_GETSET_MEMBER(bool, debug, Debug)
private: private:
std::shared_ptr<LdapModel> mLdapModel; std::shared_ptr<LdapModel> mLdapModel;

14
Linphone/model/address-books/ldap/LdapModel.cpp
View file

@ -63,6 +63,19 @@ void LdapModel::remove() {
emit removed(); emit removed();
} }
bool LdapModel::getDebug() const {
mustBeInLinphoneThread(log().arg(Q_FUNC_INFO));
return mLdapParamsClone->getDebugLevel() == linphone::Ldap::DebugLevel::Verbose;
}
void LdapModel::setDebug(bool data) {
mustBeInLinphoneThread(log().arg(Q_FUNC_INFO));
if (getDebug() != data) {
mLdapParamsClone->setDebugLevel(data ? linphone::Ldap::DebugLevel::Verbose : linphone::Ldap::DebugLevel::Off);
save();
emit debugChanged(data);
}
}
DEFINE_GETSET(LdapModel, bool, enabled, Enabled, mLdapParamsClone) DEFINE_GETSET(LdapModel, bool, enabled, Enabled, mLdapParamsClone)
DEFINE_GETSET_MODEL_STRING(LdapModel, server, Server, mLdapParamsClone) DEFINE_GETSET_MODEL_STRING(LdapModel, server, Server, mLdapParamsClone)
DEFINE_GETSET_MODEL_STRING(LdapModel, bindDn, BindDn, mLdapParamsClone) DEFINE_GETSET_MODEL_STRING(LdapModel, bindDn, BindDn, mLdapParamsClone)
@ -83,4 +96,3 @@ DEFINE_GETSET(LdapModel, int, minChars, MinChars, mLdapParamsClone)
DEFINE_GETSET_MODEL_STRING(LdapModel, nameAttribute, NameAttribute, mLdapParamsClone) DEFINE_GETSET_MODEL_STRING(LdapModel, nameAttribute, NameAttribute, mLdapParamsClone)
DEFINE_GETSET_MODEL_STRING(LdapModel, sipAttribute, SipAttribute, mLdapParamsClone) DEFINE_GETSET_MODEL_STRING(LdapModel, sipAttribute, SipAttribute, mLdapParamsClone)
DEFINE_GETSET_MODEL_STRING(LdapModel, sipDomain, SipDomain, mLdapParamsClone) DEFINE_GETSET_MODEL_STRING(LdapModel, sipDomain, SipDomain, mLdapParamsClone)
DEFINE_GETSET(LdapModel, linphone::Ldap::DebugLevel, debugLevel, DebugLevel, mLdapParamsClone)

2
Linphone/model/address-books/ldap/LdapModel.hpp
View file

@ -54,7 +54,7 @@ public:
DECLARE_GETSET(QString, nameAttribute, NameAttribute) DECLARE_GETSET(QString, nameAttribute, NameAttribute)
DECLARE_GETSET(QString, sipAttribute, SipAttribute) DECLARE_GETSET(QString, sipAttribute, SipAttribute)
DECLARE_GETSET(QString, sipDomain, SipDomain) DECLARE_GETSET(QString, sipDomain, SipDomain)
DECLARE_GETSET(linphone::Ldap::DebugLevel, debugLevel, DebugLevel) DECLARE_GETSET(bool, debug, Debug)
signals: signals:
void saved(); void saved();

5
Linphone/view/Page/Layout/Settings/LdapSettingsLayout.qml
View file

@ -176,6 +176,11 @@ AbstractSettingsLayout {
title: qsTr("Domaine SIP") title: qsTr("Domaine SIP")
toValidate: true toValidate: true
} }
SwitchSetting {
titleText: qsTr("Débogage")
propertyName: "debug"
propertyOwner: ldapGui.core
}
} }
} }
} }