From 60aa51337551dc5ada4ca52c43eca546bb31bf34 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Thu, 3 Nov 2016 09:33:25 +0100 Subject: [PATCH] Aesthetic modifications --- lib/EAPBase/src/Credentials.cpp | 6 +++--- lib/EAPBase_UI/include/EAP_UI.h | 10 ++++------ lib/EapHost_UI/include/EapHost_UI.h | 4 ++-- lib/TLS_UI/include/TLS_UI.h | 6 +++--- lib/TTLS_UI/include/TTLS_UI.h | 2 +- lib/TTLS_UI/src/Module.cpp | 4 ++-- 6 files changed, 15 insertions(+), 17 deletions(-) diff --git a/lib/EAPBase/src/Credentials.cpp b/lib/EAPBase/src/Credentials.cpp index e49e2b7..5d52390 100644 --- a/lib/EAPBase/src/Credentials.cpp +++ b/lib/EAPBase/src/Credentials.cpp @@ -436,7 +436,7 @@ eap::credentials::source_t eap::credentials_pass::combine( if (cred_cached) { // Using EAP service cached credentials. *this = *dynamic_cast(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; } @@ -444,7 +444,7 @@ eap::credentials::source_t eap::credentials_pass::combine( if (cfg_with_cred && cfg_with_cred->m_use_cred) { // Using configured credentials. *this = *dynamic_cast(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; } @@ -458,7 +458,7 @@ eap::credentials::source_t eap::credentials_pass::combine( // Using stored credentials. *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; } catch (...) { // Not actually an error. diff --git a/lib/EAPBase_UI/include/EAP_UI.h b/lib/EAPBase_UI/include/EAP_UI.h index 590f8d6..a998b85 100644 --- a/lib/EAPBase_UI/include/EAP_UI.h +++ b/lib/EAPBase_UI/include/EAP_UI.h @@ -480,7 +480,7 @@ public: /// Constructs a configuration window /// /// \param[in] prov Provider configuration data - /// \param[inout] cfg Configuration data + /// \param[inout] cfg Method configuration data /// \param[in] parent Parent window /// wxEAPConfigWindow(eap::config_provider &prov, eap::config_method &cfg, wxWindow* parent); @@ -633,7 +633,7 @@ public: /// Constructs a credential configuration panel /// /// \param[in] prov Provider configuration data - /// \param[inout] cfg Configuration data + /// \param[inout] cfg Method configuration data /// \param[in] parent Parent window /// \param[in] method Method name to display /// @@ -798,9 +798,7 @@ protected: wxEAPCredentialsConfigPanelBase::OnSetConfig(event); wxEAPCredentialsDialog dlg(m_prov, this); - _wxT *panel = new _wxT(m_prov, m_cfg, m_cred_config, &dlg, true); - dlg.AddContent(panel); if (dlg.ShowModal() == wxID_OK) UpdateConfigIdentity(); @@ -879,7 +877,7 @@ public: /// Constructs a credentials panel /// /// \param[in] prov Provider configuration data - /// \param[in] cfg Configuration data + /// \param[in] cfg Method configuration data /// \param[inout] cred Credentials data /// \param[in] parent Parent window /// \param[in] is_config Is this panel used to config credentials? @@ -940,7 +938,7 @@ public: /// Constructs a password credentials panel /// /// \param[in] prov Provider configuration data - /// \param[in] cfg Configuration data + /// \param[in] cfg Method configuration data /// \param[inout] cred Credentials data /// \param[in] parent Parent window /// \param[in] is_config Is this panel used to config credentials? diff --git a/lib/EapHost_UI/include/EapHost_UI.h b/lib/EapHost_UI/include/EapHost_UI.h index 649805f..05e33f8 100644 --- a/lib/EapHost_UI/include/EapHost_UI.h +++ b/lib/EapHost_UI/include/EapHost_UI.h @@ -76,7 +76,7 @@ public: /// Constructs an inner EAP method config panel /// /// \param[in ] prov Provider configuration data - /// \param[inout] cfg Configuration data + /// \param[inout] cfg Method configuration data /// \param[in ] parent Parent window /// wxEapHostMethodConfigPanel(const eap::config_provider &prov, eap::config_method_eaphost &cfg, wxWindow *parent); @@ -104,7 +104,7 @@ public: /// Constructs a configuration panel /// /// \param[in ] prov Provider configuration data - /// \param[inout] cfg Configuration data + /// \param[inout] cfg Method configuration data /// \param[in ] parent Parent window /// wxEapHostConfigPanel(const eap::config_provider &prov, eap::config_method_eaphost &cfg, wxWindow* parent); diff --git a/lib/TLS_UI/include/TLS_UI.h b/lib/TLS_UI/include/TLS_UI.h index f46d4f7..6d74579 100644 --- a/lib/TLS_UI/include/TLS_UI.h +++ b/lib/TLS_UI/include/TLS_UI.h @@ -103,7 +103,7 @@ public: /// Constructs a TLS credentials panel /// /// \param[in] prov Provider configuration data - /// \param[in] cfg Configuration data + /// \param[in] cfg Method configuration data /// \param[inout] cred Credentials data /// \param[in] parent Parent window /// \param[in] is_config Is this panel used to config credentials? @@ -129,7 +129,7 @@ public: /// Constructs a configuration panel /// /// \param[in ] prov Provider configuration data - /// \param[inout] cfg Configuration data + /// \param[inout] cfg Method configuration data /// \param[in ] parent Parent window /// wxTLSServerTrustPanel(const eap::config_provider &prov, eap::config_method_tls &cfg, wxWindow* parent); @@ -173,7 +173,7 @@ public: /// Constructs a configuration panel /// /// \param[in ] prov Provider configuration data - /// \param[inout] cfg Configuration data + /// \param[inout] cfg Method configuration data /// \param[in ] parent Parent window /// wxTLSConfigPanel(const eap::config_provider &prov, eap::config_method_tls &cfg, wxWindow* parent); diff --git a/lib/TTLS_UI/include/TTLS_UI.h b/lib/TTLS_UI/include/TTLS_UI.h index 9dabdc7..ff43740 100644 --- a/lib/TTLS_UI/include/TTLS_UI.h +++ b/lib/TTLS_UI/include/TTLS_UI.h @@ -78,7 +78,7 @@ public: /// Constructs a configuration window /// /// \param[in] prov Provider configuration data - /// \param[inout] cfg Configuration data + /// \param[inout] cfg Method configuration data /// \param[in] parent Parent window /// wxTTLSConfigWindow(eap::config_provider &prov, eap::config_method &cfg, wxWindow* parent); diff --git a/lib/TTLS_UI/src/Module.cpp b/lib/TTLS_UI/src/Module.cpp index ad49a2c..6f8619c 100644 --- a/lib/TTLS_UI/src/Module.cpp +++ b/lib/TTLS_UI/src/Module.cpp @@ -347,9 +347,9 @@ void eap::peer_ttls_ui::invoke_identity_ui( // Not really an error. result = wxID_CANCEL; } 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 - wxLogError(_("Invoking EAP identity failed (error %u)."), dwResult); + wxLogError(_("Invoking EAP identity UI failed (error %u)."), dwResult); } } else result = wxID_OK;