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

eap::config split to eap::config and eap::packable

Browse Source
This commit is contained in:
Simon Rozman
2017-02-07 09:33:29 +01:00
parent 527d4271b1
commit 66dd2bf283
10 changed files with 136 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/TTLS/include/UIContext.h
View File

@@ -44,11 +44,10 @@ namespace eap
///
/// Constructs context
///
/// \param[in] mod EAP module to use for global services
/// \param[in] cfg Connection configuration
/// \param[in] cred Connection credentials
///
ui_context_ttls(_In_ module &mod, _In_ config_connection &cfg, _In_ credentials_connection &cred);
ui_context_ttls(_In_ config_connection &cfg, _In_ credentials_connection &cred);
///
/// Copies context
@@ -82,13 +81,6 @@ namespace eap
///
ui_context_ttls& operator=(_Inout_ ui_context_ttls &&other);
///
/// Clones this object
///
/// \returns Pointer to cloned object with identical data
///
virtual config* clone() const;
/// \name BLOB management
/// @{
virtual void operator<<(_Inout_ cursor_out &cursor) const;

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

@@ -367,7 +367,7 @@ void eap::peer_ttls::get_ui_context(
auto s = static_cast<session*>(hSession);
// Get context data from method.
ui_context_ttls ctx(*this, s->m_cfg, s->m_cred);
ui_context_ttls ctx(s->m_cfg, s->m_cred);
s->m_method->get_ui_context(ctx.m_data);
// Pack context data.

13
lib/TTLS/src/UIContext.cpp
View File

@@ -28,14 +28,15 @@ using namespace winstd;
// eap::ui_context_ttls
//////////////////////////////////////////////////////////////////////
eap::ui_context_ttls::ui_context_ttls(_In_ module &mod, _In_ config_connection &cfg, _In_ credentials_connection &cred) :
ui_context(mod, cfg, cred)
eap::ui_context_ttls::ui_context_ttls(_In_ config_connection &cfg, _In_ credentials_connection &cred) :
ui_context(cfg, cred)
{
}
eap::ui_context_ttls::ui_context_ttls(_In_ const ui_context_ttls &other) :
ui_context(other)
m_data (other.m_data),
ui_context(other )
{
}
@@ -69,12 +70,6 @@ eap::ui_context_ttls& eap::ui_context_ttls::operator=(_Inout_ ui_context_ttls &&
}
eap::config* eap::ui_context_ttls::clone() const
{
return new ui_context_ttls(*this);
}
void eap::ui_context_ttls::operator<<(_Inout_ cursor_out &cursor) const
{
ui_context::operator<<(cursor);