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

Configuration GUIDs are not required any more

Browse Source 
This reverts commit 1cb6ca5adb4e8ec3389adc00f2c34dff11b99818.
This commit is contained in:
Simon Rozman 2016-08-24 18:59:59 +02:00
parent 352d546da1
commit e1600e5aba
3 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -550,7 +550,6 @@ namespace eap
/// @} /// @}
public: public:
GUID m_connection_id; ///< Unique connection ID
std::vector<eap::config_provider> m_providers; ///< Array of provider configurations std::vector<eap::config_provider> m_providers; ///< Array of provider configurations
}; };
} }

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

@ -614,12 +614,10 @@ void eap::config_provider::operator>>(_Inout_ cursor_in &cursor)
eap::config_connection::config_connection(_In_ module &mod) : config(mod) eap::config_connection::config_connection(_In_ module &mod) : config(mod)
{ {
memset(&m_connection_id, 0, sizeof(m_connection_id));
} }
eap::config_connection::config_connection(_In_ const config_connection &other) : eap::config_connection::config_connection(_In_ const config_connection &other) :
m_connection_id(other.m_connection_id),
m_providers(other.m_providers), m_providers(other.m_providers),
config(other) config(other)
{ {
@ -627,7 +625,6 @@ eap::config_connection::config_connection(_In_ const config_connection &other) :
eap::config_connection::config_connection(_Inout_ config_connection &&other) : eap::config_connection::config_connection(_Inout_ config_connection &&other) :
m_connection_id(std::move(other.m_connection_id)),
m_providers(std::move(other.m_providers)), m_providers(std::move(other.m_providers)),
config(std::move(other)) config(std::move(other))
{ {
@ -637,9 +634,8 @@ eap::config_connection::config_connection(_Inout_ config_connection &&other) :
eap::config_connection& eap::config_connection::operator=(_In_ const config_connection &other) eap::config_connection& eap::config_connection::operator=(_In_ const config_connection &other)
{ {
if (this != &other) { if (this != &other) {
(config&)*this = other; (config&)*this = other;
m_connection_id = other.m_connection_id; m_providers = other.m_providers;
m_providers = other.m_providers;
} }
return *this; return *this;
@ -650,7 +646,6 @@ eap::config_connection& eap::config_connection::operator=(_Inout_ config_connect
{ {
if (this != &other) { if (this != &other) {
(config&&)*this = std::move(other); (config&&)*this = std::move(other);
m_connection_id = std::move(other.m_connection_id);
m_providers = std::move(other.m_providers); m_providers = std::move(other.m_providers);
} }
@ -698,9 +693,6 @@ void eap::config_connection::load(_In_ IXMLDOMNode *pConfigRoot)
config::load(pConfigRoot); config::load(pConfigRoot);
// On each configuration import reset ID.
CoCreateGuid(&m_connection_id);
// Iterate authentication providers (<EAPIdentityProvider>). // Iterate authentication providers (<EAPIdentityProvider>).
com_obj<IXMLDOMNodeList> pXmlListProviders; com_obj<IXMLDOMNodeList> pXmlListProviders;
if (FAILED(hr = eapxml::select_nodes(pConfigRoot, bstr(L"eap-metadata:EAPIdentityProviderList/eap-metadata:EAPIdentityProvider"), &pXmlListProviders))) if (FAILED(hr = eapxml::select_nodes(pConfigRoot, bstr(L"eap-metadata:EAPIdentityProviderList/eap-metadata:EAPIdentityProvider"), &pXmlListProviders)))
@ -725,7 +717,6 @@ void eap::config_connection::load(_In_ IXMLDOMNode *pConfigRoot)
void eap::config_connection::operator<<(_Inout_ cursor_out &cursor) const void eap::config_connection::operator<<(_Inout_ cursor_out &cursor) const
{ {
config::operator<<(cursor); config::operator<<(cursor);
cursor << m_connection_id;
cursor << m_providers; cursor << m_providers;
} }
@ -734,8 +725,7 @@ size_t eap::config_connection::get_pk_size() const
{ {
return return
config::get_pk_size() + config::get_pk_size() +
pksizeof(m_connection_id) + pksizeof(m_providers);
pksizeof(m_providers );
} }
@ -743,8 +733,6 @@ void eap::config_connection::operator>>(_Inout_ cursor_in &cursor)
{ {
config::operator>>(cursor); config::operator>>(cursor);
cursor >> m_connection_id;
list<config_provider>::size_type count; list<config_provider>::size_type count;
cursor >> count; cursor >> count;
m_providers.clear(); m_providers.clear();

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

@ -88,7 +88,6 @@ void eap::peer_ttls_ui::invoke_config_ui(
unpack(cfg, pConnectionDataIn, dwConnectionDataInSize); unpack(cfg, pConnectionDataIn, dwConnectionDataInSize);
} else { } else {
// This is a blank network profile. Create default configuraton. // This is a blank network profile. Create default configuraton.
CoCreateGuid(&(cfg.m_connection_id));
// Start with PAP inner configuration. // Start with PAP inner configuration.
unique_ptr<config_method_ttls> cfg_method(new config_method_ttls(*this)); unique_ptr<config_method_ttls> cfg_method(new config_method_ttls(*this));