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

peer_ui: Move config_xml2blob and config_blob2xml upstream

Browse Source 
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2020-01-15 11:40:35 +01:00
parent fb8ca2de24
commit 18184a2762
4 changed files with 38 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/EAPBase_UI/include/Module.h
View File

@ -63,7 +63,7 @@ namespace eap
_In_ DWORD dwFlags, _In_ DWORD dwFlags,
_In_ IXMLDOMNode *pConfigRoot, _In_ IXMLDOMNode *pConfigRoot,
_Out_ BYTE **pConnectionDataOut, _Out_ BYTE **pConnectionDataOut,
_Out_ DWORD *pdwConnectionDataOutSize) = 0; _Out_ DWORD *pdwConnectionDataOutSize);
/// ///
/// Converts the configuration BLOB to XML. /// Converts the configuration BLOB to XML.
@ -83,7 +83,7 @@ namespace eap
_In_count_(dwConnectionDataSize) const BYTE *pConnectionData, _In_count_(dwConnectionDataSize) const BYTE *pConnectionData,
_In_ DWORD dwConnectionDataSize, _In_ DWORD dwConnectionDataSize,
_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMDocument *pDoc,
_In_ IXMLDOMNode *pConfigRoot) = 0; _In_ IXMLDOMNode *pConfigRoot);
/// ///
/// Raises the EAP method's specific connection configuration user interface dialog on the client. /// Raises the EAP method's specific connection configuration user interface dialog on the client.

36
lib/EAPBase_UI/src/Module.cpp
View File

@ -32,6 +32,42 @@ eap::peer_ui::peer_ui(_In_ eap_type_t eap_method) : module(eap_method)
} }
void eap::peer_ui::config_xml2blob(
_In_ DWORD dwFlags,
_In_ IXMLDOMNode *pConfigRoot,
_Out_ BYTE **pConnectionDataOut,
_Out_ DWORD *pdwConnectionDataOutSize)
{
UNREFERENCED_PARAMETER(dwFlags);
// Load configuration from XML.
config_connection cfg(*this);
cfg.load(pConfigRoot);
// Pack configuration.
pack(cfg, pConnectionDataOut, pdwConnectionDataOutSize);
}
void eap::peer_ui::config_blob2xml(
_In_ DWORD dwFlags,
_In_count_(dwConnectionDataSize) const BYTE *pConnectionData,
_In_ DWORD dwConnectionDataSize,
_In_ IXMLDOMDocument *pDoc,
_In_ IXMLDOMNode *pConfigRoot)
{
UNREFERENCED_PARAMETER(dwFlags);
// Unpack configuration.
config_connection cfg(*this);
if (dwConnectionDataSize)
unpack(cfg, pConnectionData, dwConnectionDataSize);
// Save configuration to XML.
cfg.save(pDoc, pConfigRoot);
}
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// eap::monitor_ui // eap::monitor_ui
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////

13
lib/TTLS_UI/include/Module.h
View File

@ -52,19 +52,6 @@ namespace eap
/// ///
virtual config_method* make_config_method(); virtual config_method* make_config_method();
virtual void config_xml2blob(
_In_ DWORD dwFlags,
_In_ IXMLDOMNode *pConfigRoot,
_Out_ BYTE **pConnectionDataOut,
_Out_ DWORD *pdwConnectionDataOutSize);
virtual void config_blob2xml(
_In_ DWORD dwFlags,
_In_count_(dwConnectionDataSize) const BYTE *pConnectionData,
_In_ DWORD dwConnectionDataSize,
_In_ IXMLDOMDocument *pDoc,
_In_ IXMLDOMNode *pConfigRoot);
virtual void invoke_config_ui( virtual void invoke_config_ui(
_In_ HWND hwndParent, _In_ HWND hwndParent,
_In_count_(dwConnectionDataInSize) const BYTE *pConnectionDataIn, _In_count_(dwConnectionDataInSize) const BYTE *pConnectionDataIn,

36
lib/TTLS_UI/src/Module.cpp
View File

@ -39,42 +39,6 @@ eap::config_method* eap::peer_ttls_ui::make_config_method()
} }
void eap::peer_ttls_ui::config_xml2blob(
_In_ DWORD dwFlags,
_In_ IXMLDOMNode *pConfigRoot,
_Out_ BYTE **pConnectionDataOut,
_Out_ DWORD *pdwConnectionDataOutSize)
{
UNREFERENCED_PARAMETER(dwFlags);
// Load configuration from XML.
config_connection cfg(*this);
cfg.load(pConfigRoot);
// Pack configuration.
pack(cfg, pConnectionDataOut, pdwConnectionDataOutSize);
}
void eap::peer_ttls_ui::config_blob2xml(
_In_ DWORD dwFlags,
_In_count_(dwConnectionDataSize) const BYTE *pConnectionData,
_In_ DWORD dwConnectionDataSize,
_In_ IXMLDOMDocument *pDoc,
_In_ IXMLDOMNode *pConfigRoot)
{
UNREFERENCED_PARAMETER(dwFlags);
// Unpack configuration.
config_connection cfg(*this);
if (dwConnectionDataSize)
unpack(cfg, pConnectionData, dwConnectionDataSize);
// Save configuration to XML.
cfg.save(pDoc, pConfigRoot);
}
void eap::peer_ttls_ui::invoke_config_ui( void eap::peer_ttls_ui::invoke_config_ui(
_In_ HWND hwndParent, _In_ HWND hwndParent,
_In_count_(dwConnectionDataInSize) const BYTE *pConnectionDataIn, _In_count_(dwConnectionDataInSize) const BYTE *pConnectionDataIn,