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

Inner EAP method support progress continues...

Browse Source
This commit is contained in:
Simon Rozman
2016-10-03 15:48:54 +02:00
parent c53ed21d55
commit 7d13222838
5 changed files with 77 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/EAPMsg/include/Config.h
View File

@@ -100,6 +100,7 @@ namespace eap
virtual const wchar_t* get_method_str() const;
public:
EAP_METHOD_TYPE m_type;
EAP_METHOD_TYPE m_type; ///< EapHost method type: (EAP type, vendor ID, vendor type, author ID) tuple
sanitizing_blob m_cfg_blob; ///< Method configuration BLOB
};
}

18
lib/EAPMsg/src/Config.cpp
View File

@@ -35,15 +35,17 @@ eap::config_method_eapmsg::config_method_eapmsg(_In_ module &mod, _In_ unsigned
eap::config_method_eapmsg::config_method_eapmsg(_In_ const config_method_eapmsg &other) :
m_type(other.m_type),
config_method(other)
m_type (other.m_type ),
m_cfg_blob (other.m_cfg_blob),
config_method(other )
{
}
eap::config_method_eapmsg::config_method_eapmsg(_Inout_ config_method_eapmsg &&other) :
m_type(std::move(other.m_type)),
config_method(std::move(other))
m_type (std::move(other.m_type )),
m_cfg_blob (std::move(other.m_cfg_blob)),
config_method(std::move(other ))
{
}
@@ -53,6 +55,7 @@ eap::config_method_eapmsg& eap::config_method_eapmsg::operator=(_In_ const confi
if (this != &other) {
(config_method&)*this = other;
m_type = other.m_type;
m_cfg_blob = other.m_cfg_blob;
}
return *this;
@@ -62,8 +65,9 @@ eap::config_method_eapmsg& eap::config_method_eapmsg::operator=(_In_ const confi
eap::config_method_eapmsg& eap::config_method_eapmsg::operator=(_Inout_ config_method_eapmsg &&other)
{
if (this != &other) {
(config_method&&)*this = std::move(other);
m_type = std::move(other.m_type);
(config_method&&)*this = std::move(other );
m_type = std::move(other.m_type );
m_cfg_blob = std::move(other.m_cfg_blob);
}
return *this;
@@ -84,6 +88,6 @@ eap_type_t eap::config_method_eapmsg::get_method_id() const
const wchar_t* eap::config_method_eapmsg::get_method_str() const
{
// TODO: Query registry for EAP method name (PeerFriendlyName).
// TODO: Query registry for EAP method name (PeerFriendlyName using RegLoadMUIString()).
return L"EAPMsg";
}