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

method_pap >> method_pap_diameter

Browse Source
This commit is contained in:
Simon Rozman 2016-11-04 09:18:16 +01:00
parent 88651e4ffe
commit eea136619c
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/PAP/include/Method.h
View File

@ -20,7 +20,7 @@
namespace eap namespace eap
{ {
class method_pap; class method_pap_diameter;
} }
@ -37,11 +37,11 @@ namespace eap
/// @{ /// @{
/// ///
/// PAP method /// PAP method over Diameter AVP (for use as inner EAP-TTLS)
/// ///
class method_pap : public method class method_pap_diameter : public method
{ {
WINSTD_NONCOPYABLE(method_pap) WINSTD_NONCOPYABLE(method_pap_diameter)
public: public:
/// ///
@ -51,14 +51,14 @@ namespace eap
/// \param[in] cfg Method configuration /// \param[in] cfg Method configuration
/// \param[in] cred User credentials /// \param[in] cred User credentials
/// ///
method_pap(_In_ module &mod, _In_ config_method_pap &cfg, _In_ credentials_pass &cred); method_pap_diameter(_In_ module &mod, _In_ config_method_pap &cfg, _In_ credentials_pass &cred);
/// ///
/// Moves a PAP method /// Moves a PAP method
/// ///
/// \param[in] other PAP method to move from /// \param[in] other PAP method to move from
/// ///
method_pap(_Inout_ method_pap &&other); method_pap_diameter(_Inout_ method_pap_diameter &&other);
/// ///
/// Moves a PAP method /// Moves a PAP method
@ -67,7 +67,7 @@ namespace eap
/// ///
/// \returns Reference to this object /// \returns Reference to this object
/// ///
method_pap& operator=(_Inout_ method_pap &&other); method_pap_diameter& operator=(_Inout_ method_pap_diameter &&other);
/// \name Session management /// \name Session management
/// @{ /// @{

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

@ -25,10 +25,10 @@ using namespace winstd;
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// eap::method_pap // eap::method_pap_diameter
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
eap::method_pap::method_pap(_In_ module &mod, _In_ config_method_pap &cfg, _In_ credentials_pass &cred) : eap::method_pap_diameter::method_pap_diameter(_In_ module &mod, _In_ config_method_pap &cfg, _In_ credentials_pass &cred) :
m_cfg(cfg), m_cfg(cfg),
m_cred(cred), m_cred(cred),
m_phase(phase_unknown), m_phase(phase_unknown),
@ -37,7 +37,7 @@ eap::method_pap::method_pap(_In_ module &mod, _In_ config_method_pap &cfg, _In_
} }
eap::method_pap::method_pap(_Inout_ method_pap &&other) : eap::method_pap_diameter::method_pap_diameter(_Inout_ method_pap_diameter &&other) :
m_cfg ( other.m_cfg ), m_cfg ( other.m_cfg ),
m_cred ( other.m_cred ), m_cred ( other.m_cred ),
m_phase (std::move(other.m_phase )), m_phase (std::move(other.m_phase )),
@ -47,7 +47,7 @@ eap::method_pap::method_pap(_Inout_ method_pap &&other) :
} }
eap::method_pap& eap::method_pap::operator=(_Inout_ method_pap &&other) eap::method_pap_diameter& eap::method_pap_diameter::operator=(_Inout_ method_pap_diameter &&other)
{ {
if (this != std::addressof(other)) { if (this != std::addressof(other)) {
assert(std::addressof(m_cfg ) == std::addressof(other.m_cfg )); // Move method within same configuration only! assert(std::addressof(m_cfg ) == std::addressof(other.m_cfg )); // Move method within same configuration only!
@ -61,7 +61,7 @@ eap::method_pap& eap::method_pap::operator=(_Inout_ method_pap &&other)
} }
void eap::method_pap::begin_session( void eap::method_pap_diameter::begin_session(
_In_ DWORD dwFlags, _In_ DWORD dwFlags,
_In_ const EapAttributes *pAttributeArray, _In_ const EapAttributes *pAttributeArray,
_In_ HANDLE hTokenImpersonateUser, _In_ HANDLE hTokenImpersonateUser,
@ -78,7 +78,7 @@ void eap::method_pap::begin_session(
} }
EapPeerMethodResponseAction eap::method_pap::process_request_packet( EapPeerMethodResponseAction eap::method_pap_diameter::process_request_packet(
_In_bytecount_(dwReceivedPacketSize) const void *pReceivedPacket, _In_bytecount_(dwReceivedPacketSize) const void *pReceivedPacket,
_In_ DWORD dwReceivedPacketSize) _In_ DWORD dwReceivedPacketSize)
{ {
@ -117,7 +117,7 @@ EapPeerMethodResponseAction eap::method_pap::process_request_packet(
} }
void eap::method_pap::get_response_packet( void eap::method_pap_diameter::get_response_packet(
_Out_ sanitizing_blob &packet, _Out_ sanitizing_blob &packet,
_In_opt_ DWORD size_max) _In_opt_ DWORD size_max)
{ {
@ -128,7 +128,7 @@ void eap::method_pap::get_response_packet(
} }
void eap::method_pap::get_result( void eap::method_pap_diameter::get_result(
_In_ EapPeerMethodResultReason reason, _In_ EapPeerMethodResultReason reason,
_Inout_ EapPeerMethodResult *pResult) _Inout_ EapPeerMethodResult *pResult)
{ {

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

@ -237,7 +237,7 @@ EAP_SESSION_HANDLE eap::peer_ttls::begin_session(
{ {
// Native inner methods // Native inner methods
switch (cfg_inner->get_method_id()) { switch (cfg_inner->get_method_id()) {
case eap_type_legacy_pap : meth_inner.reset(new method_pap (*this, dynamic_cast<config_method_pap &>(*cfg_inner), dynamic_cast<credentials_pass&>(*cred_inner))); break; case eap_type_legacy_pap : meth_inner.reset(new method_pap_diameter (*this, dynamic_cast<config_method_pap &>(*cfg_inner), dynamic_cast<credentials_pass&>(*cred_inner))); break;
case eap_type_legacy_mschapv2: meth_inner.reset(new method_mschapv2_diameter(*this, dynamic_cast<config_method_mschapv2&>(*cfg_inner), dynamic_cast<credentials_pass&>(*cred_inner))); break; case eap_type_legacy_mschapv2: meth_inner.reset(new method_mschapv2_diameter(*this, dynamic_cast<config_method_mschapv2&>(*cfg_inner), dynamic_cast<credentials_pass&>(*cred_inner))); break;
case eap_type_mschapv2 : meth_inner.reset( case eap_type_mschapv2 : meth_inner.reset(
new method_eapmsg (*this, cred_inner->get_identity().c_str(), new method_eapmsg (*this, cred_inner->get_identity().c_str(),