Amebis/GEANTLink
Amebis/GEANTLink
1
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 50 Wiki Activity

config_providers renamed to config_provider_list to avoid confusion with config_provider

Browse Source
This commit is contained in:
Simon Rozman 2016-08-06 07:06:48 +02:00
parent 2aa4bce8cc
commit ac606b7a2e
6 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/EAPBase/include/Config.h
View File

@ -47,7 +47,7 @@ namespace eap
/// ///
/// Base class for the list of providers configuration storage /// Base class for the list of providers configuration storage
/// ///
class config_providers; class config_provider_list;
} }
/// ///
@ -484,7 +484,7 @@ namespace eap
}; };
class config_providers : public config class config_provider_list : public config
{ {
public: public:
/// ///
@ -492,21 +492,21 @@ namespace eap
/// ///
/// \param[in] mod EAP module to use for global services /// \param[in] mod EAP module to use for global services
/// ///
config_providers(_In_ module &mod); config_provider_list(_In_ module &mod);
/// ///
/// Copies configuration /// Copies configuration
/// ///
/// \param[in] other Configuration to copy from /// \param[in] other Configuration to copy from
/// ///
config_providers(_In_ const config_providers &other); config_provider_list(_In_ const config_provider_list &other);
/// ///
/// Moves configuration /// Moves configuration
/// ///
/// \param[in] other Configuration to move from /// \param[in] other Configuration to move from
/// ///
config_providers(_Inout_ config_providers &&other); config_provider_list(_Inout_ config_provider_list &&other);
/// ///
/// Copies configuration /// Copies configuration
@ -515,7 +515,7 @@ namespace eap
/// ///
/// \returns Reference to this object /// \returns Reference to this object
/// ///
config_providers& operator=(_In_ const config_providers &other); config_provider_list& operator=(_In_ const config_provider_list &other);
/// ///
/// Moves configuration /// Moves configuration
@ -524,7 +524,7 @@ namespace eap
/// ///
/// \returns Reference to this object /// \returns Reference to this object
/// ///
config_providers& operator=(_Inout_ config_providers &&other); config_provider_list& operator=(_Inout_ config_provider_list &&other);
/// ///
/// Clones configuration /// Clones configuration

2
lib/EAPBase/include/Session.h
View File

@ -340,7 +340,7 @@ namespace eap
public: public:
module &m_module; ///< EAP module module &m_module; ///< EAP module
config_providers m_cfg; ///< Providers configuration config_provider_list m_cfg; ///< Providers configuration
credentials_type m_cred; ///< User credentials credentials_type m_cred; ///< User credentials
interactive_request_type m_intreq; ///< Interactive UI request data interactive_request_type m_intreq; ///< Interactive UI request data
DWORD m_eap_flags; ///< A combination of EAP flags that describe the new EAP authentication session behavior DWORD m_eap_flags; ///< A combination of EAP flags that describe the new EAP authentication session behavior

26
lib/EAPBase/src/Config.cpp
View File

@ -658,29 +658,29 @@ void eap::config_provider::operator>>(_Inout_ cursor_in &cursor)
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// eap::config_providers // eap::config_provider_list
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
eap::config_providers::config_providers(_In_ module &mod) : config(mod) eap::config_provider_list::config_provider_list(_In_ module &mod) : config(mod)
{ {
} }
eap::config_providers::config_providers(_In_ const config_providers &other) : eap::config_provider_list::config_provider_list(_In_ const config_provider_list &other) :
m_providers(other.m_providers), m_providers(other.m_providers),
config(other) config(other)
{ {
} }
eap::config_providers::config_providers(_Inout_ config_providers &&other) : eap::config_provider_list::config_provider_list(_Inout_ config_provider_list &&other) :
m_providers(std::move(other.m_providers)), m_providers(std::move(other.m_providers)),
config(std::move(other)) config(std::move(other))
{ {
} }
eap::config_providers& eap::config_providers::operator=(_In_ const config_providers &other) eap::config_provider_list& eap::config_provider_list::operator=(_In_ const config_provider_list &other)
{ {
if (this != &other) { if (this != &other) {
(config&)*this = other; (config&)*this = other;
@ -691,7 +691,7 @@ eap::config_providers& eap::config_providers::operator=(_In_ const config_provid
} }
eap::config_providers& eap::config_providers::operator=(_Inout_ config_providers &&other) eap::config_provider_list& eap::config_provider_list::operator=(_Inout_ config_provider_list &&other)
{ {
if (this != &other) { if (this != &other) {
(config&&)*this = std::move(other); (config&&)*this = std::move(other);
@ -702,13 +702,13 @@ eap::config_providers& eap::config_providers::operator=(_Inout_ config_providers
} }
eap::config* eap::config_providers::clone() const eap::config* eap::config_provider_list::clone() const
{ {
return new config_providers(*this); return new config_provider_list(*this);
} }
bool eap::config_providers::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot, _Out_ EAP_ERROR **ppEapError) const bool eap::config_provider_list::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot, _Out_ EAP_ERROR **ppEapError) const
{ {
if (!config::save(pDoc, pConfigRoot, ppEapError)) if (!config::save(pDoc, pConfigRoot, ppEapError))
return false; return false;
@ -746,7 +746,7 @@ bool eap::config_providers::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *p
} }
bool eap::config_providers::load(_In_ IXMLDOMNode *pConfigRoot, _Out_ EAP_ERROR **ppEapError) bool eap::config_provider_list::load(_In_ IXMLDOMNode *pConfigRoot, _Out_ EAP_ERROR **ppEapError)
{ {
assert(pConfigRoot); assert(pConfigRoot);
assert(ppEapError); assert(ppEapError);
@ -781,14 +781,14 @@ bool eap::config_providers::load(_In_ IXMLDOMNode *pConfigRoot, _Out_ EAP_ERROR
} }
void eap::config_providers::operator<<(_Inout_ cursor_out &cursor) const void eap::config_provider_list::operator<<(_Inout_ cursor_out &cursor) const
{ {
config::operator<<(cursor); config::operator<<(cursor);
cursor << m_providers; cursor << m_providers;
} }
size_t eap::config_providers::get_pk_size() const size_t eap::config_provider_list::get_pk_size() const
{ {
return return
config::get_pk_size() + config::get_pk_size() +
@ -796,7 +796,7 @@ size_t eap::config_providers::get_pk_size() const
} }
void eap::config_providers::operator>>(_Inout_ cursor_in &cursor) void eap::config_provider_list::operator>>(_Inout_ cursor_in &cursor)
{ {
config::operator>>(cursor); config::operator>>(cursor);

4
lib/EAPBase_UI/include/EAP_UI.h
View File

@ -109,7 +109,7 @@ public:
/// \param[inout] cfg Providers configuration data /// \param[inout] cfg Providers configuration data
/// \param[in] parent Parent window /// \param[in] parent Parent window
/// ///
wxEAPConfigDialog(eap::config_providers &cfg, wxWindow* parent) : wxEAPConfigDialog(eap::config_provider_list &cfg, wxWindow* parent) :
m_cfg(cfg), m_cfg(cfg),
wxEAPConfigDialogBase(parent) wxEAPConfigDialogBase(parent)
{ {
@ -152,7 +152,7 @@ protected:
protected: protected:
eap::config_providers &m_cfg; ///< EAP providers configuration eap::config_provider_list &m_cfg; ///< EAP providers configuration
}; };

2
lib/TTLS/src/Module.cpp
View File

@ -82,7 +82,7 @@ bool eap::peer_ttls::get_identity(
assert(ppEapError); assert(ppEapError);
// Unpack configuration. // Unpack configuration.
config_providers cfg(*this); config_provider_list cfg(*this);
if (!unpack(cfg, pConnectionData, dwConnectionDataSize, ppEapError)) if (!unpack(cfg, pConnectionData, dwConnectionDataSize, ppEapError))
return false; return false;
else if (cfg.m_providers.empty() || cfg.m_providers.front().m_methods.empty()) { else if (cfg.m_providers.empty() || cfg.m_providers.front().m_methods.empty()) {

8
lib/TTLS_UI/src/Module.cpp
View File

@ -49,7 +49,7 @@ bool eap::peer_ttls_ui::config_xml2blob(
UNREFERENCED_PARAMETER(dwFlags); UNREFERENCED_PARAMETER(dwFlags);
// Load configuration from XML. // Load configuration from XML.
config_providers cfg(*this); config_provider_list cfg(*this);
if (!cfg.load(pConfigRoot, ppEapError)) if (!cfg.load(pConfigRoot, ppEapError))
return false; return false;
@ -69,7 +69,7 @@ bool eap::peer_ttls_ui::config_blob2xml(
UNREFERENCED_PARAMETER(dwFlags); UNREFERENCED_PARAMETER(dwFlags);
// Unpack configuration. // Unpack configuration.
config_providers cfg(*this); config_provider_list cfg(*this);
if (!unpack(cfg, pConnectionData, dwConnectionDataSize, ppEapError)) if (!unpack(cfg, pConnectionData, dwConnectionDataSize, ppEapError))
return false; return false;
@ -87,7 +87,7 @@ bool eap::peer_ttls_ui::invoke_config_ui(
_Out_ EAP_ERROR **ppEapError) _Out_ EAP_ERROR **ppEapError)
{ {
// Unpack configuration. // Unpack configuration.
config_providers cfg(*this); config_provider_list cfg(*this);
if (dwConnectionDataInSize && !unpack(cfg, pConnectionDataIn, dwConnectionDataInSize, ppEapError)) if (dwConnectionDataInSize && !unpack(cfg, pConnectionDataIn, dwConnectionDataInSize, ppEapError))
return false; return false;
@ -135,7 +135,7 @@ bool eap::peer_ttls_ui::invoke_identity_ui(
_Out_ LPWSTR *ppwszIdentity, _Out_ LPWSTR *ppwszIdentity,
_Out_ EAP_ERROR **ppEapError) _Out_ EAP_ERROR **ppEapError)
{ {
config_providers cfg(*this); config_provider_list cfg(*this);
if (!unpack(cfg, pConnectionData, dwConnectionDataSize, ppEapError)) if (!unpack(cfg, pConnectionData, dwConnectionDataSize, ppEapError))
return false; return false;
else if (cfg.m_providers.empty() || cfg.m_providers.front().m_methods.empty()) { else if (cfg.m_providers.empty() || cfg.m_providers.front().m_methods.empty()) {