--- a/eapol/eapol_framework/eapol_common/core/eap_general_settings_client_message_if.cpp Fri Sep 03 09:22:44 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/core/eap_general_settings_client_message_if.cpp Thu Sep 16 13:07:04 2010 +0300
@@ -16,7 +16,7 @@
*/
/*
-* %version: 11 %
+* %version: 14 %
*/
// This is enumeration of EAPOL source code.
@@ -126,13 +126,13 @@
// Process message data composed of Attribute-Value Pairs.
EAP_TRACE_DEBUG(
m_am_tools,
- EAP_TRACE_FLAGS_MESSAGE_DATA,
+ TRACE_FLAGS_DEFAULT,
(EAPL("eap_general_settings_client_message_if_c::process_message(): this = 0x%08x, m_client_if=0x%08x.\n"),
this,
m_client_if));
- EAP_TRACE_RETURN_STRING_FLAGS(m_am_tools, EAP_TRACE_FLAGS_MESSAGE_DATA, "returns: eap_general_settings_client_message_if_c::send_message()");
+ EAP_TRACE_RETURN_STRING_FLAGS(m_am_tools, TRACE_FLAGS_DEFAULT, "returns: eap_general_settings_client_message_if_c::send_message()");
EAP_TRACE_DATA_DEBUG(
m_am_tools,
@@ -159,11 +159,11 @@
EAP_TRACE_DEBUG(
m_am_tools,
- EAP_TRACE_FLAGS_MESSAGE_DATA,
+ TRACE_FLAGS_DEFAULT,
(EAPL("eap_general_settings_client_message_if_c::set_eap_methods(): this = 0x%08x.\n"),
this));
- EAP_TRACE_RETURN_STRING_FLAGS(m_am_tools, EAP_TRACE_FLAGS_MESSAGE_DATA, "returns: eap_general_settings_client_message_if_c::set_eap_methods()");
+ EAP_TRACE_RETURN_STRING_FLAGS(m_am_tools, TRACE_FLAGS_DEFAULT, "returns: eap_general_settings_client_message_if_c::set_eap_methods()");
{
// Creates message data composed of Attribute-Value Pairs.
@@ -206,11 +206,11 @@
EAP_TRACE_DEBUG(
m_am_tools,
- EAP_TRACE_FLAGS_MESSAGE_DATA,
+ TRACE_FLAGS_DEFAULT,
(EAPL("eap_general_settings_client_message_if_c::get_eap_methods(): this = 0x%08x.\n"),
this));
- EAP_TRACE_RETURN_STRING_FLAGS(m_am_tools, EAP_TRACE_FLAGS_MESSAGE_DATA, "returns: eap_general_settings_client_message_if_c::get_eap_methods()");
+ EAP_TRACE_RETURN_STRING_FLAGS(m_am_tools, TRACE_FLAGS_DEFAULT, "returns: eap_general_settings_client_message_if_c::get_eap_methods()");
{
// Creates message data composed of Attribute-Value Pairs.
@@ -253,11 +253,11 @@
EAP_TRACE_DEBUG(
m_am_tools,
- EAP_TRACE_FLAGS_MESSAGE_DATA,
+ TRACE_FLAGS_DEFAULT,
(EAPL("eap_general_settings_client_message_if_c::get_certificate_lists(): this = 0x%08x.\n"),
this));
- EAP_TRACE_RETURN_STRING_FLAGS(m_am_tools, EAP_TRACE_FLAGS_MESSAGE_DATA, "returns: eap_general_settings_client_message_if_c::get_certificate_lists()");
+ EAP_TRACE_RETURN_STRING_FLAGS(m_am_tools, TRACE_FLAGS_DEFAULT, "returns: eap_general_settings_client_message_if_c::get_certificate_lists()");
{
// Creates message data composed of Attribute-Value Pairs.
@@ -300,11 +300,11 @@
EAP_TRACE_DEBUG(
m_am_tools,
- EAP_TRACE_FLAGS_MESSAGE_DATA,
+ TRACE_FLAGS_DEFAULT,
(EAPL("eap_general_settings_client_message_if_c::delete_all_eap_settings(): this = 0x%08x.\n"),
this));
- EAP_TRACE_RETURN_STRING_FLAGS(m_am_tools, EAP_TRACE_FLAGS_MESSAGE_DATA, "returns: eap_general_settings_client_message_if_c::delete_all_eap_settings()");
+ EAP_TRACE_RETURN_STRING_FLAGS(m_am_tools, TRACE_FLAGS_DEFAULT, "returns: eap_general_settings_client_message_if_c::delete_all_eap_settings()");
{
// Creates message data composed of Attribute-Value Pairs.
@@ -347,11 +347,11 @@
EAP_TRACE_DEBUG(
m_am_tools,
- EAP_TRACE_FLAGS_MESSAGE_DATA,
+ TRACE_FLAGS_DEFAULT,
(EAPL("eap_general_settings_client_message_if_c::copy_all_eap_settings(): this = 0x%08x.\n"),
this));
- EAP_TRACE_RETURN_STRING_FLAGS(m_am_tools, EAP_TRACE_FLAGS_MESSAGE_DATA, "returns: eap_general_settings_client_message_if_c::copy_all_eap_settings()");
+ EAP_TRACE_RETURN_STRING_FLAGS(m_am_tools, TRACE_FLAGS_DEFAULT, "returns: eap_general_settings_client_message_if_c::copy_all_eap_settings()");
{
// Creates message data composed of Attribute-Value Pairs.
@@ -393,11 +393,11 @@
EAP_TRACE_DEBUG(
m_am_tools,
- EAP_TRACE_FLAGS_MESSAGE_DATA,
+ TRACE_FLAGS_DEFAULT,
(EAPL("eap_general_settings_client_message_if_c::complete_set_eap_methods(): this = 0x%08x.\n"),
this));
- EAP_TRACE_RETURN_STRING_FLAGS(m_am_tools, EAP_TRACE_FLAGS_MESSAGE_DATA, "returns: eap_general_settings_client_message_if_c::complete_set_eap_methods()");
+ EAP_TRACE_RETURN_STRING_FLAGS(m_am_tools, TRACE_FLAGS_DEFAULT, "returns: eap_general_settings_client_message_if_c::complete_set_eap_methods()");
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -448,11 +448,11 @@
EAP_TRACE_DEBUG(
m_am_tools,
- EAP_TRACE_FLAGS_MESSAGE_DATA,
+ TRACE_FLAGS_DEFAULT,
(EAPL("eap_general_settings_client_message_if_c::complete_get_eap_methods(): this = 0x%08x.\n"),
this));
- EAP_TRACE_RETURN_STRING_FLAGS(m_am_tools, EAP_TRACE_FLAGS_MESSAGE_DATA, "returns: eap_general_settings_client_message_if_c::complete_get_eap_methods()");
+ EAP_TRACE_RETURN_STRING_FLAGS(m_am_tools, TRACE_FLAGS_DEFAULT, "returns: eap_general_settings_client_message_if_c::complete_get_eap_methods()");
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -503,11 +503,11 @@
EAP_TRACE_DEBUG(
m_am_tools,
- EAP_TRACE_FLAGS_MESSAGE_DATA,
+ TRACE_FLAGS_DEFAULT,
(EAPL("eap_general_settings_client_message_if_c::complete_get_certificate_lists(): this = 0x%08x.\n"),
this));
- EAP_TRACE_RETURN_STRING_FLAGS(m_am_tools, EAP_TRACE_FLAGS_MESSAGE_DATA, "returns: eap_general_settings_client_message_if_c::complete_get_certificate_lists()");
+ EAP_TRACE_RETURN_STRING_FLAGS(m_am_tools, TRACE_FLAGS_DEFAULT, "returns: eap_general_settings_client_message_if_c::complete_get_certificate_lists()");
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -558,11 +558,11 @@
EAP_TRACE_DEBUG(
m_am_tools,
- EAP_TRACE_FLAGS_MESSAGE_DATA,
+ TRACE_FLAGS_DEFAULT,
(EAPL("eap_general_settings_client_message_if_c::complete_delete_all_eap_settings(): this = 0x%08x.\n"),
this));
- EAP_TRACE_RETURN_STRING_FLAGS(m_am_tools, EAP_TRACE_FLAGS_MESSAGE_DATA, "returns: eap_general_settings_client_message_if_c::complete_delete_all_eap_settings()");
+ EAP_TRACE_RETURN_STRING_FLAGS(m_am_tools, TRACE_FLAGS_DEFAULT, "returns: eap_general_settings_client_message_if_c::complete_delete_all_eap_settings()");
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -613,11 +613,11 @@
EAP_TRACE_DEBUG(
m_am_tools,
- EAP_TRACE_FLAGS_MESSAGE_DATA,
+ TRACE_FLAGS_DEFAULT,
(EAPL("eap_general_settings_client_message_if_c::complete_copy_all_eap_settings(): this = 0x%08x.\n"),
this));
- EAP_TRACE_RETURN_STRING_FLAGS(m_am_tools, EAP_TRACE_FLAGS_MESSAGE_DATA, "returns: eap_general_settings_client_message_if_c::complete_copy_all_eap_settings()");
+ EAP_TRACE_RETURN_STRING_FLAGS(m_am_tools, TRACE_FLAGS_DEFAULT, "returns: eap_general_settings_client_message_if_c::complete_copy_all_eap_settings()");
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -666,11 +666,11 @@
{
EAP_TRACE_DEBUG(
m_am_tools,
- EAP_TRACE_FLAGS_MESSAGE_DATA,
+ TRACE_FLAGS_DEFAULT,
(EAPL("eap_general_settings_client_message_if_c::process_message_type_error(): this = 0x%08x.\n"),
this));
- EAP_TRACE_RETURN_STRING_FLAGS(m_am_tools, EAP_TRACE_FLAGS_MESSAGE_DATA, "returns: eap_general_settings_client_message_if_c::process_message_type_error()");
+ EAP_TRACE_RETURN_STRING_FLAGS(m_am_tools, TRACE_FLAGS_DEFAULT, "returns: eap_general_settings_client_message_if_c::process_message_type_error()");
eap_status_e status(eap_status_ok);
@@ -705,11 +705,11 @@
EAP_TRACE_DEBUG(
m_am_tools,
- EAP_TRACE_FLAGS_MESSAGE_DATA,
+ TRACE_FLAGS_DEFAULT,
(EAPL("eap_general_settings_client_message_if_c::send_data(): this = 0x%08x.\n"),
this));
- EAP_TRACE_RETURN_STRING_FLAGS(m_am_tools, EAP_TRACE_FLAGS_MESSAGE_DATA, "returns: eap_general_settings_client_message_if_c::send_data()");
+ EAP_TRACE_RETURN_STRING_FLAGS(m_am_tools, TRACE_FLAGS_DEFAULT, "returns: eap_general_settings_client_message_if_c::send_data()");
eap_status_e status(eap_status_process_general_error);
@@ -775,6 +775,14 @@
return EAP_STATUS_RETURN(m_am_tools, status);
}
+ EAP_TRACE_DEBUG(
+ m_am_tools,
+ TRACE_FLAGS_DEFAULT,
+ (EAPL("eap_general_settings_client_message_if_c::send_data(): this = 0x%08x, message=%d=%s\n"),
+ this,
+ function,
+ eap_process_tlv_message_data_c::get_function_string(function)));
+
switch(function)
{
case eap_tlv_message_type_function_general_settings_complete_set_eap_methods: