From eea136619c2a8545c10b037e29898512271aa825 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Fri, 4 Nov 2016 09:18:16 +0100
Subject: [PATCH] method_pap >> method_pap_diameter

---
 lib/PAP/include/Method.h | 14 +++++++-------
 lib/PAP/src/Method.cpp   | 16 ++++++++--------
 lib/TTLS/src/Module.cpp  |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/PAP/include/Method.h b/lib/PAP/include/Method.h
index d828e41..e85284d 100644
--- a/lib/PAP/include/Method.h
+++ b/lib/PAP/include/Method.h
@@ -20,7 +20,7 @@
 
 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:
         ///
@@ -51,14 +51,14 @@ namespace eap
         /// \param[in] cfg   Method configuration
         /// \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
         ///
         /// \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
@@ -67,7 +67,7 @@ namespace eap
         ///
         /// \returns Reference to this object
         ///
-        method_pap& operator=(_Inout_ method_pap &&other);
+        method_pap_diameter& operator=(_Inout_ method_pap_diameter &&other);
 
         /// \name Session management
         /// @{
diff --git a/lib/PAP/src/Method.cpp b/lib/PAP/src/Method.cpp
index 7298a6d..9c7b41f 100644
--- a/lib/PAP/src/Method.cpp
+++ b/lib/PAP/src/Method.cpp
@@ -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_cred(cred),
     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_cred      (          other.m_cred       ),
     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)) {
         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_  const EapAttributes *pAttributeArray,
     _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_                                       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,
     _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,
     _Inout_ EapPeerMethodResult       *pResult)
 {
diff --git a/lib/TTLS/src/Module.cpp b/lib/TTLS/src/Module.cpp
index 577c529..019c1af 100644
--- a/lib/TTLS/src/Module.cpp
+++ b/lib/TTLS/src/Module.cpp
@@ -237,7 +237,7 @@ EAP_SESSION_HANDLE eap::peer_ttls::begin_session(
     {
         // Native inner methods
         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_mschapv2       : meth_inner.reset(
                                            new method_eapmsg  (*this, cred_inner->get_identity().c_str(),