From 59110d58420af8b9ba4fbd13226aaf9f08192300 Mon Sep 17 00:00:00 2001 From: heck Date: Mon, 26 Apr 2021 04:18:03 +0200 Subject: [PATCH] grp driver engine - restructure --- src/grp_driver_engine.cc | 53 +++++++++++++++++++++++++++++++++ src/grp_driver_engine.hh | 47 +++++++++++++++++++++++++++++ src/grp_update_drv_engine.cc | 57 ------------------------------------ src/grp_update_drv_engine.hh | 49 ------------------------------- 4 files changed, 100 insertions(+), 106 deletions(-) create mode 100644 src/grp_driver_engine.cc create mode 100644 src/grp_driver_engine.hh delete mode 100644 src/grp_update_drv_engine.cc delete mode 100644 src/grp_update_drv_engine.hh diff --git a/src/grp_driver_engine.cc b/src/grp_driver_engine.cc new file mode 100644 index 0000000..d066022 --- /dev/null +++ b/src/grp_driver_engine.cc @@ -0,0 +1,53 @@ +#include "grp_driver_engine.hh" +#include "pEpLog.hh" +#include +#include + +using namespace std; + +namespace pEp { + namespace Adapter { + bool GroupDriverEngine::log_enabled = false; + + GroupDriverEngine::GroupDriverEngine() { + pEpLogClass("called"); + } + + PEP_STATUS GroupDriverEngine::adapter_group_create( + PEP_SESSION session, + pEp_identity *group_identity, + pEp_identity *manager, + identity_list *memberlist) noexcept + { + pEpLogClass("called"); + return ::group_create(session, group_identity, manager, memberlist, nullptr); + } + + PEP_STATUS GroupDriverEngine::adapter_group_dissolve( + PEP_SESSION session, + pEp_identity *group_identity, + pEp_identity *manager) noexcept + { + pEpLogClass("called"); + return ::group_dissolve(session, group_identity, manager); + } + + PEP_STATUS GroupDriverEngine::adapter_group_invite_member( + PEP_SESSION session, + pEp_identity *group_identity, + pEp_identity *group_member) noexcept + { + pEpLogClass("called"); + return ::group_invite_member(session, group_identity, group_member); + } + + PEP_STATUS GroupDriverEngine::adapter_group_remove_member( + PEP_SESSION session, + pEp_identity *group_identity, + pEp_identity *group_member) noexcept + { + pEpLogClass("called"); + return ::group_remove_member(session, group_identity, group_member); + } + } // namespace Adapter +} // namespace pEp \ No newline at end of file diff --git a/src/grp_driver_engine.hh b/src/grp_driver_engine.hh new file mode 100644 index 0000000..268e617 --- /dev/null +++ b/src/grp_driver_engine.hh @@ -0,0 +1,47 @@ +// This file is under GNU General Public License 3.0 +// see LICENSE.txt +#ifndef LIBPEPADAPTER_GRP_DRIVER_ENGINE_HH +#define LIBPEPADAPTER_GRP_DRIVER_ENGINE_HH + +#include "grp_manager_interface.hh" +#include "pEpLog.hh" +#include + +namespace pEp { + namespace Adapter { + class GroupDriverEngine : public GroupUpdateInterface { + public: + GroupDriverEngine(); + + PEP_STATUS adapter_group_create( + ::PEP_SESSION session, + ::pEp_identity *group_identity, + ::pEp_identity *manager, + ::identity_list *memberlist) noexcept override; + + PEP_STATUS adapter_group_dissolve( + ::PEP_SESSION session, + ::pEp_identity *group_identity, + ::pEp_identity *manager) noexcept override; + + PEP_STATUS adapter_group_invite_member( + ::PEP_SESSION session, + ::pEp_identity *group_identity, + ::pEp_identity *group_member) noexcept override; + + PEP_STATUS adapter_group_remove_member( + ::PEP_SESSION session, + ::pEp_identity *group_identity, + ::pEp_identity *group_member) noexcept override; + + // Logging + static bool log_enabled; + Adapter::pEpLog::pEpLogger logger{ "GroupDriverEngine", log_enabled }; + + private: + Adapter::pEpLog::pEpLogger &m4gic_logger_n4me = logger; + }; + } // namespace Adapter +} // namespace pEp + +#endif // LIBPEPADAPTER_GRP_DRIVER_ENGINE_HH diff --git a/src/grp_update_drv_engine.cc b/src/grp_update_drv_engine.cc deleted file mode 100644 index f8314c9..0000000 --- a/src/grp_update_drv_engine.cc +++ /dev/null @@ -1,57 +0,0 @@ -#include "grp_update_drv_engine.hh" -#include "pEpLog.hh" -#include -#include - -using namespace std; - -namespace pEp { - bool GroupUpdateDriverEngine::log_enabled = false; - - PEP_STATUS GroupUpdateDriverEngine::adapter_group_create( - PEP_SESSION session, - pEp_identity *group_identity, - pEp_identity *manager, - identity_list *memberlist) noexcept - { - pEpLogClass("called"); - return ::group_create(session, group_identity, manager, memberlist, nullptr); - } - -// PEP_STATUS GroupUpdateDriverEngine::adapter_group_join( -// PEP_SESSION session, -// pEp_identity *group_identity, -// pEp_identity *as_member) noexcept -// { -// pEpLogClass("called"); -// return ::group_join(session, group_identity, as_member); -// } - - PEP_STATUS GroupUpdateDriverEngine::adapter_group_dissolve( - PEP_SESSION session, - pEp_identity *group_identity, - pEp_identity *manager) noexcept - { - pEpLogClass("called"); - return ::group_dissolve(session, group_identity, manager); - } - - PEP_STATUS GroupUpdateDriverEngine::adapter_group_invite_member( - PEP_SESSION session, - pEp_identity *group_identity, - pEp_identity *group_member) noexcept - { - pEpLogClass("called"); - return ::group_invite_member(session, group_identity, group_member); - } - - PEP_STATUS GroupUpdateDriverEngine::adapter_group_remove_member( - PEP_SESSION session, - pEp_identity *group_identity, - pEp_identity *group_member) noexcept - { - pEpLogClass("called"); - return ::group_remove_member(session, group_identity, group_member); - } - -} // namespace pEp \ No newline at end of file diff --git a/src/grp_update_drv_engine.hh b/src/grp_update_drv_engine.hh deleted file mode 100644 index 9bd334f..0000000 --- a/src/grp_update_drv_engine.hh +++ /dev/null @@ -1,49 +0,0 @@ -// This file is under GNU General Public License 3.0 -// see LICENSE.txt -#ifndef LIBPEPADAPTER_GRP_UPDATE_DRV_ENGINE_HH -#define LIBPEPADAPTER_GRP_UPDATE_DRV_ENGINE_HH - -#include "grp_update_interface.hh" -#include "pEpLog.hh" -#include -#include - -namespace pEp { - class GroupUpdateDriverEngine : public GroupUpdateInterface { - public: - PEP_STATUS adapter_group_create( - PEP_SESSION session, - pEp_identity *group_identity, - pEp_identity *manager, - identity_list *memberlist) noexcept override; - -// PEP_STATUS adapter_group_join( -// PEP_SESSION session, -// pEp_identity *group_identity, -// pEp_identity *as_member) noexcept override; - - PEP_STATUS adapter_group_dissolve( - PEP_SESSION session, - pEp_identity *group_identity, - pEp_identity *manager) noexcept override; - - PEP_STATUS adapter_group_invite_member( - PEP_SESSION session, - pEp_identity *group_identity, - pEp_identity *group_member) noexcept override; - - PEP_STATUS adapter_group_remove_member( - PEP_SESSION session, - pEp_identity *group_identity, - pEp_identity *group_member) noexcept override; - - // Logging - static bool log_enabled; - Adapter::pEpLog::pEpLogger logger{ "GroupUpdateDriverEngine", log_enabled }; - - private: - Adapter::pEpLog::pEpLogger &m4gic_logger_n4me = logger; - }; -} // namespace pEp - -#endif // LIBPEPADAPTER_GRP_UPDATE_DRV_ENGINE_HH