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

ppResult >> pResult

Browse Source
This commit is contained in:
Simon Rozman 2016-10-24 13:33:01 +02:00
parent 278bc46511
commit 1ccf97b6d7
10 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
EAPMethods/src/Main.cpp
View File

@ -449,7 +449,7 @@ DWORD APIENTRY EapPeerGetResponsePacket(
DWORD APIENTRY EapPeerGetResult( DWORD APIENTRY EapPeerGetResult(
_In_ EAP_SESSION_HANDLE hSession, _In_ EAP_SESSION_HANDLE hSession,
_In_ EapPeerMethodResultReason reason, _In_ EapPeerMethodResultReason reason,
_Out_ EapPeerMethodResult *ppResult, _Out_ EapPeerMethodResult *pResult,
_Out_ EAP_ERROR **ppEapError) _Out_ EAP_ERROR **ppEapError)
{ {
DWORD dwResult = ERROR_SUCCESS; DWORD dwResult = ERROR_SUCCESS;
@ -466,11 +466,11 @@ DWORD APIENTRY EapPeerGetResult(
if (!hSession) if (!hSession)
g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" hSession is NULL."))); g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" hSession is NULL.")));
else if (!ppResult) else if (!pResult)
g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" ppResult is NULL."))); g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pResult is NULL.")));
else { else {
try { try {
g_peer.get_result(hSession, reason, ppResult); g_peer.get_result(hSession, reason, pResult);
} catch (std::exception &err) { } catch (std::exception &err) {
g_peer.log_error(*ppEapError = g_peer.make_error(err)); g_peer.log_error(*ppEapError = g_peer.make_error(err));
dwResult = (*ppEapError)->dwWinError; dwResult = (*ppEapError)->dwWinError;

2
lib/EAPBase/include/Method.h
View File

@ -126,7 +126,7 @@ namespace eap
/// ///
virtual void get_result( virtual void get_result(
_In_ EapPeerMethodResultReason reason, _In_ EapPeerMethodResultReason reason,
_Inout_ EapPeerMethodResult *ppResult); _Inout_ EapPeerMethodResult *pResult);
/// @} /// @}

2
lib/EAPBase/include/Module.h
View File

@ -737,7 +737,7 @@ namespace eap
virtual void get_result( virtual void get_result(
_In_ EAP_SESSION_HANDLE hSession, _In_ EAP_SESSION_HANDLE hSession,
_In_ EapPeerMethodResultReason reason, _In_ EapPeerMethodResultReason reason,
_Inout_ EapPeerMethodResult *ppResult) = 0; _Inout_ EapPeerMethodResult *pResult) = 0;
/// ///
/// Obtains the user interface context from the EAP method. /// Obtains the user interface context from the EAP method.

8
lib/EAPBase/src/Method.cpp
View File

@ -83,9 +83,9 @@ void eap::method::end_session()
void eap::method::get_result( void eap::method::get_result(
_In_ EapPeerMethodResultReason reason, _In_ EapPeerMethodResultReason reason,
_Inout_ EapPeerMethodResult *ppResult) _Inout_ EapPeerMethodResult *pResult)
{ {
assert(ppResult); assert(pResult);
switch (reason) { switch (reason) {
case EapPeerMethodResultSuccess: { case EapPeerMethodResultSuccess: {
@ -104,8 +104,8 @@ void eap::method::get_result(
// Always ask EAP host to save the connection data. And it will save it *only* when we report "success". // Always ask EAP host to save the connection data. And it will save it *only* when we report "success".
// Don't worry. EapHost is well aware of failed authentication condition. // Don't worry. EapHost is well aware of failed authentication condition.
ppResult->fSaveConnectionData = TRUE; pResult->fSaveConnectionData = TRUE;
ppResult->fIsSuccess = TRUE; pResult->fIsSuccess = TRUE;
} }

2
lib/TLS/include/Method.h
View File

@ -128,7 +128,7 @@ namespace eap
/// ///
virtual void get_result( virtual void get_result(
_In_ EapPeerMethodResultReason reason, _In_ EapPeerMethodResultReason reason,
_Inout_ EapPeerMethodResult *ppResult); _Inout_ EapPeerMethodResult *pResult);
/// @} /// @}

6
lib/TLS/src/Method.cpp
View File

@ -492,11 +492,11 @@ void eap::method_tls::get_response_packet(
void eap::method_tls::get_result( void eap::method_tls::get_result(
_In_ EapPeerMethodResultReason reason, _In_ EapPeerMethodResultReason reason,
_Inout_ EapPeerMethodResult *ppResult) _Inout_ EapPeerMethodResult *pResult)
{ {
assert(ppResult); assert(pResult);
method::get_result(reason, ppResult); method::get_result(reason, pResult);
switch (reason) { switch (reason) {
case EapPeerMethodResultSuccess: { case EapPeerMethodResultSuccess: {

2
lib/TTLS/include/Method.h
View File

@ -115,7 +115,7 @@ namespace eap
/// ///
virtual void get_result( virtual void get_result(
_In_ EapPeerMethodResultReason reason, _In_ EapPeerMethodResultReason reason,
_Inout_ EapPeerMethodResult *ppResult); _Inout_ EapPeerMethodResult *pResult);
/// @} /// @}

2
lib/TTLS/include/Module.h
View File

@ -165,7 +165,7 @@ namespace eap
virtual void get_result( virtual void get_result(
_In_ EAP_SESSION_HANDLE hSession, _In_ EAP_SESSION_HANDLE hSession,
_In_ EapPeerMethodResultReason reason, _In_ EapPeerMethodResultReason reason,
_Inout_ EapPeerMethodResult *ppResult); _Inout_ EapPeerMethodResult *pResult);
/// ///
/// Obtains the user interface context from the EAP method. /// Obtains the user interface context from the EAP method.

6
lib/TTLS/src/Method.cpp
View File

@ -116,17 +116,17 @@ void eap::method_ttls::get_response_packet(
void eap::method_ttls::get_result( void eap::method_ttls::get_result(
_In_ EapPeerMethodResultReason reason, _In_ EapPeerMethodResultReason reason,
_Inout_ EapPeerMethodResult *ppResult) _Inout_ EapPeerMethodResult *pResult)
{ {
// Do the TLS. // Do the TLS.
method_tls::get_result(reason, ppResult); method_tls::get_result(reason, pResult);
if (m_phase == phase_application_data) { if (m_phase == phase_application_data) {
// Get inner method result. // Get inner method result.
EapPeerMethodResult result = {}; EapPeerMethodResult result = {};
m_inner->get_result(reason, &result); m_inner->get_result(reason, &result);
if (result.fSaveConnectionData) if (result.fSaveConnectionData)
ppResult->fSaveConnectionData = TRUE; pResult->fSaveConnectionData = TRUE;
if (m_inner->m_cfg.m_last_status != config_method::status_success) { if (m_inner->m_cfg.m_last_status != config_method::status_success) {
// Inner method admitted problems, so autentication must have proceeded to inner authentication already. // Inner method admitted problems, so autentication must have proceeded to inner authentication already.

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

@ -261,35 +261,35 @@ void eap::peer_ttls::get_response_packet(
void eap::peer_ttls::get_result( void eap::peer_ttls::get_result(
_In_ EAP_SESSION_HANDLE hSession, _In_ EAP_SESSION_HANDLE hSession,
_In_ EapPeerMethodResultReason reason, _In_ EapPeerMethodResultReason reason,
_Inout_ EapPeerMethodResult *ppResult) _Inout_ EapPeerMethodResult *pResult)
{ {
session *s = static_cast<session*>(hSession); session *s = static_cast<session*>(hSession);
s->m_method->get_result(reason, ppResult); s->m_method->get_result(reason, pResult);
s->m_eap_attr_desc.dwNumberOfAttributes = (DWORD)s->m_method->m_eap_attr.size(); s->m_eap_attr_desc.dwNumberOfAttributes = (DWORD)s->m_method->m_eap_attr.size();
s->m_eap_attr_desc.pAttribs = s->m_method->m_eap_attr.data(); s->m_eap_attr_desc.pAttribs = s->m_method->m_eap_attr.data();
ppResult->pAttribArray = &s->m_eap_attr_desc; pResult->pAttribArray = &s->m_eap_attr_desc;
// Do not report failure to EapHost, as it will not save updated configuration then. But we need it to save it, to alert user on next connection attempt. // Do not report failure to EapHost, as it will not save updated configuration then. But we need it to save it, to alert user on next connection attempt.
// EapHost is well aware of the failed condition. // EapHost is well aware of the failed condition.
//ppResult->fIsSuccess = FALSE; //pResult->fIsSuccess = FALSE;
//ppResult->dwFailureReasonCode = EAP_E_AUTHENTICATION_FAILED; //pResult->dwFailureReasonCode = EAP_E_AUTHENTICATION_FAILED;
ppResult->fIsSuccess = TRUE; pResult->fIsSuccess = TRUE;
ppResult->dwFailureReasonCode = ERROR_SUCCESS; pResult->dwFailureReasonCode = ERROR_SUCCESS;
if (ppResult->fSaveConnectionData) { if (pResult->fSaveConnectionData) {
pack(s->m_cfg, &ppResult->pConnectionData, &ppResult->dwSizeofConnectionData); pack(s->m_cfg, &pResult->pConnectionData, &pResult->dwSizeofConnectionData);
if (s->m_blob_cfg) if (s->m_blob_cfg)
free_memory(s->m_blob_cfg); free_memory(s->m_blob_cfg);
s->m_blob_cfg = ppResult->pConnectionData; s->m_blob_cfg = pResult->pConnectionData;
} }
#ifdef EAP_USE_NATIVE_CREDENTIAL_CACHE #ifdef EAP_USE_NATIVE_CREDENTIAL_CACHE
ppResult->fSaveUserData = TRUE; pResult->fSaveUserData = TRUE;
pack(s->m_cred, &ppResult->pUserData, &ppResult->dwSizeofUserData); pack(s->m_cred, &pResult->pUserData, &pResult->dwSizeofUserData);
if (s->m_blob_cred) if (s->m_blob_cred)
free_memory(s->m_blob_cred); free_memory(s->m_blob_cred);
s->m_blob_cred = ppResult->pUserData; s->m_blob_cred = pResult->pUserData;
#endif #endif
} }