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

Aesthetic modifications

Browse Source
This commit is contained in:
Simon Rozman 2016-11-03 09:33:25 +01:00
parent a450d02485
commit 60aa513375
6 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/EAPBase/src/Credentials.cpp
View File

@ -436,7 +436,7 @@ eap::credentials::source_t eap::credentials_pass::combine(
if (cred_cached) { if (cred_cached) {
// Using EAP service cached credentials. // Using EAP service cached credentials.
*this = *dynamic_cast<const credentials_pass*>(cred_cached); *this = *dynamic_cast<const credentials_pass*>(cred_cached);
m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CACHED1, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_pass::get_name()), event_data::blank); m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CACHED2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_pass::get_name()), event_data(pszTargetName), event_data::blank);
return source_cache; return source_cache;
} }
@ -444,7 +444,7 @@ eap::credentials::source_t eap::credentials_pass::combine(
if (cfg_with_cred && cfg_with_cred->m_use_cred) { if (cfg_with_cred && cfg_with_cred->m_use_cred) {
// Using configured credentials. // Using configured credentials.
*this = *dynamic_cast<const credentials_pass*>(cfg_with_cred->m_cred.get()); *this = *dynamic_cast<const credentials_pass*>(cfg_with_cred->m_cred.get());
m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CONFIG1, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_pass::get_name()), event_data::blank); m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CONFIG2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_pass::get_name()), event_data(pszTargetName), event_data::blank);
return source_config; return source_config;
} }
@ -458,7 +458,7 @@ eap::credentials::source_t eap::credentials_pass::combine(
// Using stored credentials. // Using stored credentials.
*this = std::move(cred_loaded); *this = std::move(cred_loaded);
m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_STORED1, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_pass::get_name()), event_data::blank); m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_STORED2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_pass::get_name()), event_data(pszTargetName), event_data::blank);
return source_storage; return source_storage;
} catch (...) { } catch (...) {
// Not actually an error. // Not actually an error.

10
lib/EAPBase_UI/include/EAP_UI.h
View File

@ -480,7 +480,7 @@ public:
/// Constructs a configuration window /// Constructs a configuration window
/// ///
/// \param[in] prov Provider configuration data /// \param[in] prov Provider configuration data
/// \param[inout] cfg Configuration data /// \param[inout] cfg Method configuration data
/// \param[in] parent Parent window /// \param[in] parent Parent window
/// ///
wxEAPConfigWindow(eap::config_provider &prov, eap::config_method &cfg, wxWindow* parent); wxEAPConfigWindow(eap::config_provider &prov, eap::config_method &cfg, wxWindow* parent);
@ -633,7 +633,7 @@ public:
/// Constructs a credential configuration panel /// Constructs a credential configuration panel
/// ///
/// \param[in] prov Provider configuration data /// \param[in] prov Provider configuration data
/// \param[inout] cfg Configuration data /// \param[inout] cfg Method configuration data
/// \param[in] parent Parent window /// \param[in] parent Parent window
/// \param[in] method Method name to display /// \param[in] method Method name to display
/// ///
@ -798,9 +798,7 @@ protected:
wxEAPCredentialsConfigPanelBase::OnSetConfig(event); wxEAPCredentialsConfigPanelBase::OnSetConfig(event);
wxEAPCredentialsDialog dlg(m_prov, this); wxEAPCredentialsDialog dlg(m_prov, this);
_wxT *panel = new _wxT(m_prov, m_cfg, m_cred_config, &dlg, true); _wxT *panel = new _wxT(m_prov, m_cfg, m_cred_config, &dlg, true);
dlg.AddContent(panel); dlg.AddContent(panel);
if (dlg.ShowModal() == wxID_OK) if (dlg.ShowModal() == wxID_OK)
UpdateConfigIdentity(); UpdateConfigIdentity();
@ -879,7 +877,7 @@ public:
/// Constructs a credentials panel /// Constructs a credentials panel
/// ///
/// \param[in] prov Provider configuration data /// \param[in] prov Provider configuration data
/// \param[in] cfg Configuration data /// \param[in] cfg Method configuration data
/// \param[inout] cred Credentials data /// \param[inout] cred Credentials data
/// \param[in] parent Parent window /// \param[in] parent Parent window
/// \param[in] is_config Is this panel used to config credentials? /// \param[in] is_config Is this panel used to config credentials?
@ -940,7 +938,7 @@ public:
/// Constructs a password credentials panel /// Constructs a password credentials panel
/// ///
/// \param[in] prov Provider configuration data /// \param[in] prov Provider configuration data
/// \param[in] cfg Configuration data /// \param[in] cfg Method configuration data
/// \param[inout] cred Credentials data /// \param[inout] cred Credentials data
/// \param[in] parent Parent window /// \param[in] parent Parent window
/// \param[in] is_config Is this panel used to config credentials? /// \param[in] is_config Is this panel used to config credentials?

4
lib/EapHost_UI/include/EapHost_UI.h
View File

@ -76,7 +76,7 @@ public:
/// Constructs an inner EAP method config panel /// Constructs an inner EAP method config panel
/// ///
/// \param[in ] prov Provider configuration data /// \param[in ] prov Provider configuration data
/// \param[inout] cfg Configuration data /// \param[inout] cfg Method configuration data
/// \param[in ] parent Parent window /// \param[in ] parent Parent window
/// ///
wxEapHostMethodConfigPanel(const eap::config_provider &prov, eap::config_method_eaphost &cfg, wxWindow *parent); wxEapHostMethodConfigPanel(const eap::config_provider &prov, eap::config_method_eaphost &cfg, wxWindow *parent);
@ -104,7 +104,7 @@ public:
/// Constructs a configuration panel /// Constructs a configuration panel
/// ///
/// \param[in ] prov Provider configuration data /// \param[in ] prov Provider configuration data
/// \param[inout] cfg Configuration data /// \param[inout] cfg Method configuration data
/// \param[in ] parent Parent window /// \param[in ] parent Parent window
/// ///
wxEapHostConfigPanel(const eap::config_provider &prov, eap::config_method_eaphost &cfg, wxWindow* parent); wxEapHostConfigPanel(const eap::config_provider &prov, eap::config_method_eaphost &cfg, wxWindow* parent);

6
lib/TLS_UI/include/TLS_UI.h
View File

@ -103,7 +103,7 @@ public:
/// Constructs a TLS credentials panel /// Constructs a TLS credentials panel
/// ///
/// \param[in] prov Provider configuration data /// \param[in] prov Provider configuration data
/// \param[in] cfg Configuration data /// \param[in] cfg Method configuration data
/// \param[inout] cred Credentials data /// \param[inout] cred Credentials data
/// \param[in] parent Parent window /// \param[in] parent Parent window
/// \param[in] is_config Is this panel used to config credentials? /// \param[in] is_config Is this panel used to config credentials?
@ -129,7 +129,7 @@ public:
/// Constructs a configuration panel /// Constructs a configuration panel
/// ///
/// \param[in ] prov Provider configuration data /// \param[in ] prov Provider configuration data
/// \param[inout] cfg Configuration data /// \param[inout] cfg Method configuration data
/// \param[in ] parent Parent window /// \param[in ] parent Parent window
/// ///
wxTLSServerTrustPanel(const eap::config_provider &prov, eap::config_method_tls &cfg, wxWindow* parent); wxTLSServerTrustPanel(const eap::config_provider &prov, eap::config_method_tls &cfg, wxWindow* parent);
@ -173,7 +173,7 @@ public:
/// Constructs a configuration panel /// Constructs a configuration panel
/// ///
/// \param[in ] prov Provider configuration data /// \param[in ] prov Provider configuration data
/// \param[inout] cfg Configuration data /// \param[inout] cfg Method configuration data
/// \param[in ] parent Parent window /// \param[in ] parent Parent window
/// ///
wxTLSConfigPanel(const eap::config_provider &prov, eap::config_method_tls &cfg, wxWindow* parent); wxTLSConfigPanel(const eap::config_provider &prov, eap::config_method_tls &cfg, wxWindow* parent);

2
lib/TTLS_UI/include/TTLS_UI.h
View File

@ -78,7 +78,7 @@ public:
/// Constructs a configuration window /// Constructs a configuration window
/// ///
/// \param[in] prov Provider configuration data /// \param[in] prov Provider configuration data
/// \param[inout] cfg Configuration data /// \param[inout] cfg Method configuration data
/// \param[in] parent Parent window /// \param[in] parent Parent window
/// ///
wxTTLSConfigWindow(eap::config_provider &prov, eap::config_method &cfg, wxWindow* parent); wxTTLSConfigWindow(eap::config_provider &prov, eap::config_method &cfg, wxWindow* parent);

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

@ -347,9 +347,9 @@ void eap::peer_ttls_ui::invoke_identity_ui(
// Not really an error. // Not really an error.
result = wxID_CANCEL; result = wxID_CANCEL;
} else if (error) } else if (error)
wxLogError(_("Invoking EAP identity failed (error %u, %s, %s)."), error->dwWinError, error->pRootCauseString, error->pRepairString); wxLogError(_("Invoking EAP identity UI failed (error %u, %s, %s)."), error->dwWinError, error->pRootCauseString, error->pRepairString);
else else
wxLogError(_("Invoking EAP identity failed (error %u)."), dwResult); wxLogError(_("Invoking EAP identity UI failed (error %u)."), dwResult);
} }
} else } else
result = wxID_OK; result = wxID_OK;