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

eap::config_provider changed from template to class followed by a mass detemplatization of other classes

Browse Source
This commit is contained in:
Simon Rozman
2016-07-20 17:57:43 +02:00
parent a7d75ea72d
commit 9376404164
23 changed files with 1473 additions and 1327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
EAPMethods/src/Main.cpp
View File

@@ -236,7 +236,7 @@ DWORD APIENTRY EapPeerGetIdentity(
else if (!ppwszIdentity)
g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" ppwszIdentity is NULL.")));
else {
_EAPMETHOD_PEER::config_providers_type cfg(g_peer);
eap::config_providers cfg(g_peer);
_EAPMETHOD_PEER::credentials_type cred(g_peer);
if (!g_peer.unpack(cfg, pConnectionData, dwConnectionDataSize, ppEapError) ||
!g_peer.unpack(cred, pUserData, dwUserDataSize, ppEapError) ||
@@ -684,7 +684,7 @@ DWORD WINAPI EapPeerGetMethodProperties(
else if (!pMethodPropertyArray)
g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pMethodPropertyArray is NULL.")));
else {
_EAPMETHOD_PEER::config_providers_type cfg(g_peer);
eap::config_providers cfg(g_peer);
_EAPMETHOD_PEER::credentials_type cred(g_peer);
if (!g_peer.unpack(cfg, pEapConnData, dwEapConnDataSize, ppEapError) ||
!g_peer.unpack(cred, pUserData, dwUserDataSize, ppEapError) ||

8
EAPMethods/src/Main_UI.cpp
View File

@@ -142,7 +142,7 @@ DWORD WINAPI EapPeerConfigXml2Blob(
// Load configuration.
pConfigDoc->setProperty(bstr(L"SelectionNamespaces"), variant(L"xmlns:eap-metadata=\"urn:ietf:params:xml:ns:yang:ietf-eap-metadata\""));
_EAPMETHOD_PEER_UI::config_providers_type cfg(g_peer);
eap::config_providers cfg(g_peer);
if (!cfg.load(pXmlElConfig, ppEapError) ||
!g_peer.pack(cfg, ppConfigOut, pdwConfigOutSize, ppEapError))
{
@@ -198,7 +198,7 @@ DWORD WINAPI EapPeerConfigBlob2Xml(
HRESULT hr;
// Unpack configuration.
_EAPMETHOD_PEER_UI::config_providers_type cfg(g_peer);
eap::config_providers cfg(g_peer);
if (!g_peer.unpack(cfg, pConfigIn, dwConfigInSize, ppEapError)) {
if (*ppEapError) {
g_peer.log_error(*ppEapError);
@@ -294,7 +294,7 @@ DWORD WINAPI EapPeerInvokeConfigUI(
else if (!ppConnectionDataOut)
g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" ppConnectionDataOut is NULL.")));
else {
_EAPMETHOD_PEER_UI::config_providers_type cfg(g_peer);
eap::config_providers cfg(g_peer);
if (!g_peer.unpack(cfg, pConnectionDataIn, dwConnectionDataInSize, ppEapError) ||
!g_peer.invoke_config_ui(hwndParent, cfg, ppEapError) ||
!g_peer.pack(cfg, ppConnectionDataOut, pdwConnectionDataOutSize, ppEapError))
@@ -359,7 +359,7 @@ DWORD WINAPI EapPeerInvokeIdentityUI(
else if (!ppwszIdentity)
g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" ppwszIdentity is NULL.")));
else {
_EAPMETHOD_PEER_UI::config_providers_type cfg(g_peer);
eap::config_providers cfg(g_peer);
_EAPMETHOD_PEER_UI::credentials_type cred(g_peer);
if (!g_peer.unpack(cfg, pConnectionData, dwConnectionDataSize, ppEapError) ||
!g_peer.unpack(cred, pUserData, dwUserDataSize, ppEapError) ||