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

config_method split into config_method and config_method_with_cred<>

Browse Source
This commit is contained in:
Simon Rozman
2016-07-21 22:01:08 +02:00
parent ac88d55fe4
commit 6ae8029a47
20 changed files with 567 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/PAP/include/Config.h
View File

@@ -40,7 +40,7 @@ namespace eap
namespace eap
{
class config_method_pap : public config_method
class config_method_pap : public config_method_with_cred<credentials_pap>
{
public:
///
@@ -89,11 +89,6 @@ namespace eap
///
virtual config* clone() const;
///
/// Makes new set of credentials for the given method type
///
virtual credentials* make_credentials() const;
///
/// Returns EAP method type of this configuration
///

16
lib/PAP/src/Config.cpp
View File

@@ -25,19 +25,19 @@
// eap::config_method_pap
//////////////////////////////////////////////////////////////////////
eap::config_method_pap::config_method_pap(_In_ module &mod) : config_method(mod)
eap::config_method_pap::config_method_pap(_In_ module &mod) : config_method_with_cred<credentials_pap>(mod)
{
}
eap::config_method_pap::config_method_pap(_In_ const config_method_pap &other) :
config_method(other)
config_method_with_cred<credentials_pap>(other)
{
}
eap::config_method_pap::config_method_pap(_Inout_ config_method_pap &&other) :
config_method(std::move(other))
config_method_with_cred<credentials_pap>(std::move(other))
{
}
@@ -45,7 +45,7 @@ eap::config_method_pap::config_method_pap(_Inout_ config_method_pap &&other) :
eap::config_method_pap& eap::config_method_pap::operator=(_In_ const config_method_pap &other)
{
if (this != &other)
(config_method&)*this = other;
(config_method_with_cred<credentials_pap>&)*this = other;
return *this;
}
@@ -54,7 +54,7 @@ eap::config_method_pap& eap::config_method_pap::operator=(_In_ const config_meth
eap::config_method_pap& eap::config_method_pap::operator=(_Inout_ config_method_pap &&other)
{
if (this != &other)
(config_method&&)*this = std::move(other);
(config_method_with_cred<credentials_pap>&&)*this = std::move(other);
return *this;
}
@@ -66,12 +66,6 @@ eap::config* eap::config_method_pap::clone() const
}
eap::credentials* eap::config_method_pap::make_credentials() const
{
return new credentials_pap(m_module);
}
eap::type_t eap::config_method_pap::get_method_id() const
{
return eap::type_pap;